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

12311 Commits

Author SHA1 Message Date
minggo b1c8871208 linux build ok 2013-09-17 22:36:15 +08:00
James Chen 7d94878173 [win32] glfw keyboard callback is enabled now. Enables KeyboardTest for win32. 2013-09-17 22:34:20 +08:00
chengstory cf1f054012 1. update mac and iOS projects. 2013-09-17 21:36:30 +08:00
minggo 5e858becf4 Merge pull request #3660 from nutty898/Merge_GUI_to_Develop 
Merge gui to develop
 2013-09-17 06:25:09 -07:00
CaiWenzhi 1f45bad5e7 Modify guy example 2013-09-17 21:19:04 +08:00
zhangcheng ec401d1148 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into #4684 2013-09-17 21:15:36 +08:00
zhangcheng b86a8271d9 1. Upload Cocostudio Action. 2013-09-17 21:14:45 +08:00
samuele3hu 0428cbbade Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTest 2013-09-17 21:02:29 +08:00
CaiWenzhi d9721a41dd Merge branch 'develop' into Merge_GUI_to_Develop 2013-09-17 21:01:50 +08:00
samuele3hu 423e7adf93 Modify AppDelegate.cpp file of multi-platform-lua 2013-09-17 21:01:43 +08:00
James Chen e3a34bd5c5 Merge pull request #3657 from 2youyouo2/develop 
update armature[ci skip]
 2013-09-17 05:45:17 -07:00
CaiWenzhi f42797bc0d Merge branch 'develop' into Merge_GUI_to_Develop 2013-09-17 20:43:16 +08:00
James Chen 05ef572b24 Merge pull request #3656 from dabingnn/release30_bug_hot_fix 
fix template cpp not compiled in ipad retina[ci skip]
 2013-09-17 05:36:00 -07:00
James Chen 1b573da782 Merge pull request #3652 from dumganhar/iss2450-httpclient-64bit-crash 
closed #2450: Fixing HttpClientTest crashes on 64bit system.[ci skip]
 2013-09-17 05:35:28 -07:00
CaiWenzhi 841408d1bc Modify events methods 2013-09-17 20:34:26 +08:00
James Chen 50904d9c2d Merge pull request #3658 from dumganhar/develop 
[jsb] Marks cc.Menu.setHanlderPriority as deprecated method. Bug fix in JSTouchDelegate class.[ci skip]
 2013-09-17 05:31:45 -07:00
James Chen b3dfa0f886 [jsb] Marks cc.Menu.setHanlderPriority as deprecated method. Bug fix in JSTouchDelegate class. 2013-09-17 20:33:25 +08:00
2youyou2 57ec881727 support set tween key 2013-09-17 20:14:08 +08:00
CaiWenzhi 9d07b2c1d2 Temp commit 2013-09-17 20:13:23 +08:00
minggo ba820790ec Merge https://github.com/cocos2d/cocos2d-x into merge-physics 2013-09-17 20:06:33 +08:00
Huabing.Xu c1599300f6 fix template cpp not compiled in ipad retina 2013-09-17 20:05:24 +08:00
James Chen 81df48b264 Updating submodule of JS-Test. 2013-09-17 19:32:15 +08:00
Dhilan007 cb4683c8c2 Merge branch 'develop' of github.com:cocos2d/cocos2d-x into develop 2013-09-17 19:30:53 +08:00
minggo ab26d63b86 Merge branch 'merge-physics' of https://github.com/minggo/cocos2d-x into develop 2013-09-17 19:30:49 +08:00
James Chen ea2afd75ca Merge pull request #3655 from dumganhar/develop 
Updating submodule of JS-Test.[ci skip]
 2013-09-17 04:30:24 -07:00
Dhilan007 087271b455 Merge branch 'develop' of github.com:cocos2d/cocos2d-x into develop 2013-09-17 19:26:53 +08:00
minggo ddaff9cce6 make cocos2dx depend chipmunk 2013-09-17 19:24:30 +08:00
minggo 1a02f26c58 Merge pull request #3646 from minggo/develop 
install glfw in install-deps-linux.sh
 2013-09-17 04:21:56 -07:00
James Chen 891f5fd78f Merge pull request #3653 from CocosRobot/updategeneratedsubmodule_1379415050 
[AUTO] : updating submodule reference to latest autogenerated bindings[ci skip]
 2013-09-17 04:16:11 -07:00
CocosRobot 55b252200d [AUTO] : updating submodule reference to latest autogenerated bindings 2013-09-17 10:50:55 +00:00
James Chen 1896305fcb closed #2450: Fixing HttpClientTest crashes on 64bit system. 2013-09-17 18:21:20 +08:00
minggo d488796896 Merge branch 'iss2771_physical' of https://github.com/boyu0/cocos2d-x into merge-physics 2013-09-17 18:14:12 +08:00
Dhilan007 a39e0d8521 Merge branch 'develop' of github.com:cocos2d/cocos2d-x into develop 2013-09-17 18:06:48 +08:00
minggo 85bd3cbbff fix compiling error 2013-09-17 18:05:10 +08:00
CaiWenzhi 05d230c626 Merge branch 'develop' into Merge_GUI_to_Develop 2013-09-17 18:01:28 +08:00
CaiWenzhi 9d6d9dcd19 Add getDescription method 2013-09-17 17:59:20 +08:00
James Chen 236402b620 Merge pull request #3650 from samuele3hu/developTest 
Manual bind the getDescendants function of the SpriteBatchNode class
 2013-09-17 02:57:47 -07:00
James Chen 2131e9aa43 Merge pull request #3649 from dumganhar/develop 
[iOS, Mac] Adding resources of CocoStudio GUI Test.[ci skip]
 2013-09-17 02:49:58 -07:00
James Chen 0d3cc9218d Merge pull request #3648 from CocosRobot/updategeneratedsubmodule_1379410806 
[AUTO] : updating submodule reference to latest autogenerated bindings[ci skip]
 2013-09-17 02:49:23 -07:00
James Chen 43e98be8b7 Adding resources of CocoStudio GUI Test. 2013-09-17 17:46:40 +08:00
Dhilan007 3cd581c63f Merge branch 'develop' of github.com:cocos2d/cocos2d-x into develop 2013-09-17 17:43:58 +08:00
samuele3hu dade2f1fd8 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTest 2013-09-17 17:42:35 +08:00
samuele3hu 068d0140d9 Manual bind the getDescendants function of the SpriteBatchNode class 2013-09-17 17:41:53 +08:00
CocosRobot c0a0dc580a [AUTO] : updating submodule reference to latest autogenerated bindings 2013-09-17 09:40:09 +00:00
boyu0 a454e373c7 issue #2771: move include chipmunk and box2d to cpp 2013-09-17 17:39:08 +08:00
James Chen 43e97f240a Merge pull request #3635 from dumganhar/box2d_test_bed_fix 
issue #2087: [dispatcher]  Fix box2d_test crash.
 2013-09-17 02:29:13 -07:00
James Chen beb8fa0b34 Merge branch 'develop' into box2d_test_bed_fix 2013-09-17 17:21:54 +08:00
James Chen 8bb2c3979e Merge pull request #3647 from dumganhar/bug422-fix 
issue #2087: [dispatcher] Fixing BugTest/Bug422 crashes.[ci skip]
 2013-09-17 02:18:09 -07:00
Dhilan007 18cea20634 Merge branch 'develop' of github.com:cocos2d/cocos2d-x into develop 2013-09-17 17:14:20 +08:00
boyu0 b5b6406976 issue #2771: edit compile setting. 2013-09-17 17:09:07 +08:00