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

12247 Commits

Author SHA1 Message Date
samuele3hu d43709446a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTest 2013-09-17 14:00:31 +08:00
samuele3hu 3809a6feed Repair some lua test samples bug and del tool/tolua++ folders 2013-09-17 13:59:48 +08:00
minggo b7b73f5f92 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-09-17 13:40:05 +08:00
minggo b42c2fc487 remove dependence of sdl 2013-09-17 13:39:16 +08:00
minggo d1259f88e9 Merge pull request #3642 from Dhilan007/develop 
[ci skip]Add setTouchPriority empty implementation for CCLayer.
 2013-09-16 22:37:15 -07:00
zhangcheng a25c2cabf8 1. Fixes failed to build windows. 
2. Upload CocoGUI Resources.
 2013-09-17 13:25:15 +08:00
Dhilan007 db169c6d91 Add setTouchPriority empty implementation for CCLayer. 2013-09-17 13:04:28 +08:00
samuele3hu 5339603bdb Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTest 2013-09-17 13:00:46 +08:00
samuele3hu 40ed7bc326 Add a deprecated function 2013-09-17 12:59:38 +08:00
James Chen 06f9f88ad9 Merge pull request #3640 from dumganhar/makefile-fixes 
Makefile fixes
 2013-09-16 21:10:10 -07:00
James Chen 9cd99f4c66 [Android] ArmatureTest compilation fix. 2013-09-17 11:56:00 +08:00
minggo 934568051a Merge pull request #3641 from minggo/android-fix 
implement Cocos2dxHelperListener
 2013-09-16 20:46:56 -07:00
minggo 3072144ad5 implement Cocos2dxHelperListener 2013-09-17 11:44:33 +08:00
James Chen fe1b11a814 Fixing wrong include. 2013-09-17 11:28:33 +08:00
boyu0 9f7bf4349c Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-09-17 11:19:47 +08:00
boyu0 54f7146d5f issue #2771: update vs project setting 2013-09-17 11:18:53 +08:00
James Chen 664345a673 Removing unused files. Old XXXDispatcher. 2013-09-17 11:01:00 +08:00
James Chen 480b2dd1d8 [Linux] Updating Makefile for TestCpp. 2013-09-17 10:52:42 +08:00
James Chen 28b266bc5e [Android] Android.mk fixes after adding GUI test. 2013-09-17 10:49:59 +08:00
James Chen 650e6ad6fc issue #2087: [dispatcher] Updating MenuTest. 2013-09-17 10:46:31 +08:00
boyu0 481ad7ef12 issue #2771: update project setting 2013-09-17 10:41:08 +08:00
James Chen 365419a8b2 issue #2087: [dispatcher] Fix box2d_test crash. 2013-09-16 23:35:16 +08:00
James Chen e0da2578e1 Merge pull request #3633 from CocosRobot/updategeneratedsubmodule_1379343833 
[AUTO] : updating submodule reference to latest autogenerated bindings[ci skip]
 2013-09-16 08:32:08 -07:00
minggo 334c9c9e02 Merge pull request #3634 from minggo/develop 
fix memory leak
 2013-09-16 08:30:48 -07:00
minggo f9c5ece2d5 fix memory leak 2013-09-16 23:28:00 +08:00
CocosRobot 6de18229e2 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-09-16 15:04:01 +00:00
boyu0 f96bc2355a issue #2771: update android.mk 2013-09-16 22:56:20 +08:00
boyu0 8ec7996dcd issue #2771: Edit delegate to listener. 2013-09-16 22:51:48 +08:00
James Chen ec57e99d63 Merge pull request #3632 from dumganhar/develop 
issue #2087: [dispatcher]  fixedPriority == 0 is forbidden since it's used for scene graph based priority.
 2013-09-16 07:47:16 -07:00
James Chen 2d0ca10bbf issue #2087: [dispatcher] fixedPriority == 0 is forbidden since it's used for scene graph based priority. 2013-09-16 22:46:44 +08:00
James Chen 157ffa9299 Merge pull request #3627 from nutty898/Merge_GUI_to_Develop 
Merge gui to develop 3.0 branch
 2013-09-16 07:45:23 -07:00
CaiWenzhi f983155d7c Modify scene sample 2013-09-16 22:29:53 +08:00
James Chen 605fdb73bb issue #2087: [dispatcher] Reverts: CCLOG --> CCLOGINFO. 2013-09-16 22:23:07 +08:00
James Chen a5d0820823 Merge pull request #3630 from dumganhar/develop 
issue #2087: [dispatcher] Adding remove all event listener method in Node, removed unused codes.
 2013-09-16 07:21:30 -07:00
James Chen 36bfb24d29 issue #2087: [dispatcher] Adding remove all event listener method in Node, removed unused codes. 2013-09-16 22:20:01 +08:00
boyu0 a48fee881d Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-09-16 22:16:50 +08:00
CaiWenzhi d276bfc885 modify mk files 2013-09-16 22:15:29 +08:00
minggo 7d6df7963b Merge pull request #3629 from minggo/develop 
[ci skip]update changelog
 2013-09-16 07:10:41 -07:00
minggo d31a81cb15 update changelog 2013-09-16 22:08:38 +08:00
boyu0 2c66f1b95e issue #2771: Implement the minimum set of physical API. Improve the PhysicsTest 2013-09-16 21:22:22 +08:00
CaiWenzhi 0b48552f04 Modify scene reader 2013-09-16 21:07:11 +08:00
James Chen 5907e56601 Update AUTHORS [ci skip] 2013-09-16 21:00:24 +08:00
James Chen 61d9fd3c8a Merge pull request #3626 from dumganhar/savdalion-suppressed-C4996 
Merge PR https://github.com/cocos2d/cocos2d-x/pull/3624[ci skip]
 2013-09-16 05:58:29 -07:00
James Chen b128018f76 Merge branch 'suppressed-C4996' of https://github.com/savdalion/cocos2d-x into savdalion-suppressed-C4996 
Conflicts:
	extensions/CocoStudio/Armature/external_tool/GLES-Render.cpp
	samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp
 2013-09-16 20:58:26 +08:00
CaiWenzhi 759fcc147b Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Merge_GUI_to_Develop 2013-09-16 20:55:55 +08:00
CaiWenzhi ca599b4852 Merge guy to 3.0 branch 2013-09-16 20:54:13 +08:00
James Chen afc8627796 Merge pull request #3625 from dumganhar/develop 
Re-adding the submodule of plugin which was deleted in  pull request #3623[ci skip]
 2013-09-16 05:53:09 -07:00
James Chen 6a662c094f Re-adding the submodule of plugin which was deleted in pull request #3623. 2013-09-16 20:53:27 +08:00
James Chen a8032b4a58 Merge pull request #3623 from dumganhar/2youyouo2-develop 
Updating armature (Merge PR https://github.com/cocos2d/cocos2d-x/pull/3600)[ci skip]
 2013-09-16 05:44:40 -07:00
James Chen 9981aecddf Removing unneeded log in win32/CCEGLView.cpp. 2013-09-16 20:41:03 +08:00