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

12518 Commits

Author SHA1 Message Date
James Chen 96182ab5ab Merge pull request #3949 from dumganhar/iss2905-folder-structure 
issue #2905: [iOS, Mac] Updating project configuration, TestCpp works now.
 2013-10-15 20:19:16 -07:00
James Chen 8e80f1d46a issue #2905: Reverting TestCpp/Android.mk 2013-10-16 11:22:58 +08:00
James Chen 65f33461bc issue #2905: [iOS, Mac] Updating project configuration, TestCpp works now. 2013-10-16 11:19:42 +08:00
James Chen 7dc8aeb156 issue #2905: Updating include path for 'cocostudio' module, adding 'cocostudio' prefix. 2013-10-16 11:19:01 +08:00
Ricardo Quesada 5da40240b8 Merge pull request #3948 from ricardoquesada/xcode_fixes 
small fixes for the Xcode projects
 2013-10-15 13:37:08 -07:00
Ricardo Quesada 8cad67a3e1 small fixes for the Xcode projects 2013-10-15 13:36:03 -07: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
James Chen d2e7969a76 Merge pull request #3942 from dumganhar/iss2905-folder-structure 
issue #2905: [iOS, Mac] Always search user path.
 2013-10-14 03:22:12 -07:00
James Chen 9f89879e5e issue #2905: [iOS, Mac] Always search user path. 2013-10-14 17:43:59 +08:00
James Chen 16c88363f5 issue #2905: Updating project configuration for SimpleGame. 2013-10-14 17:16:39 +08:00
James Chen 438fe70287 issue #2905: [iOS, Mac] HelloCpp works now. 2013-10-14 15:53:14 +08:00
James Chen a7f9a73acd Merge pull request #3941 from dumganhar/iss2905-folder-structure 
issue #2905: [iOS, Mac] HelloCpp works now.
 2013-10-14 00:52:45 -07:00
minggo e9d61a831d Merge pull request #3940 from minggo/iss2905-adjust_folder 
issue #2905:add ccUtils.cpp
 2013-10-13 23:58:05 -07:00
minggo 92e0dbe0c1 issue #2905:add ccUtils.cpp 2013-10-14 14:56:57 +08:00
minggo c7288fd2a1 Merge pull request #3939 from minggo/iss2905-adjust_folder 
issue #2905: helloworld build ok on android
 2013-10-13 23:02:04 -07:00
minggo 95acb1b9e3 issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08: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 45710030d9 Merge pull request #3934 from minggo/iss2905-adjust_folder 
remove redundant codes
 2013-10-12 00:32:04 -07:00
minggo bb6208eec1 issue #2905: remove redundant codes 2013-10-12 15:31:05 +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 6e13b1e0b2 Merge pull request #3932 from dumganhar/develop 
Removing unused ios projects.
 2013-10-12 00:00:20 -07: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
James Chen 6cf79cb7c4 Merge pull request #3931 from dumganhar/develop 
Don't ignore (D|d)ebugXXX folders or files. And move scripting/javascript/bindings/js to 'scripting/javascript/script/' folder.
 2013-10-11 23:53:39 -07:00
minggo 11f24ba784 Merge pull request #3930 from minggo/iss2905-adjust_folder 
adjust folder
 2013-10-11 23:30:52 -07:00
minggo a96fc9dc16 issue #2905:add Box2D 2013-10-12 14:15:32 +08:00
minggo dfe85aa125 issue #2905:remove box2d 2013-10-12 14:14:57 +08:00
minggo 31b92aacc4 issue #2905: remove rpm, don't support qt5 temporaly 2013-10-12 14:10:18 +08:00
minggo af93802d01 Merge pull request #3928 from minggo/iss2905-adjust_folder 
adjust folder
 2013-10-11 23:04:53 -07: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 f3f24e3bbd issue #2905:use - to connect multiple words 2013-10-12 13:54:16 +08:00
minggo 5acbe663e0 issue #2905: add missing files 2013-10-12 13:44:57 +08:00
minggo 2ed04e7ebf Merge pull request #3925 from natural-law/develop 
Update the status of submodule plugin
 2013-10-11 21:02:47 -07:00
zhangbin a00fef9851 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-10-12 11:59:19 +08:00
minggo 3b544db5cd Merge pull request #3926 from minggo/iss2905-adjust_folder 
adjust folder structure
 2013-10-11 20:41:07 -07: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
zhangbin 37b6b5bfd3 Make the plugin be compatible with both cocos2d-x-2.2 & cocos2d-x-3.0. 2013-10-12 10:35:12 +08:00
James Chen 0385f9bd31 Merge pull request #3922 from dumganhar/develop 
[Win32] Fixing compilation errors after renaming 'CocosDenshion' to 'audio'.
 2013-10-11 06:55:00 -07:00
James Chen c914017c16 Small fix in ScriptingCore.cpp. 2013-10-11 21:52:55 +08:00
James Chen edcf9fecb4 [Win32] Fixing compilation errors after renaming CocosDenshion to 'audio'. 2013-10-11 21:52:28 +08:00
James Chen f1a212f356 Update AUTHORS [ci skip] 2013-10-11 18:26:25 +08:00
James Chen 7890efb24f Update CHANGELOG [ci skip] 2013-10-11 18:23:16 +08:00
James Chen f93c696004 Merge pull request #3549 from jimmystar/patch-1 
Fix wrong assignment for repeatforever argument.
 2013-10-11 03:19:20 -07:00
James Chen 477480bf8e Merge pull request #3920 from CocosRobot/updategeneratedsubmodule_1381475703 
[AUTO] : updating submodule reference to latest autogenerated bindings[ci skip]
 2013-10-11 00:18:15 -07:00
James Chen eb9f009c73 Update CHANGELOG [ci skip] 2013-10-11 15:16:30 +08:00