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 |
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 |
James Chen
|
5c5f2d84e2
|
issue #2905: Updating tolua settings.
|
2013-10-16 16:27:45 +08:00 |
James Chen
|
8e3e454a1e
|
Merge pull request #3953 from dumganhar/iss2905-folder-structure
issue #2905: Updating tolua settings.
|
2013-10-16 01:24:42 -07:00 |
James Chen
|
00ee416006
|
issue #2905: [iOS Mac] All js games work now.
|
2013-10-16 16:21:55 +08:00 |
James Chen
|
cb0bbd0d4c
|
Merge pull request #3952 from dumganhar/iss2905-folder-structure
issue #2905: [iOS Mac] All js games work now.
|
2013-10-16 01:18:41 -07: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
|
e0d897afd9
|
Merge pull request #3951 from dumganhar/iss2905-folder-structure
issue #2905: [iOS Mac] TestJavascript works now.
|
2013-10-16 00:42:01 -07:00 |
James Chen
|
039a2c93e1
|
issue #2905: [iOS Mac]Removing 'include' folder in 'external' group. Otherwise, it will find wrong included file.
|
2013-10-16 11:30:56 +08: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
|
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
|
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 |
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 |
boyu0
|
d1fead368d
|
issue #2771: migrate the PhysicsBody definition
|
2013-10-15 16:55:08 +08:00 |
boyu0
|
f7dc3bb98f
|
issue #2771: migrate the PhysicsShape definition
|
2013-10-15 13:48:01 +08:00 |
Dhilan007
|
2865ad798b
|
issues #2905:Updating project configuration for folder change.
|
2013-10-15 10:18:37 +08:00 |
Toru Matsuoka
|
3a3f480e1e
|
Add target file for replacing project_name. (for lua project)
|
2013-10-14 20:43:20 +09:00 |
Toru Matsuoka
|
46f021d747
|
Add target file for replacing project_name. (for javascript project)
|
2013-10-14 20:43:20 +09:00 |
Toru Matsuoka
|
951e792f04
|
Fix indent.
|
2013-10-14 20:43:17 +09:00 |
Toru Matsuoka
|
de9e831e35
|
Fix definition of platform for ios and mac.
Remove unnecessary files
|
2013-10-14 20:42:45 +09:00 |
Toru Matsuoka
|
613bb89120
|
Make "rename" setting usable.
|
2013-10-14 20:19:21 +09: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 |