James Chen
|
f2f3aa55bf
|
Merge branch 'gles20' of https://github.com/johnangel/cocos2d-x into iss-vs2012
Conflicts:
samples/Cpp/HelloCpp/proj.win32/HelloCpp.vcxproj
samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj
samples/Javascript/CocosDragonJS/proj.win32/CocosDragonJS.vcxproj
samples/Javascript/MoonWarriors/proj.win32/MoonWarriors.vcxproj
samples/Javascript/TestJavascript/proj.win32/TestJavascript.vcxproj
samples/Javascript/WatermelonWithMe/proj.win32/WatermelonWithMe.vcxproj
samples/Lua/HelloLua/proj.win32/HelloLua.vcxproj
samples/Lua/TestLua/proj.win32/TestLua.win32.vcxproj
scripting/javascript/bindings/generated
scripting/lua/proj.win32/liblua.vcxproj
|
2012-12-29 09:48:22 +08:00 |
James Chen
|
b4211c864e
|
fixed #1625: Updated the submodule reference of cocos2d-js-tests.
|
2012-12-27 11:05:09 +08:00 |
James Chen
|
bdb4df293b
|
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1602-jsb-sys
|
2012-12-25 10:01:48 +08:00 |
James Chen
|
f26ce4fb84
|
Made sys.localStorage support for jsb, works ok on win32.
|
2012-12-21 18:07:45 +08:00 |
minggo
|
89fb58e791
|
issue #1603:change pathes of android codes
|
2012-12-21 17:28:14 +08:00 |
James Chen
|
a36446cba2
|
Merge branch 'iss1603-adjust-directory' of https://github.com/minggo/cocos2d-x into iss1603-adjust-directory
|
2012-12-20 18:39:52 +08:00 |
minggo
|
977046cc32
|
issue #1603:make some samples build ok on iOS
|
2012-12-20 17:20:10 +08:00 |
James Chen
|
1562658bd8
|
issue #1603: Added libJSBinding project for win32 platform.
|
2012-12-20 17:18:02 +08:00 |
James Chen
|
7b19ab2689
|
Updated vs project configuration after adjusting directory.
|
2012-12-20 15:07:19 +08:00 |
minggo
|
959b7a3f0d
|
issue #1603:build MoonWarriors ok on iOS and android
|
2012-12-20 15:06:02 +08:00 |
minggo
|
7433da8bec
|
issue #1603:build CocosDragon ok on iOS and android
|
2012-12-20 14:54:20 +08:00 |
minggo
|
f9a9d45f88
|
issue #1603:adjust samples directory
Signed-off-by: minggo <ming@cocos2d-x.org>
|
2012-12-20 14:14:53 +08:00 |
James Chen
|
eb0e189842
|
Moved the submodule of cocos2d-js-tests and renamed it to Shared.
|
2012-12-20 11:30:18 +08:00 |