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

16589 Commits

Author SHA1 Message Date
James Chen b327e510a8 Merge pull request #5457 from CocosRobot/updategeneratedsubmodule_1393298076 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-02-25 11:16:05 +08:00
CocosRobot ef18a6edd1 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-02-25 03:14:40 +00:00
James Chen 2beacc21c9 Merge pull request #5456 from andyque/fixbug3801 
closed #3801: State is changed to RESUME when game comes back to foreground if pause button was clicked in Interval Test
 2014-02-25 10:57:23 +08:00
James Chen 1753a90c68 Merge pull request #5449 from andyque/fixbug3829 
closed #3829: change namespace gui to ui
 2014-02-25 10:56:37 +08:00
andyque f88e4be4ce rollback gui filename change 2014-02-25 10:18:45 +08:00
andyque 8359ddd4d4 fix lua bindings error 2014-02-25 10:18:45 +08:00
andyque f92301a872 fix jsb munaul bindings error 2014-02-25 10:18:45 +08:00
andyque 6b6f71b043 change script bindings code 2014-02-25 10:18:45 +08:00
andyque bf81591b48 fixed #3829. change namespace gui to ui 2014-02-25 10:18:44 +08:00
andyque f5b0b77423 fixed #3801. uncomment pasue&resume logic when applicationDidBecomeActive and applicationWillResignActive 2014-02-25 10:16:17 +08:00
andyque 8f8b990c85 uncomment the pause() and resume() method call in test-js 2014-02-25 10:16:17 +08:00
James Chen a049ca5a1e Merge pull request #5455 from dumganhar/vs-fix 
compilation error fix for win32.
 2014-02-25 09:58:33 +08:00
James Chen 64ec1611a5 compilation error fix for win32. 2014-02-25 09:45:10 +08:00
Ricardo Quesada 007a1d25b4 Merge pull request #5454 from ricardoquesada/sprite_fixes 
little fixes for sprite
 2014-02-24 15:19:04 -08:00
Ricardo Quesada 18c3a8dd02 little fixes for sprite 2014-02-24 15:18:07 -08:00
James Chen 3a652fcaf5 Update CHANGELOG [ci skip] 2014-02-24 22:25:55 +08:00
James Chen 21fe4f234b Merge pull request #5382 from boyu0/iss4039_tilemap_objectgroup_fix 
closed #4039: fix bug: tilemap <object> x, y, width and height value parse incorrect.
 2014-02-24 22:23:05 +08:00
James Chen dfde6938d2 Merge pull request #5452 from dabingnn/develop_CC_SPRITE_DEBUG_DRAW 
closed #3818: fix CC_SPRITE_DEBUG_DRAW feature
 2014-02-24 21:51:24 +08:00
James Chen e310734af1 Update CHANGELOG [ci skip] 2014-02-24 21:50:17 +08:00
James Chen b5b9c7f938 Merge pull request #5451 from Dhilan007/develop_movePDC 
closed #4123:fixed thread deadlock if new functions are added in callback.
 2014-02-24 21:43:37 +08:00
Dhilan007 387bd544bf closed issue#4123:fixed thread deadlock if new functions are added in callback. 2014-02-24 21:08:05 +08:00
James Chen 618104d056 Update CHANGELOG [ci skip] 2014-02-24 20:14:55 +08:00
boyu0 d15009c510 issue #4039: delete name "converted_x", "converted_y", "converted_width", "converted_height". 2014-02-24 20:14:46 +08:00
James Chen 81e7cec98f Merge pull request #5385 from boyu0/refactor_tilemap_xml_format_index 
refactor tilemap xml format index count.
 2014-02-24 20:09:11 +08:00
Huabing.Xu f20d487ade closed #3818: fix CC_SPRITE_DEBUG_DRAW feature 2014-02-24 20:02:48 +08:00
James Chen 8437e5f08b Update CHANGELOG [ci skip] 2014-02-24 17:02:38 +08:00
James Chen e7ab60c4f5 Update AUTHORS [ci skip] 2014-02-24 17:01:36 +08:00
James Chen 1b91234325 Merge pull request #5283 from seemk/director_cleanup_fix 
closed #4099: Fixed crashing when calling CCDirector's end() on win32.
 2014-02-24 16:58:34 +08:00
boyu0 2bc91c2ce3 issue #4039: change name “position_x”, “position_y”, “size_width”, “size_height” to "converted_x", "converted_y", "converted_width", "converted_height". 2014-02-24 16:42:07 +08:00
boyu0 1082f3cad4 issue #4039: change name “position_x”, “position_y”, “size_width”, “size_height” to "converted_x", "converted_y", "converted_width", "converted_height". 2014-02-24 16:39:15 +08:00
James Chen 75f513d4b1 Merge pull request #5447 from CocosRobot/update_cocosfiles_1393227046 
[AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json
 2014-02-24 15:32:30 +08:00
CocosRobot 5c0f0ebef6 [AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json 2014-02-24 07:30:47 +00:00
James Chen 2898909130 Merge pull request #5444 from samuele3hu/developDynamic 
issue #3956:Modifyt the mechanism of toluafix_pushusertype_ccobject to pass the real typename to lua
 2014-02-24 15:29:23 +08:00
James Chen b6a474b832 Merge pull request #5446 from Dhilan007/develop_movePDC 
fix compiling error cause by using 'fmaxf'.
 2014-02-24 14:48:29 +08:00
Dhilan007 b54607bfc9 only using std::max for window. 2014-02-24 11:54:58 +08:00
Dhilan007 d6cd2eb05f fix compiling error cause by using 'fmaxf'. 2014-02-24 11:38:03 +08:00
James Chen e1c961aeac Update AUTHORS [ci skip] 2014-02-24 10:49:36 +08:00
James Chen 489d19b39b Merge pull request #5442 from Linghui/patch-1 
Update README of template: fix wrong platform java path.
 2014-02-24 10:43:02 +08:00
James Chen dc7da753a5 Merge pull request #5443 from samuele3hu/developFix 
Replace “cc.object” with “cc.ref” for lua binding
 2014-02-24 10:41:02 +08:00
samuele3hu 82ee8a4abd Add some omitted modifications about “cc.ref” 2014-02-24 10:28:55 +08:00
samuele3hu 8fa8eaf64d issue #3956:Remove some unrelated modification 2014-02-24 10:08:00 +08:00
samuele3hu ac88d70d58 issue #3956:Update the related compile file 2014-02-24 10:01:00 +08:00
samuele3hu a765178a5f Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developDynamic 2014-02-24 09:38:08 +08:00
Linghui 4e09856624 change the platform java path. 2014-02-24 04:32:47 +08:00
samuele3hu 8cbe22b12b Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developFix 2014-02-23 20:57:45 +08:00
samuele3hu 5f28e6bd72 Replace “cc.object” with “cc.ref” for lua binding 2014-02-23 20:56:49 +08:00
Ricardo Quesada 902b93185e Merge pull request #5441 from ricardoquesada/api_fixed_for_3d 
little performance improvements in culling
 2014-02-23 02:03:14 -08:00
Ricardo Quesada f77b92f1d7 performance improvements in culling 2014-02-23 02:02:28 -08:00
James Chen 56daf96570 Merge pull request #5440 from CocosRobot/updategeneratedsubmodule_1393147268 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-02-23 17:48:16 +08:00
CocosRobot e306c53d21 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-02-23 09:21:10 +00:00