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

12499 Commits

Author SHA1 Message Date
boyu0 6aef4476d9 issue #2771: edit some mistake when merge 2013-10-18 15:55:47 +08:00
Dhilan007 6ce34288e0 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-10-18 15:53:26 +08:00
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 63c13d8eaa issue #2905:simplify Android.mk dependence 2013-10-18 14:18:36 +08:00
Dhilan007 86384b0df1 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-10-18 12:36:18 +08:00
dualface 8f2f524f2d fix tolua_fix, cleanup peertable after object deleted 2013-10-18 11:30:28 +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 9c3cac759c issue #2905:simple game and assets manager build ok on android 2013-10-17 18:39:37 +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 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 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
Dhilan007 546bc3aa32 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-10-17 11:33:10 +08:00
minggo 8f9756f030 issue #2905:TestJavascript build ok on Android 2013-10-17 11:28:57 +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 afe2b8e0c1 Update auto-generated submodule manually. 2013-10-16 17:37:34 +08: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 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 91eada6c1e Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2905-adjust_folder 2013-10-16 16:50:46 +08:00
minggo 8f7a489a4d issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
James Chen 352d1f6768 issue #2905: Renaming lua/cocos2dx_support to lua/bindings. 2013-10-16 16:40:07 +08:00
Dhilan007 3d1f734326 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-10-16 15:44:43 +08:00
James Chen 6fba0dd5db issue #2905: [iOS Mac] TestJavascript works now. 2013-10-16 15:43:59 +08:00
James Chen 7dc8aeb156 issue #2905: Updating include path for 'cocostudio' module, adding 'cocostudio' prefix. 2013-10-16 11:19:01 +08:00
Dhilan007 5116e91c4b Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into di2905 2013-10-16 11:00:22 +08:00
minggo 410280a8d3 Merge pull request #3945 from minggo/iss2905-adjust_folder 
issue #2905: testcpp bild ok on Android
 2013-10-15 03:02:12 -07:00
minggo 6fc2be62f5 issue #2905: testcpp bild ok on Android 2013-10-15 18:00:03 +08:00
Dhilan007 2865ad798b issues #2905:Updating project configuration for folder change. 2013-10-15 10:18:37 +08:00
James Chen 438fe70287 issue #2905: [iOS, Mac] HelloCpp works now. 2013-10-14 15:53:14 +08:00
minggo 92e0dbe0c1 issue #2905:add ccUtils.cpp 2013-10-14 14:56:57 +08:00
minggo 95acb1b9e3 issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
ThePickleMan 870f7de357 Readded trimmed semicolon 2013-10-13 23:12:41 -05:00
PickleMan 01ebb2ac29 Added triangle, quad bezier, cubic bezier drawing to DrawNode 2013-10-13 23:41:55 -04:00
minggo 1751cc3d89 Merge pull request #3935 from minggo/remove-subfolder 
issue #2905: remove sub folders except platform
 2013-10-13 18:40:02 -07:00
minggo 49d7bbd600 issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
minggo 5182a3c978 Merge pull request #3933 from minggo/iss2905-adjust_folder 
adjust folder structure
 2013-10-12 00:27:48 -07:00
minggo 8eeb911e8f issue #2905: adjust folder structure 2013-10-12 15:25:45 +08:00
James Chen f6275667bf Removing unused ios projects. 2013-10-12 15:02:28 +08:00
James Chen 7de6646213 Don't ignore (D|d)ebugXXX folders or files. And move scripting/javascript/bindings/js to 'scripting/javascript/script/' folder. 2013-10-12 14:56:40 +08:00
minggo 19ee87e29a issue #2905: step2 Box2D -> box2d 2013-10-12 14:03:04 +08:00
minggo 1f38636e84 issue #2905: step1 Box2D -> box2d 2013-10-12 14:02:13 +08:00
minggo 5acbe663e0 issue #2905: add missing files 2013-10-12 13:44:57 +08:00
minggo ad6325b0dd fix conflicts 2013-10-12 11:31:32 +08:00
minggo 4313c46e93 issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00