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

12641 Commits

Author SHA1 Message Date
minggo 5f65cdc3c0 fix xcode compiling error and simplify android.mk 2013-10-18 15:39:09 +08:00
boyu0 d12ee5f120 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-10-18 15:34:13 +08:00
Dhilan007 8fb0327597 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-10-18 14:57:33 +08:00
minggo e72b8bf76c Merge pull request #3971 from minggo/iss2905-adjust_folder 
issue #2905:simplify Android.mk dependence
 2013-10-17 23:20:15 -07:00
minggo 63c13d8eaa issue #2905:simplify Android.mk dependence 2013-10-18 14:18:36 +08:00
boyu0 88ae56bfe9 issue #2771: implement PhysicsBody's bit masks. 2013-10-18 13:52:25 +08:00
Dhilan007 86384b0df1 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-10-18 12:36:18 +08:00
James Chen 7d588fbaa3 Update CHANGELOG 2013-10-18 11:15:02 +08:00
James Chen c8ba071294 Update AUTHORS 2013-10-18 11:13:54 +08:00
James Chen d9241526e7 Merge pull request #3968 from dumganhar/create-project-fix 
Merge PR 3943
 2013-10-17 20:12:25 -07:00
James Chen ca3cbec858 [Template] Hello JavaScript --> HelloJavascript. It's for replacement. 2013-10-18 11:06:17 +08:00
James Chen d6be31f74a Merge commit 'refs/pull/3943/head' of git://github.com/cocos2d/cocos2d-x into create-project-fix 2013-10-18 10:40:12 +08:00
James Chen 39afa3b8df Merge pull request #3967 from dumganhar/change-url 
Changing the submodule URL for 'auto-generated'.
 2013-10-17 19:00:36 -07:00
James Chen 8c0d7e151c Updating the submodule reference of 'auto-generated'. 2013-10-18 10:02:47 +08:00
Dhilan007 66c2fe26ef Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-10-17 22:34:09 +08:00
minggo 8a7f52d5d9 Merge pull request #3966 from minggo/iss2905-adjust_folder 
issue #2905:simple game and assets manager build ok on android
 2013-10-17 03:41:08 -07:00
minggo 9c3cac759c issue #2905:simple game and assets manager build ok on android 2013-10-17 18:39:37 +08:00
Dhilan007 b2be3ed4ee Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-10-17 18:02:08 +08:00
minggo 5c7f037508 Merge pull request #3965 from minggo/iss2905-adjust_folder 
issue #2509:make lua android template build ok
 2013-10-17 02:47:01 -07:00
minggo 4d28d0ab8b issue #2509:make lua android template build ok 2013-10-17 17:46:09 +08:00
Dhilan007 6f39f903e3 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-10-17 16:23:19 +08:00
James Chen 736a117fae Changed submodule URL for 'auto-generated'. 2013-10-17 16:15:51 +08:00
James Chen 222cb93aaf Update AUTHORS 2013-10-17 15:43:45 +08:00
James Chen 28c627fcfa Update CHANGELOG 2013-10-17 15:38:24 +08:00
James Chen fd0e84bfa2 Merge pull request #3963 from kpkhxlgy0/use 
closed #2994: Can't click the area that outside of keyboard to close keyboard when using EditBox
 2013-10-17 00:36:33 -07:00
minggo 64a8205573 Merge pull request #3964 from minggo/iss2905-adjust_folder 
issue #2905: jsbinding samples and lua binding samples build ok on andro...
 2013-10-17 00:06:20 -07:00
minggo e50f9fc43b issue #2905: jsbinding samples and lua binding samples build ok on android 2013-10-17 15:04:30 +08:00
XiaoLongHan a2de02cc19 Change the class name of textfield to compare, so that you can touch anywhere outside of the virtual keyboard. 2013-10-17 14:21:55 +08:00
James Chen c2ac8ffd28 Merge pull request #3962 from dumganhar/develop 
Added missing icons for some iOS and Mac samples.
 2013-10-16 23:09:54 -07:00
James Chen 34fe2ba02c Added missing icons for some iOS and Mac samples. 2013-10-17 14:12:43 +08:00
Dhilan007 546bc3aa32 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-10-17 11:33:10 +08:00
minggo c903c1a9a9 Merge pull request #3961 from minggo/iss2905-adjust_folder 
issue #2905:TestJavascript build ok on Android
 2013-10-16 20:30:41 -07:00
minggo 8f9756f030 issue #2905:TestJavascript build ok on Android 2013-10-17 11:28:57 +08:00
boyu0 89448135ad issue #2771: implement some joint definition. 2013-10-17 10:57:48 +08:00
Dhilan007 d82c2ca060 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-10-17 09:39:48 +08:00
Ricardo Quesada ba7e4e6c7d Merge pull request #3960 from ricardoquesada/mac_icons 
Icons for test projects
 2013-10-16 11:56:45 -07:00
Ricardo Quesada 3cbeabc777 Icons for test projects 2013-10-16 11:55:14 -07:00
Ricardo Quesada 07104ee8f8 Merge pull request #3959 from ricardoquesada/xcode_fixes 
more Xcode fixes
 2013-10-16 11:46:30 -07:00
Ricardo Quesada 28de91d965 more Xcode fixes 2013-10-16 11:45:58 -07:00
James Chen 512a60a690 Merge pull request #3958 from dumganhar/iss2905-folder-structure 
issue #2905: [iOS Mac] Updating template.
 2013-10-16 07:51:47 -07:00
James Chen 5ffe904a1b issue #2905: [iOS Mac] Updating template. 2013-10-16 22:54:55 +08:00
Dhilan007 a91621ae5a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-10-16 17:51:02 +08:00
James Chen cee53d8ac3 Merge pull request #3957 from dumganhar/iss2905-folder-structure 
Update auto-generated submodule manually.
 2013-10-16 02:34:18 -07:00
James Chen afe2b8e0c1 Update auto-generated submodule manually. 2013-10-16 17:37:34 +08:00
James Chen a94e0badc9 Merge pull request #3956 from dumganhar/iss2905-folder-structure 
issue #2905: [iOS Mac] Updating project configurations.
 2013-10-16 02:32:18 -07:00
Dhilan007 c6344875de Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-10-16 17:30:51 +08:00
James Chen b5233fc18d issue #2905: [iOS Mac] Updating project configurations. 2013-10-16 17:27:30 +08:00
James Chen d283c66803 Merge pull request #3955 from dumganhar/iss2905-folder-structure 
issue #2905: [iOS Mac] HelloLua and TestLua work now.
 2013-10-16 02:17:43 -07:00
James Chen 225738ecc5 issue #2905: [iOS Mac] HelloLua and TestLua work now. 2013-10-16 17:19:02 +08:00
minggo 75cf78de67 Merge pull request #3954 from minggo/iss2905-adjust_folder 
Iss2905 adjust folder
 2013-10-16 01:51:49 -07:00