Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
17,237 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

17237 Commits

Author SHA1 Message Date
Nick Barrios d9cbc5625c CCImage.cpp: If dds header reports 0 mipmaps, force _numberOfMipmaps to 1 to enable software decoding. Set _renderFormat just once for both hardware and software decoding (moved out of "load mipmaps" loop). 2014-02-20 00:48:09 -05:00
heliclei 02af73dd46 add main directive to return main menu 2014-02-20 13:43:28 +08:00
James Chen f7c8eb8de2 Merge pull request #5394 from samuele3hu/developEventTrigger 
issue #3229:The second param of glGetProgramiv which was called in the tolua_Cocos2d_glGetUniformfv00 was wrong
 2014-02-20 12:44:53 +08:00
James Chen 2c5f791e03 issue #4058: Scheduler:: scheduleUpdateForTarget is a template function now. And it works perfect. 2014-02-20 11:57:04 +08:00
James Chen 69cbe92d40 Merge pull request #5399 from CocosRobot/updategeneratedsubmodule_1392867489 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-02-20 11:40:37 +08:00
CocosRobot 66906c3f66 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-02-20 03:38:12 +00:00
James Chen 004a846847 issue #4058: Template fix. Object -> Ref 2014-02-20 11:31:49 +08:00
James Chen 8ef8baf944 Merge pull request #5397 from Dhilan007/develop_label_multiilTexture 
optimize label
 2014-02-20 11:28:43 +08:00
Nick Barrios 14ee675c19 Merge branch 's3tc_nomipmaps' of github.com:wefiends/cocos2d-x into s3tc_nomipmaps 2014-02-19 22:20:41 -05:00
heliclei d5bef1ca35 merge pause, resume, stopanimation, startanimation into director command 2014-02-20 11:15:29 +08:00
Nick Barrios 45d751caa7 CCImage.cpp: initWithS3TCData() - When there is s3tc hardware support, set PixelFormat before loading mipmaps, to allow for textures with no mipmaps. 2014-02-19 22:13:12 -05:00
James Chen 8fcf172235 issue #4058: Reverts cocos2dx.ini. 2014-02-20 11:13:05 +08:00
James Chen 5164f2bb19 issue #4058: Removes cpp_namespace section in cocos2dx.ini. 2014-02-20 11:09:40 +08:00
James Chen 9436173039 issue #4058: typedef Ref Object; and deprecate it. 2014-02-20 10:58:37 +08:00
James Chen 0ea27d8543 issue #4058: CCObject.cpp -> CCRef.cpp for all platform projects. 2014-02-20 10:56:25 +08:00
James Chen 5e6130c92c issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
Dhilan007 fd528b389d fix warning 2014-02-20 10:24:35 +08:00
Dhilan007 ddd02b463c optimize label: 
1.remove unnecessary API
2.reduces object-creation and function calls.
 2014-02-19 20:26:14 +08:00
James Chen 43e51a9cb1 Merge pull request #5378 from Dhilan007/develop_label_multiilTexture 
closed #4060:fixed Label wasn't implemented correctly when Label::_fontAtlas contains multiple texture.
 2014-02-19 18:26:38 +08:00
heliclei e7209fbfa4 add autotest help 2014-02-19 17:55:32 +08:00
Dhilan007 dfc6522f5c update XCode project for add miss file on Mac and IOS. 2014-02-19 17:11:28 +08:00
Dhilan007 f086f39319 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into new_label 2014-02-19 17:00:26 +08:00
samuele3hu e1387f40eb Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developEventTrigger 2014-02-19 16:57:18 +08:00
heliclei f9dceb5c2d use '==' to do string compare 2014-02-19 16:54:42 +08:00
James Chen 557fbe43da Merge pull request #5392 from CocosRobot/updategeneratedsubmodule_1392798454 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-02-19 16:37:34 +08:00
heliclei 0eb957e89c add console autotest support 2014-02-19 16:34:33 +08:00
CocosRobot 1f45dd4349 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-02-19 08:27:37 +00:00
samuele3hu d7b0efd6d7 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developEventTrigger 2014-02-19 16:27:08 +08:00
James Chen fe6ec12d59 Merge pull request #5391 from samuele3hu/developBinding 
fix: The lua binding of getPropertiesForGID would lead to compile error
 2014-02-19 16:22:43 +08:00
samuele3hu ce1656fa8d fix: The lua binding of getPropertiesForGID would lead to compile error 2014-02-19 15:47:45 +08:00
James Chen ba479b788b Merge pull request #5389 from CocosRobot/updategeneratedsubmodule_1392789491 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-02-19 14:56:01 +08:00
boyu0 810196d25b closed #2920: add a variable to save shared director. 2014-02-19 14:23:41 +08:00
boyu0 49cb2ce9d5 closed #2920: fix compile error after merge. 2014-02-19 14:12:57 +08:00
samuele3hu 52a0b906da Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developEventTrigger 2014-02-19 13:58:15 +08:00
CocosRobot 4ecd7ba58d [AUTO] : updating submodule reference to latest autogenerated bindings 2014-02-19 05:58:15 +00:00
samuele3hu d28e8485ec issue #3229:Lua version of GLGetUniformTest raise error on iOS when calling glGetUniformfv 2014-02-19 13:56:06 +08:00
James Chen e1a256d6f1 Merge pull request #5319 from samuele3hu/developDynamic 
issue #3956:Add the conversional functions which are used in the templates of lua binding-generator
 2014-02-19 13:52:08 +08:00
boyu0 0b07d376f6 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2920_voice_recognition_input_crash_on_ios7 2014-02-19 13:42:02 +08:00
heliclei dd9f072429 add more commands: resume, pause, stopanimation and startanimation 2014-02-19 11:19:29 +08:00
boyu0 8be6932863 refactor tilemap xml format index count. 2014-02-19 10:41:12 +08:00
Nick Barrios cd524d25ff CCImage.cpp: initWithS3TCData() - When there is s3tc hardware support, set PixelFormat before loading mipmaps, to allow for textures with no mipmaps. 2014-02-18 17:42:41 -05:00
boyu0 50cdc67191 issue #4039: set tilemap <object> x and y value to original, and add “position_x”, “position_y”, “size_width” and “size_height” value. 2014-02-18 17:44:05 +08:00
James Chen 58d3311da0 Merge pull request #5342 from heliclei/console-user-command 
closed #4063 :revise CCConsole to support more easily for adding custom command.
 2014-02-18 16:54:56 +08:00
Dhilan007 5361413383 replace [auto] with [const auto&] in FOR loop. 2014-02-18 16:41:01 +08:00
James Chen 6c1923562c Merge pull request #5379 from CocosRobot/update_cocosfiles_1392710438 
[AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json
 2014-02-18 16:29:20 +08:00
James Chen 977e69a841 Merge pull request #5380 from CocosRobot/updategeneratedsubmodule_1392710650 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-02-18 16:28:49 +08:00
CocosRobot 97ff6c5bdf [AUTO] : updating submodule reference to latest autogenerated bindings 2014-02-18 08:04:14 +00:00
CocosRobot d35f7626a6 [AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json 2014-02-18 08:00:39 +00:00
James Chen 609b937b39 Update CHANGELOG [ci skip] 2014-02-18 15:59:56 +08:00
James Chen ee4972ae96 Merge pull request #5371 from andyque/refactorActionEase 
closed #3620: Merge cocostudio/CCActionXxx to CCAction。
 2014-02-18 15:58:49 +08:00