johnangel
674bb8e728
Setting PlatformToolSet to v110_xp instead of default v110 in Visual Studio 2012 for Windows XP support, leaving default v100 in Visual Studio 2010.
2013-01-07 11:51:05 +01:00
James Chen
3fa771f0c4
fixed #1620 : Using sqlite3 to implement sys.LocalStorage for iOS and android.
2013-01-07 17:22:06 +08:00
James Chen
1882ca30f5
issue #1620 : Binding sqlite3 to sys.localStorage. And updated win32 project configuration.
2013-01-06 14:42:24 +08:00
James Chen
8fa2eb080b
issue #1640 : Updated Box2dTest and ChipmunkTest.
2013-01-06 10:22:07 +08:00
James Chen
0c28510513
issue #1640 : Updated ChipmunkTest.cpp.
2013-01-06 10:13:59 +08:00
James Chen
4d919465a5
issue #1640 : Updated the submodule reference of cocos2d-js-tests.
2013-01-05 18:54:49 +08:00
James Chen
8a21f4fa3c
issue #1640 : Added some files to iOS Project.
2013-01-05 17:41:19 +08:00
James Chen
421cf31b34
issue #1640 : Updated jsbinding for CCPhysicsSprite .
2013-01-05 15:09:19 +08:00
James Chen
4d9d6c6c4c
Updated the submodule reference of cocos2d-js-tests.
2013-01-05 14:05:13 +08:00
James Chen
9ef74bef80
fixed #1636 : Deleted CC_ENABLE_CHIPMUNK_INTEGRATION and CC_ENABLE_BOX2D_INTEGRATION in ccConfig.h since they are moved to extension, it doesn't depend on engine any more.
...
Added platform macro for CCEditBoxImpl* files.
2013-01-05 11:10:24 +08:00
James Chen
7bcbcfa187
fixed #1636 : Refactored CCEditBox for iOS, moved the implementation of EditBoxImplIOS.h/.cpp to CCEditBoxImplIOS.h/.cpp.
2013-01-05 10:56:57 +08:00
James Chen
3263d06830
Merge pull request #1814 from fape/marmalade_simplegame
...
fixed #1631 : Making SimpleGame force landscape for Marmalade.
2013-01-03 19:07:41 -08:00
James Chen
ec72701414
Merge pull request #1815 from fape/marmalade_testlua
...
Marmalade TestLua postbuild script
2013-01-03 18:53:47 -08:00
James Chen
f6b57a9b92
Removing grskia dependancy and adding in freetype support to the builds.
2013-01-04 10:16:18 +08:00
fape
94471a06b6
rename and add commandline argument to cccopy.py
2013-01-03 20:52:22 +01:00
fape
e34f190f36
add SimpleGame Marmalade config files
2013-01-03 15:20:58 +01:00
fape
f3f67f62e1
.gitignores moved
2013-01-03 15:16:11 +01:00
fape
3c89bf1d83
marmalade TestLua: add postbuild script to copy resources
2013-01-03 14:47:57 +01:00
Dale Ducharme
611db78b39
Removing grskia dependancy and adding in freetype support to the builds.
2013-01-02 18:53:31 -05:00
James Chen
d2ad820a48
fixed #1627 : Adding view name for sample applications.
2012-12-29 14:50:00 +08:00
James Chen
9bd302e35b
fixed #1627 : VS version check in project file.
2012-12-29 13:54:46 +08:00
James Chen
b120874a87
fix compilation errors.
2012-12-29 11:23:31 +08:00
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
c68884a121
issue #1625 : Updated EffectsTest.cpp and EffectsTest.lua.
2012-12-27 11:48:46 +08:00
James Chen
0e7934a8ce
Revert TestCpp/proj.win32/main.cpp.
2012-12-27 11:40:32 +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
7d9f06b48c
fixed #1625 : Updated TestCpp. 'ccg' --> 'CCSizeMake' . And exchanged the parameter order for 3D action tests.
2012-12-27 10:55:25 +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
johnangel
08cd9e37fc
Setting PlatformToolSet to v110_xp for Visual Studio 2012 only.
2012-12-24 10:27:56 +01:00
James Chen
eb417274fb
fixed #1621 : fix compilation error of eclipe project.
2012-12-24 11:15:56 +08:00
ivzave
fcce930188
repair linux eclipse build & add 64-bit project configurations
2012-12-22 07:14:59 +04:00
ivzave
0538b22300
repair linux cli build
2012-12-22 04:14:15 +04: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
minggo
f71f13fc53
issue #1536:add permissions and modify module path error
2012-12-21 14:40:34 +08:00
James Chen
e670d702a8
issue #1603 : Updated TestLua project setting for iOS port.
2012-12-20 21:58:26 +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
James Chen
f47c5e1714
Added app.icf, development.icf.
2012-12-20 18:29:25 +08:00
minggo
65e01b9ade
issue #1603:build ok on mac
2012-12-20 18:02:24 +08:00
James Chen
f65717cd86
issue #1603 : updated linux project configuration.
2012-12-20 17:49:34 +08:00
James Chen
08aa5066a5
issue #1603 : updated blackberry, linux, marmalade project configurations.
2012-12-20 17:47:30 +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
James Chen
af03a969c1
Merge branch 'iss1603-adjust-directory' of https://github.com/minggo/cocos2d-x into iss1603-refactor-folder
2012-12-20 14:36:08 +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
dcfd38756d
Updated android build files.
2012-12-20 14:04:49 +08:00
James Chen
4660e72eda
issue #1603 : Moved the position of some projects.
2012-12-20 12:58:21 +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
James Chen
43c8aa6878
Updated the submodule of cocos2d-js-tests.
2012-12-20 10:41:36 +08:00
unknown
adb68ddbb6
Enable Windows XP support in Visual Studio 2012 Update 1.
...
Not tested with Visual Studio 2010, not sure will it work with PlatformToolset v110_xp.
2012-12-19 19:28:25 +01:00
James Chen
254e3838d5
Updated the submodule reference of cocos2d-js-tests to the latest version.
2012-12-14 10:32:06 +08:00
James Chen
190e6c1de5
Merge branch 'linux-lua' of https://github.com/dumganhar/cocos2d-x into lua-linux
...
Conflicts:
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2012-12-10 17:25:23 +08:00
James Chen
21f88534cf
fixed #1606 : Updated some invocations of CCSequence for TestCpp project.
2012-12-10 14:12:56 +08:00
fape
12c9ebb221
include all resources from Resource dir to SampleGame marmalade project file
2012-12-06 10:41:02 +01:00
James Chen
6a7a365365
Updated eclipse project configurations for linux
2012-12-06 14:57:03 +08:00
James Chen
b044a89d6f
Merge branch 'gles20' of https://github.com/ivzave/cocos2d-x into linux-lua
...
Conflicts:
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2012-12-06 14:55:18 +08:00
fape
320d532e15
add Hungarian language support
2012-12-05 11:31:05 +01:00
minggo
a256d35a5b
fix some confilcs
2012-12-05 14:01:05 +08:00
James Chen
bd471b7ee9
[Marmalade fix] Added development.icf for HelloCpp. Added Marker Felt.ttf for SampleGame.
2012-12-04 21:54:19 +08:00
James Chen
d02cb3f320
Updated samples/MoonWarriors/proj.android/build_native.sh. Because the boot file has been changed from MoonWarriors-native.js to MoonWarriors-jsb.js.
2012-12-04 20:07:23 +08:00
minggo
58a187f774
do some bug fixes
2012-12-04 18:44:32 +08:00
James Chen
eed78507bf
fixed missing level.js for WatermelonWithMe.
2012-12-04 17:46:51 +08:00
James Chen
060698e195
fixed missing main.js for CocosDragonJS.
2012-12-04 17:38:15 +08:00
minggo
cb2427e780
do some modification
2012-12-04 17:25:40 +08:00
James Chen
5408f3d947
Merge pull request #1715 from dumganhar/gles20
...
Fixed some issues for linux port.
2012-12-04 00:51:03 -08:00
James Chen
3e88f8d2e4
fix compilation errors in eclipse project for linux.
2012-12-04 16:48:23 +08:00
James Chen
6aa15e0636
Added -DCOCOS2D_DEBUG=1 for linux if building in debug mode.
2012-12-04 16:48:23 +08:00
minggo
9691886582
make TestLua work ok on iOS
2012-12-04 16:03:27 +08:00
minggo
98e0123731
add icons for WatermelonWithMe and CocosDragon
2012-12-04 15:54:03 +08:00
minggo
f4656ad00f
update cocos2d-js-tests to up-stream
2012-12-04 14:00:29 +08:00
minggo
9c04db0e41
modify js-binding related samples according the modification of cocos2d-js-tests
2012-12-04 12:08:37 +08:00
James Chen
b5ae1f6d2a
Updated MoonWarriors/Classes/AppDelegate.cpp.
...
Updated the submodule reference of cocos2d-js-tests to the latest one.
Fixed duplicate define in js_bindings_ccbreader.cpp.
2012-12-04 11:36:45 +08:00
James Chen
ed86e2967f
Merge pull request #1706 from dumganhar/iss1590-jpeg-fix-mm
...
fixed #1590 : JPEG and File fixes and CocosDenshion fix for marmalade.
2012-12-03 19:10:14 -08:00
Mat Hopwood
3b2eea2541
JPEG and File fixes
...
* Fixes to JPEG loader
* Fixes to image loader to load tiff and unknown formats properly
2012-12-04 11:03:34 +08:00
minggo
bbcbfa71ef
Merge pull request #1704 from minggo/cclayer_script_support
...
Cclayer script support
2012-12-03 18:55:11 -08:00
minggo
4e7fca3185
merge dualface's pull request for fixing CCLayer script support and fix error for js-binding
2012-12-04 10:52:49 +08:00
James Chen
9f168faeb0
Merge pull request #1696 from fape/lua_marmalade
...
fixed #1591 : Update for Lua marmalade.
* Add ignore marmalade generated Visual Studio directory
* Update Lua and HelloLua marmalade project file
* Add TestLua marmalade project
2012-12-03 18:51:39 -08:00
folecr
58e6c80078
Remove hardcoded android:debuggable property
2012-12-03 13:34:55 -08:00
fape
2eaa5188bf
add missing Box2d to TestLua marmalade project
2012-12-03 13:13:16 +01:00
James Chen
27bc5094c2
Updated the submodule reference of cocos2d-js-tests.
2012-12-03 19:16:33 +08:00
James Chen
9224b12a9c
Updated the submodule reference of cocos2d-js-tests.
2012-12-03 18:30:43 +08:00
James Chen
478791a472
Added CCBReader::setCCBRootPath.
2012-12-03 18:27:50 +08:00
James Chen
1d07752fd3
Updated SchedulerTest for TestCpp project.
2012-12-03 15:33:37 +08:00
minggo
180bd8b3a7
issue #1583:TestJavascript work ok on iOS
2012-12-03 11:07:22 +08:00
minggo
2cf49da2bc
Merge branch 'gles20' of https://github.com/dumganhar/cocos2d-x into iss1583-update-js
2012-12-03 10:31:22 +08:00
minggo
b805c31dc2
add execute permission of build_native.sh
2012-12-03 10:30:48 +08:00
James Chen
987e898807
issue #1583 : Updated the project configurations of TestJavascript for android and win32. Updated the submodule reference of cocos2d-js-tests.
2012-12-03 10:28:44 +08:00
fape
bbccab8f6b
TestLua marmalade project
2012-12-02 15:30:22 +01:00
fape
aac98975da
update lua marmalade project
2012-12-02 15:29:10 +01:00
James Chen
005bc31499
Made WatermelonWithMe works on iOS.
2012-12-02 16:13:22 +08:00
James Chen
071f8cdbb4
issue #1583 : Updated the submodule reference of cocos2d-js-tests.
2012-12-02 15:18:50 +08:00
James Chen
a96b946f67
Updated the submodule reference of cocos2d-js-tests.
...
Made WatermelonWithMe works on win32 and android.
2012-12-02 15:13:40 +08:00
Rohan Kuruvilla
4b1d5edbc6
Updating CocosDragonJS Android view settings to look like iPhone
2012-11-30 16:08:19 -08:00
James Chen
eaacc74ce5
issue #1583 : Updated the submodule cocos2d-js-tests.
2012-11-30 21:39:58 +08:00
James Chen
95875112fa
Merge branch 'iss1583-js-tests' of https://github.com/dumganhar/cocos2d-x into iss1583-js-tests
2012-11-30 21:19:19 +08:00
James Chen
daf61bc3eb
issue #1583 : Deleted samples/WatermelonWithMe/watermelon_with_me.js.
2012-11-30 21:17:06 +08:00
minggo
9ac3a356d5
issue #1583:CocosDragonJS MoonWarriors and TestJavascript work ok on android
2012-11-30 18:27:08 +08:00
minggo
81077aba58
issue #1583:MoonWarriors and CocosDragon work ok on iOS
2012-11-30 15:07:11 +08:00
James Chen
7417f53ed0
Updated cocos2d-js-tests reference.
2012-11-30 14:43:56 +08:00
James Chen
0f1232ab9f
issue #1583 : TestJavascript works ok on win32.
2012-11-30 14:01:35 +08:00
James Chen
da8cf18d24
Merge branch 'gles20' into iss1583-js-tests
2012-11-30 13:40:52 +08:00
James Chen
6e33d31a63
Updated the submodule cocos2d-js-tests.
2012-11-30 13:07:32 +08:00
James Chen
23629b8187
Made all projects compiled ok on Blackberry port.
2012-11-30 12:40:47 +08:00
James Chen
c53cfe88a7
Merge pull request #1674 from fape/helloCPP_marmalade
...
Add missing AppMacros.h to HelloCpp marmalade project file
2012-11-29 02:21:34 -08:00
James Chen
bd95b198fe
Merge pull request #1675 from dumganhar/gles20
...
Fixed some warning and make TestCpp (win32 release version) compiled ok.
2012-11-29 02:20:52 -08:00
fape
834934fd15
add missing AppMacros.h to HelloCpp marmalade projekt file
2012-11-29 11:06:03 +01:00
James Chen
d27ab38be9
fixed some warning and make win32 release version compiled ok.
2012-11-29 18:04:33 +08:00
minggo
b6dab85611
add Texture2DTest cases
2012-11-29 17:57:33 +08:00
James Chen
788b478b3c
Make sure HelloCpp can be full screen.
2012-11-29 16:31:29 +08:00
James Chen
494806167b
Temporary commit.
2012-11-29 15:26:24 +08:00
James Chen
208132895e
issue #1583 : Moved the common js codes to scripting/javascript/bindings/js folder. Deleted the old js sample resources.
2012-11-29 11:27:39 +08:00
James Chen
358e47e981
issue #1583 : Updated the submodule reference of cocos2d-js-tests.
2012-11-29 11:27:16 +08:00
Taro Kobayashi
a37e034e61
added support for Japanese language
2012-11-28 17:53:10 +09:00
minggo
33647ccebb
Merge pull request #1660 from minggo/gles20
...
make CocosGragon work on iOS devices with debug mode
2012-11-26 19:57:37 -08:00
minggo
09344d55be
make CocosGragon work on iOS devices with debug mode
2012-11-27 11:55:59 +08:00
James Chen
342c7bc724
Merge pull request #1657 from fape/cocos_extensions_marmalade
...
fixed #1578 : Create cocos2dx-ext marmalade project.
2012-11-26 19:15:06 -08:00
James Chen
9bd3014137
Fixed CocosBuilderTest/AnimationTest crash, fixed some memory leaks in CCBReader.cpp.
2012-11-27 10:26:40 +08:00
fape
1843d576d8
create cocos2dx-ext marmalade project
2012-11-26 20:14:10 +01:00
James Chen
e248d9d472
fixed #1576 : Updated CocosBuilderTest.
2012-11-26 22:00:25 +08:00
James Chen
e0948a4817
fixed #1576 : Sync CCBReader to latest version, CCString* --> std::string, CocosBuilderTest crash fixes.
2012-11-26 21:51:05 +08:00
minggo
8063b9b9fb
give a guide information to run Box2dTest
2012-11-26 17:23:36 +08:00
minggo
6bb11d8d71
Merge branch 'gles20' of https://github.com/minggo/cocos2d-x into gles20
2012-11-26 15:09:34 +08:00
minggo
bd025c94c3
use macro CC_TARGET_OS_IPHONE instead of TARGET_OS_IPHONE and make xcode template work ok
2012-11-26 15:08:40 +08:00
minggo
1b9a38e195
issue #1564:work ok on linux
2012-11-26 11:46:37 +08:00
fape
3cc5920aac
Update samples/TestCpp to compatible with marmalade
2012-11-24 20:14:01 +01:00
minggo
1cf237d296
Merge pull request #1643 from minggo/gles20
...
issue #1564:make iOS test work ok
2012-11-23 00:31:06 -08:00
minggo
a423317abc
issue #1564:make iOS test work ok
2012-11-23 16:30:09 +08:00
James Chen
48d77fedc1
issue #1573 : Reverted GameScene.js and MainMenuScene.js.
2012-11-23 15:09:04 +08:00
James Chen
7c1e860d78
issue #1573 : Added CocosDragonJS. Made it compiled ok on iOS,android and win32.
2012-11-23 15:09:03 +08:00
James Chen
6af0188295
First commit CocosDragonJS.
2012-11-23 15:09:02 +08:00
Rohan Kuruvilla
cfb59529a8
Adding CocosDragonJS project
2012-11-23 15:08:58 +08:00
minggo
3980a710a3
Merge pull request #1641 from minggo/gles20
...
issue #1564 : make tests run on mac osx
2012-11-22 22:24:25 -08:00
minggo
96ecb05ca9
issue #1564 : make tests run on mac osx
2012-11-23 14:22:50 +08:00
minggo
f82e800695
Merge pull request #1640 from minggo/gles20
...
modify lua project setting
2012-11-22 18:42:45 -08:00
minggo
226b10a9e2
modify lua project setting
2012-11-23 10:41:41 +08:00
James Chen
971d948132
issue #1572 : WatermelonWithMe works on iOS now.
2012-11-22 19:05:38 +08:00
James Chen
c32ea4486b
issue #1572 : WatermelonWithMe works on Android now.
2012-11-22 18:46:30 +08:00
James Chen
7c1a3a7305
issue #1572 : Modify vs2010 solution.
2012-11-22 17:54:55 +08:00
James Chen
e0fd8f6284
issue #1572 : Adding WatermelonWithMe project.
2012-11-22 17:54:54 +08:00
James Chen
b79b3335bd
Merge pull request #1630 from dumganhar/iss1564-update-tests
...
issue #1564 : Made ChipmunkTest of TestJavascript works
2012-11-21 23:30:14 -08:00
James Chen
b66bc98a46
issue #1564 : Made ChipmunkTest of TestJavascript works
2012-11-22 15:19:16 +08:00
James Chen
aa8e582b7e
Merge pull request #1629 from dumganhar/iss1564-update-tests
...
issue #1564 : fix the wrong order of parameters in CCScheduler::scheduleSelector.
2012-11-21 20:07:45 -08:00
James Chen
51d61ba214
issue #1564 : fix the wrong order of parameters in CCScheduler::scheduleSelector.
...
Made MoonWarriors works.
2012-11-22 12:05:38 +08:00
James Chen
7d4ca88deb
Merge pull request #1627 from dumganhar/iss1564-update-tests
...
issue #1564 : Closed verbose log of TestJavascript for android. And Made it compiled ok.
2012-11-21 18:49:03 -08:00
James Chen
1ce1b4b471
issue #1564 : Closed verbose log of TestJavascript for android. And Made it compiled ok.
2012-11-22 10:47:57 +08:00
minggo
b5bf49e9c6
issue #1564 : make TestJavasripteTest work on iOS
2012-11-22 10:44:21 +08:00
James Chen
89a51433b8
issue #1564 : Make TestJavascript works on windows.
2012-11-22 10:24:26 +08:00
James Chen
b4c1d60e5c
Updated the submodule reference of cocos2d-js-tests and cxx-generator.
2012-11-21 21:26:18 +08:00
James Chen
24c83cb461
Merge pull request #1617 from dumganhar/iss1564-update-tests
...
issue #1564 : Fix crash of ParticlesTest.
2012-11-21 01:24:59 -08:00
James Chen
d0ccff9081
issue #1564 : Updated ClippingNodeTest.
2012-11-21 16:28:31 +08:00
minggo
ab14c0ddc2
Merge pull request #1615 from minggo/gles20
...
create stencil buffer for TestCpp
2012-11-21 00:03:41 -08:00
minggo
ed6d14580a
issue #1564:create stencil buffer for TestCpp
2012-11-21 16:00:40 +08:00
James Chen
9cf9c9943d
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1564-update-tests
...
Conflicts:
samples/TestCpp/Classes/ClippingNodeTest/ClippingNodeTest.h
2012-11-21 15:42:26 +08:00
James Chen
f17f5bbe7b
issue #1564 : Updated ClippingNodeTest.
2012-11-21 15:41:47 +08:00
minggo
2e152ada45
issue #1564:add CClippingNodeTest
2012-11-21 15:36:48 +08:00
James Chen
dd2b15cba0
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1564-update-tests
...
Conflicts:
samples/TestCpp/Classes/tests.h
2012-11-21 15:27:47 +08:00
James Chen
170978d6a5
issue #1564 : Added ClippingNodeTest.
2012-11-21 15:22:54 +08:00
minggo
3a789c075f
issue #1564:add ChipmunkTest
2012-11-21 12:02:29 +08:00
minggo
5a4da366ed
issue #1564:update DrawPrimitivesTest
2012-11-21 11:43:08 +08:00
minggo
b8af64e798
issue #1564:update LabelTest
2012-11-20 18:17:47 +08:00
minggo
a80ae8b27b
issue #1564:update LayerTest
2012-11-20 18:00:27 +08:00
minggo
d27ff67098
issue #1564:update ParallaxTest
2012-11-20 17:43:26 +08:00
minggo
faaa8e1e1b
issue #1564:update ParticleTest
2012-11-20 17:39:11 +08:00
minggo
a246d11110
issue #1564 : update some test cases
2012-11-20 17:30:05 +08:00
minggo
fc40008711
Merge branch 'iss1564-update-tests' of https://github.com/dumganhar/cocos2d-x into iss1564-update-tests
2012-11-20 16:51:41 +08:00
minggo
9c1e90e981
issue #1564:update RenderTextureTest
2012-11-20 16:45:59 +08:00
James Chen
8f6c8e202e
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1564-update-tests
...
Conflicts:
samples/TestCpp/Classes/DrawPrimitivesTest/DrawPrimitivesTest.cpp
2012-11-20 16:35:42 +08:00
James Chen
ebd522e3fa
issue #1564 : Return a new object instead of 'const reference' for some get methods.
2012-11-20 16:34:55 +08:00
minggo
f15135f26a
issue #1564:update SchedulerTest
2012-11-20 16:24:27 +08:00
James Chen
62a502e365
issue #1564 : Renamed ChipmunkAccelTouchTest to ChipmunkTest.
2012-11-20 16:19:05 +08:00
minggo
c026a1f488
issue #1564:update ShaderTest
2012-11-20 16:16:16 +08:00
minggo
fce5b79a09
issue #1564:update SpriteTest
2012-11-20 15:19:57 +08:00
minggo
2c09b68815
Merge pull request #1601 from minggo/iss1564-update-tests
...
update tests
2012-11-19 18:46:20 -08:00
minggo
31cfebd0d7
issue #1564:update Texture2dTest
2012-11-20 10:42:03 +08:00
minggo
33529afc07
Merge pull request #1592 from fape/luaCocos2d
...
fix compile: rename kOrientation to kCCTransitionOrientation
2012-11-19 17:36:25 -08:00
ivzave
28ca22bfde
added lua support for linux platform
2012-11-19 14:56:02 +04:00
James Chen
af36ada6e4
issue #1555 : Enabled point size in DrawPrimitivesTest.cpp.
2012-11-19 17:16:45 +08:00
James Chen
5734a2d9bc
issue #1555 : Updated ActionsTest.cpp
2012-11-19 17:15:16 +08:00
minggo
0b5a86bf42
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1562-label-test
2012-11-19 16:29:00 +08:00
minggo
38232e4eb5
issue #1562:update TileMapTest
2012-11-19 16:28:37 +08:00
James Chen
f2e0df4de3
issue #1565 : Removed VS2008 support.
2012-11-19 14:42:27 +08:00
minggo
29fc9a6af7
issue #1564:update MenuTest
2012-11-19 13:57:54 +08:00
minggo
fb5b7ed7bb
fixed #1560:fix a logical error in CCNode::schedule()
2012-11-19 11:24:03 +08:00
fape
355d8df79e
fix compile: rename kOrientation to kCCTransitionOrientation
2012-11-17 19:02:04 +01:00
fape
30b026421e
The S3E data dir ONLY used by the emulator/simulator.
2012-11-17 13:49:01 +01:00
James Chen
db2175e41c
Merge pull request #1582 from guanqun/build-fixes
...
two simple build fixes
2012-11-17 02:13:22 -08:00
James Chen
df6a50a23a
issue #1555 : Fixed some compilation error for marmalade and blackberry ports.
2012-11-16 18:13:55 +08:00
James Chen
c5b5b978fa
issue #1555 : Made win32 works ok.
2012-11-16 17:08:34 +08:00
James Chen
7601cc7e27
Merge branch 'iss1555-update' of https://github.com/minggo/cocos2d-x into iss1555-update
...
Conflicts:
cocos2dx/layers_scenes_transitions_nodes/CCLayer.cpp
2012-11-16 16:21:16 +08:00
James Chen
892cb6b352
issue #1530 : Using GCC4.2 compiler to build debug version of JSBinding projects since there is an unknown 'vm_protect' crash by using llvm.
2012-11-16 15:58:22 +08:00
James Chen
ee1a5a461d
issue #1530 : Updated cocos2d-js-test to the latest version.
2012-11-16 15:58:21 +08:00
James Chen
def0cc8c39
issue #1530 : Updated TestJavascript.
2012-11-16 15:58:20 +08:00
James Chen
c2d8d118bf
issue #1530 : Updated MoonWarriors.
2012-11-16 15:58:19 +08:00
Rohan Kuruvilla
7305442803
Updating MoonWarriors project with new chipmunk bindings
2012-11-16 15:56:30 +08:00
Rohan Kuruvilla
28f2f94f13
Updating TestJavascript project to include object oriented chipmunk
2012-11-16 15:56:30 +08:00
Rohan Kuruvilla
5fb2c0892e
Updating jsb JS bootstrap files
2012-11-16 15:56:28 +08:00
Lu Guanqun
17e23f61a7
remove unused private field in KeypadTest
2012-11-16 15:19:43 +08:00
minggo
b497143f93
issue #1555:menu can receive touch event now
2012-11-16 14:51:48 +08:00
minggo
cb2bc37513
issue #1555 : make tests work
2012-11-15 18:34:23 +08:00
James Chen
c79cac3af6
Merge branch 'gles20' of https://github.com/mrmop/cocos2d-x into iss1557-marmalade
2012-11-15 10:10:53 +08:00
Mat Hopwood
148a558405
Tiff support and resource location
...
* Tiff support added to CCImage
* CCFileUtils updated to support resource folders
* Examples updated to support multiple resolution assets
2012-11-14 17:46:09 +00:00
minggo
a701eaecce
issue #1555:update to v2.1 beta3
2012-11-14 18:05:15 +08:00
James Chen
b5b0e289eb
fixed #1557 : set the window size of TestCpp for marmalade port.
2012-11-12 10:46:26 +08:00
James Chen
833b5b1be8
Merge branch 'gles20' of https://github.com/mrmop/cocos2d-x into iss1557-marmalade
...
Conflicts:
cocos2dx/base_nodes/CCNode.cpp
cocos2dx/sprite_nodes/CCSprite.cpp
samples/TestCpp/Classes/TouchesTest/Ball.cpp
samples/TestCpp/Classes/VisibleRect.cpp
samples/TestCpp/Classes/VisibleRect.h
2012-11-12 10:20:04 +08:00
James Chen
81aff37457
Redirected cocos2d-html5-tests to cocos2d-js-tests
2012-11-08 16:06:32 +08:00
James Chen
6f377855e4
Updated the submodule reference of "cocos2d-html5-tests" to the latest version.
2012-11-06 17:06:04 +08:00
James Chen
5226fbac27
Updated the submodule reference of "samples/TestJavascript/cocos2d-html5-tests".
2012-11-06 10:10:25 +08:00
James Chen
ceb4371f12
issue #1549 : Using new JS API for MoonWarriors.
...
Updated the logics of js_cocos2dx_CCMenuItemSprite_create and js_cocos2dx_CCMenuItemImage_create.
2012-11-05 23:22:59 +08:00
James Chen
1596603377
issue #1549 : Update the submodule reference of 'cocos2d-html5-tests' to the latest version.
2012-11-05 18:59:42 +08:00
James Chen
57f4e82f75
issue #1549 : Made the window size same as cocos2d-html5 (800x450) on win32.
2012-11-05 18:46:23 +08:00
James Chen
b72f922287
issue #1549 : Sync jsb_constants_cocos2d.js and jsb_constants_cocosbuilder.js to -iphone version.
2012-11-05 18:43:12 +08:00
James Chen
26547c7b30
fixed #1548 : Updated libcurl header files to 7.26.0 on iOS.
2012-11-05 13:13:46 +08:00
James Chen
d14d536953
Sorted the sources of MoonWarriors and TestJavascript by type to make iOS project more beautiful.
2012-11-02 15:52:28 +08:00
James Chen
e2ee4f560c
Updated TestJavascript/bindings/jsb_constants_cocos2d.js.
2012-11-02 15:22:58 +08:00
James Chen
d8580f77a2
Updated project configuration for TestJavascript, added UnitTest.js.
2012-11-02 15:20:42 +08:00
James Chen
b401730c1a
Updated the submodule reference of cocos2d-html5-test.
2012-11-02 15:14:29 +08:00
James Chen
24385b04a6
fixed #1526 : Updated MoonWorriors project configuration for iOS port.
2012-11-02 11:25:24 +08:00
James Chen
84b642d186
Merge pull request #1531 from dumganhar/iss1530-js-improvements
...
issue #1530 : Picked some JSBinding improvements in PR #1499
2012-11-01 01:09:39 -07:00
James Chen
45005c6cd9
issue #1530 : Set COCOS2D_DEBUG macro to 1 in Application.mk for MoonWarriors project, otherwise there are many outputs in logcat window.
2012-11-01 15:56:05 +08:00
minggo
d5afc69393
Merge pull request #1530 from minggo/gles20
...
fix compiling error on linux 64 bit
2012-11-01 00:43:24 -07:00
minggo
95d3f87bd7
fix compiling error on linux 64 bit
2012-11-01 15:38:48 +08:00
James Chen
d9fd274f16
Updated the project configuration of TestJavascript for win32 and android port.
2012-11-01 15:19:14 +08:00
minggo
2a796567e0
Merge pull request #1523 from minggo/gles20
...
invoke base class's onExit() to avoid memory leak
2012-10-30 20:35:02 -07:00
minggo
ad64beb769
invoke base class's onExit() to avoid memory leak
2012-10-31 11:33:53 +08:00
James Chen
8edf9826b1
issue #1537 : Made samples/MoonWarriors/proj.android/build_native.sh executable.
2012-10-31 10:40:42 +08:00
minggo
fe8c1573f2
set MoonWarriors to be portrait on iOS 5.1
2012-10-30 11:38:24 +08:00
minggo
811a56d0a2
Merge pull request #1512 from minggo/moonwarrior
...
Moonwarrior
2012-10-29 02:57:03 -07:00
minggo
7073481077
fixed #1527 : modify some project setting
2012-10-29 17:54:31 +08:00
minggo
9a2a535fef
fixed #1527:add correct icon for xcode project
2012-10-29 16:59:23 +08:00
minggo
2a118a4172
fixed #1527:re-create MoonWarriors xcode project to fix the bug that it will not run on simulator sometimes
2012-10-29 16:47:09 +08:00
James Chen
9113702903
Merge pull request #1510 from dumganhar/gles20
...
fixed #1312 : Upgraded libcurl to 7.26.0 for linux port
2012-10-29 01:24:29 -07:00
James Chen
d4b7c55ce6
issue #1530 : Added resources of cocos2d-html5-tests for TestJavascript project of IOS port.
2012-10-29 16:06:06 +08:00
James Chen
d97ce3e7e9
issue #1530 : Removed the dependence of Chipmunk for MoonWarriors project setting.
2012-10-29 15:41:39 +08:00
Rohan Kuruvilla
5760ea305c
Fixing CallFuncN bindings to properly pass optional third parameter
2012-10-29 15:14:11 +08:00
minggo
e992408a86
issue #1312:update libcurl for linux 64
2012-10-29 14:39:44 +08:00
Mat Hopwood
2b265929e2
Marmalade Sample data removed and merged changes
...
* Marmalade samples now use Resources folder, excess data removed
* Merged in James' changes
* CCNode::updateTransform() added
2012-10-25 21:40:37 +01:00
James Chen
f1da845bf9
Updated the submodule of cocos2d-html5-test.
2012-10-25 16:33:34 +08:00
James Chen
e07ca43c3d
fixes a compilation error in TestCpp.
2012-10-24 16:28:54 +08:00
James Chen
ffe52a157f
Removed some unused codes about "enableRetinaDisplay".
2012-10-24 16:12:40 +08:00
James Chen
7d9b3d3969
Merge pull request #1488 from dumganhar/iss1520-comments
...
fixed #1520 : Added comments for using multiresolution in HelloCpp.
2012-10-24 01:00:39 -07:00
minggo
38cd1ecd46
fixed #1512 : add VisableRect.cpp/h into iOS and mac project
2012-10-24 10:09:25 +08:00
Mat Hopwood
6074dea6cc
Marmalade fixes and optimisation of TestCpp assets
...
* .gitignore added to folders that contain app.icf to ensure that these
files get included in the repo
* Made TestCPP compatible with Marmalade
* Removed data folder from TestCPP example, now points at the samples
Resource folder
2012-10-24 01:03:06 +01:00
James Chen
62f7b25df2
issue #1521 : Using relative coordinates in TestCpp.
2012-10-23 17:48:50 +08:00
James Chen
b383704ebc
fixed #1520 : Updated one comment in HelloCpp.
2012-10-23 14:04:35 +08:00
James Chen
b3db7e91f8
fixed #1520 : Updated some comments.
2012-10-23 14:01:48 +08:00
James Chen
f4f63fd824
fixed #1520 : Added comments for using multiresolution in HelloCpp.
2012-10-23 10:50:47 +08:00
minggo
9cf3f4c5f6
Merge pull request #1474 from wenbin1989/gles20
...
Add kLanguageKorean to ccLanguageType and getCurrentLanguage()
2012-10-21 18:49:42 -07:00
James Chen
aea21bc271
fixed #1517 : Updated Project configuration for vs2008.
2012-10-20 09:29:20 +08:00
Mat Hopwood
988835560d
Marmalade Support
...
Full Marmalade support added for Cocos2d-x
2012-10-19 16:26:34 +01:00
James Chen
a6151cd3bf
Merge pull request #1480 from dumganhar/gles20
...
Updated the comment of setFrameZoomFactor.
2012-10-19 03:01:27 -07:00
James Chen
bd0ad94bf2
Updated the comment of setFrameZoomFactor.
2012-10-19 18:00:26 +08:00
James Chen
aa818f3b54
Merge pull request #1479 from dumganhar/gles20
...
Renamed "setFrameZoom" to "setFrameZoomFactor", added 'getFrameZoomFactor
2012-10-19 02:50:08 -07:00
James Chen
5751d82e6b
Renamed "setFrameZoom" to "setFrameZoomFactor", added 'getFrameZoomFactor'.
2012-10-19 17:39:55 +08:00
James Chen
6b69112fda
fixed #1516 : TestLua compilation error when the path of cocos2d-x contains spaces
2012-10-19 16:52:38 +08:00
James Chen
533cb8dc48
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1517-ff16
2012-10-19 13:57:34 +08:00
minggo
f40b6ac4eb
fixed #1515 : implement zoom function on mac os
2012-10-19 11:33:06 +08:00
James Chen
08bb6718cd
issue #1517 : Added ws2_32.lib for MoonWarriors.vcxproj and TestJavascript.vcxproj.
2012-10-19 11:21:27 +08:00
James Chen
de3376b43f
issue #1517:[Win32]Upgrading SpiderMonkey js engine to FF 16.0.1
2012-10-19 11:15:23 +08:00
wenbin1989
4a50d6903c
add Korean Language Type in CurrentLanguageTest
...
I have tested the Korean Language Type of CurrentLanguageTest in ios,
android, mac. Works fine.
2012-10-19 09:41:46 +08:00
minggo
986a0a34c0
Merge branch 'gles20' of https://github.com/dumganhar/cocos2d-x into zoom-scale
2012-10-18 17:01:27 +08:00
James Chen
41c784ec61
issue #1515 : [LINUX support] Adding a zoom function for debugging large resolution (e.g.new ipad) app on desktop.
2012-10-18 11:51:02 +08:00
minggo
d68f7c76f6
Merge pull request #1471 from minggo/iss1466-shader-test
...
reloading shader when coming to foreground
2012-10-17 20:03:22 -07:00
minggo
501ceb21eb
fixed #1466:restore shader when comming to background
2012-10-18 11:00:44 +08:00
James Chen
0b101bedd0
issue #1515 : Adding a zoom function for debugging large resolution (e.g.new ipad) app on desktop.
2012-10-18 10:54:19 +08:00
minggo
b6426f01ff
fixed #1466:restore shader when comming to background
2012-10-18 10:39:56 +08:00
minggo
bfa7991a94
fixed #1466:restore shader when comming to background
2012-10-18 10:15:46 +08:00
James Chen
2779b4f1ab
Merge branch 'gles20' of https://github.com/johnangel/cocos2d-x into johnangel
2012-10-17 15:08:25 +08:00
johnangel
a2e1400402
Merge remote branch 'upstream/gles20' into gles20
2012-10-16 08:42:30 +02:00
James Chen
deed3ddc33
Updated AppDelegate of SampleGame for iOS port.
2012-10-15 18:50:46 +08:00
minggo
2ded8ea034
Merge pull request #1442 from dumganhar/iss1486-multi-res
...
Multiresolution support
2012-10-15 02:15:21 -07:00
minggo
93d702e3cc
fixed #1491:remove dependency of FontLabel lib
2012-10-15 12:03:15 +08:00
James Chen
39a4af57cc
issue #1486 : Using relative position for ActionsTest and Box2dView.
2012-10-14 22:21:57 +08:00
minggo
8b650794e6
Merge pull request #1445 from minggo/gles20
...
make TestJavascript work on iOS
2012-10-12 02:47:55 -07:00
James Chen
32a9d51618
issue #1486 : Commented some unused codes.
2012-10-12 17:37:49 +08:00
James Chen
36600d95b1
issue #1486 : Calculate content scale factor by screen height.
2012-10-12 17:37:26 +08:00
James Chen
04a4ebc571
issue #1486 : Using relative coordinate for HelloLua.
2012-10-12 16:18:28 +08:00
James Chen
f5abe422ea
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1486-multi-res
2012-10-12 15:50:11 +08:00
James Chen
6fd24c469b
Updated *.user for vs2010 & vs2008.
2012-10-12 15:45:57 +08:00
James Chen
e876b997e7
Updated TestJavascript.vcproj
2012-10-12 15:42:00 +08:00
James Chen
3b0a989200
Updated TestJavascript project configuration for VS2008 & VS2010.
2012-10-12 15:14:47 +08:00
minggo
572460e60a
make TestJavascript work on iOS
2012-10-12 12:00:36 +08:00
James Chen
98aa5dd489
issue #1486 : Updated AppDelegate.cpp and proj.win32/main.cpp.
2012-10-12 10:02:49 +08:00
folecr
36f8b31efc
Define some helper functions and comment out references to chipmunk
2012-10-11 17:56:44 -07:00
folecr
fc59b2c962
Updated build script
...
* merges js files from the cocos2d-html5-tests submodule into Android's assets folder
* copies js helper files into Android's assets folder
* copies the res from cocos2d-html5-tests into Android's assets folder
2012-10-11 16:58:44 -07:00
folecr
336af23428
Helper files copied from cocos2d-iphone
2012-10-11 16:58:44 -07:00
folecr
c63cf54256
Submodule for cocos2d-html5-tests
2012-10-11 16:37:22 -07:00
folecr
2e8aad611d
Run tests-boot-jsb.js from the root directory
2012-10-11 16:35:17 -07:00
folecr
a763e4242f
Remove samples/TestJavascript/Resources
2012-10-11 14:25:48 -07:00
folecr
2cf579de6b
NDK debugger script
2012-10-11 14:25:47 -07:00
James Chen
b78e2c9130
issue #1486 : Added iPad, ipadhd resources, and make some watermark for these pictures.
2012-10-11 18:33:43 +08:00
James Chen
cdf54a872f
issue #1486 : A bug fix.
2012-10-11 17:02:27 +08:00
James Chen
77da7b5895
issue #1486 : First commit based on BorMor's branch.
2012-10-11 16:45:14 +08:00
James Chen
ade54a3de7
Merge branch 'multi_resolution_support' of https://github.com/BorMor/cocos2d-x into bormor-multi-res
...
Conflicts:
samples/HelloCpp/Classes/AppDelegate.cpp
samples/HelloCpp/Classes/HelloWorldScene.cpp
2012-10-11 16:12:22 +08:00
James Chen
918045e6ac
issue #1469 : Deleted two unused files.
2012-10-10 22:18:27 +08:00
James Chen
122a748029
issue #1469 : Removed some unused resources.
2012-10-10 22:15:47 +08:00
James Chen
36d8e86879
issue #1469 : Made MoonWarriors works on iOS.
2012-10-10 22:06:44 +08:00
James Chen
abd1d7e3bf
issue #1469 : VS2010 compilation works.
2012-10-10 15:14:19 +08:00
James Chen
5054684e00
issue #1469 : Made MoonWarriors works on android.
2012-10-10 15:06:11 +08:00
James Chen
d03ff0616a
issue #1469 : Added MoonWarriors sources and made it works on windows.
2012-10-10 14:50:04 +08:00
johnangel
ad7dacc281
Merge remote branch 'upstream/gles20' into gles20
2012-10-08 16:35:43 +02:00
Walzer
f1d9629404
Merge pull request #1361 from ncrothe/gles20
...
add the capability to set custom http header to HttpClient
2012-10-08 01:06:39 -07:00
minggo
58b46b2f53
Merge pull request #1419 from folecr/ndkgdb
...
Run Android debugger with Cocos2D-X projects!
2012-10-07 19:52:12 -07:00
folecr
d8a26a8623
Use "-j8" flag to ndk-build when building TestJavaScript
...
* If a "-p" for "parallel build" option is set
2012-10-05 12:36:04 -07:00
folecr
abcb6b33a7
set -x in build script so that entire command line is available in the build log
2012-10-01 11:58:46 -07:00
folecr
2f5613595b
Helper script to launch this application via ndk-gdb
2012-10-01 11:58:45 -07:00
walzer
d18eecf247
UIInterfaceOrientationMaskLandscape -> UIInterfaceOrientationMaskAllButUpsideDown, developers still need to set orientation in xcode->targets
2012-09-27 10:28:00 +08:00
walzer
c9772c76ec
fix compilation error in xcodebuild command line, which are caused by ios6 deprecated marcos and enums
2012-09-27 00:44:40 +08:00
minggo
f3e2a385e1
modify xcode project to include correct files
2012-09-26 17:12:57 +08:00
James Chen
0ca7e00700
fixed some compilation errors for linux platform.
2012-09-26 15:23:10 +08:00
James Chen
ac8edf1384
Updated samples/TestCpp/proj.linux/Makefile.
2012-09-26 14:06:49 +08:00
minggo
dc3ba6e0cc
fix some bugs when testing
2012-09-26 12:01:42 +08:00
James Chen
4a3127f41f
Updated android template. Added 'cocos2dx/platform/android/java/res/.gitignore' since res folder is needed for eclipse.
2012-09-25 21:52:30 +08:00
minggo
6878b626cd
add new GUI component
2012-09-25 18:00:06 +08:00
minggo
2b35f1a20f
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into layer_gradient
2012-09-25 17:38:17 +08:00
minggo
418816ea77
add fps_image.png into TestCpp
2012-09-25 17:06:59 +08:00
James Chen
f7229f74d8
issue #1483 : Synchronizing CCControlExtension to latest version.
2012-09-25 16:57:51 +08:00
minggo
da97921099
fix compile errors of TestJavaScript
2012-09-25 16:21:28 +08:00
walzer
609c4b12f9
revert back SimpleGame to enableRetinaDisplay approach. Update background image of HelloCpp to 640x1136.
2012-09-24 21:14:08 +08:00
Sergey Vikhirev
05eb4352e8
Remove retina specific methods and logic
2012-09-24 14:22:02 +04:00
minggo
a568c1d221
revert modification of AppDelegate.cpp
2012-09-24 17:24:00 +08:00
ncrothe
e0fe233752
Update samples/TestCpp/Classes/ExtensionsTest/NetworkTest/HttpClientTest.cpp
...
Added test to show use of HttpRequest::setHeaders
2012-09-24 12:15:53 +03:00
minggo
eb952e7c69
Merge pull request #1370 from minggo/ptr_int
...
Ptr int
2012-09-24 00:27:21 -07:00
minggo
f17545a1ae
fix a compile error
2012-09-24 15:26:18 +08:00
walzer
caa67d1eed
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into adapt-4inch-iphone5
...
Conflicts:
samples/TestJavascript/proj.ios/TestJavascript.xcodeproj/project.pbxproj
2012-09-24 15:17:58 +08:00
minggo
88952396e4
Merge branch 'ptr_int_casting_issue' of https://github.com/ByungChoi/cocos2d-x into ptr_int
2012-09-24 15:16:30 +08:00
minggo
48f9df7680
fix conflict
2012-09-24 15:01:24 +08:00
walzer
78ef574962
add touch callback to HelloCpp. Users can learn setDesignResolution easily.
2012-09-24 14:14:53 +08:00
walzer
7088b19a1a
add sample code in HelloCpp & SimpleGame to teach how to adapt design resolution to different iPhone screens (HVGA, 3.5 inch retina, and 4.0 inch retina)
2012-09-24 13:59:16 +08:00
minggo
e20b933f1a
make TestJavaScript work and fix some warnings
2012-09-24 13:57:45 +08:00
walzer
ed936dcd48
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into adapt-4inch-iphone5
2012-09-24 12:03:36 +08:00
Walzer
5c5544f823
Merge pull request #1363 from walzer/gles20
...
fix ios6 orientation error, which is caused by ios6 api change.
2012-09-23 21:00:30 -07:00
James Chen
e4cee68688
Added libExtensions.lib for TestJavascript vs2010 project.
...
Removed some calling of 'USING_NS_CC;' in extensions.
2012-09-24 11:47:33 +08:00
James Chen
426915dd4a
fixed some compilation error for win32 platform.
2012-09-24 11:05:15 +08:00
walzer
5b3bb2a087
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
...
Conflicts fixed:
cocos2dx/platform/ios/FontLabel/FontLabel.m
cocos2dx/platform/ios/FontLabel/FontLabelStringDrawing.m
template/xcode4/lib_js.xctemplate/TemplateInfo.plist
2012-09-24 11:03:26 +08:00
walzer
c50a62be7a
issue #1482 , fix typos, mehod -> method.
2012-09-24 10:54:03 +08:00
walzer
59a4b0460b
HelloCpp and SimpleGame teaches how to adapt on all iPhone/iPad multi-resolutions, especially for 4-inch retina screen.
2012-09-24 10:46:15 +08:00
Walzer
88b98faa88
fixed #1482 , fix orientation problem caused by ios6 api change.
...
AppDelegate.mm & RootViewController.mm are updated.
2012-09-23 20:24:51 +08:00
Byung Choi
dad0573b29
fixed build breakage for linux from change of test src name.
2012-09-22 03:18:26 +09:00
minggo
dca626eab0
Merge pull request #1357 from ByungChoi/linux_makefile
...
Linux makefile
2012-09-21 02:12:45 -07:00
minggo
0a1f0369e6
fixed #1481 : merge Nicolas's pull request and do some bug fixes
2012-09-21 17:01:19 +08:00
Byung Choi
a83b6a6261
updated sample/helloCpp debug & release makefile for linux
2012-09-21 15:35:41 +09:00
Byung Choi
4d04a1863b
make-all-linux now builds debug & release, testCpp also gets both
2012-09-21 14:34:05 +09:00
Walzer
c7ffe79baf
remove useless LOCAL_STATIC_LIBRARIES := curl_static_prebuilt in TestCpp/proj.android/jni/android.mk
...
The linking relationship is TestCpp -> cocos_extension_static -> cocos_curl_static now. Applications can link the extension library to use libcurl.
And this line still links curl_static_prebuilt which is not exist now, which made developers confused.
2012-09-21 10:10:17 +08:00
James Chen
9fabf3a45b
fixed #1470 : Made CCBReader support cocosbuilder v2.1-beta0.
2012-09-19 18:41:50 +08:00
minggo
8cdf73640b
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1470_cocosbuilder
2012-09-19 18:08:17 +08:00
minggo
2f3cdc6538
issue #1470:modify linux makefile and re-create xcode template
2012-09-19 18:05:10 +08:00
minggo
5e169eb0af
issue #1470 : put hd/ipad resources into corresponding directory
2012-09-19 17:54:45 +08:00