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 |
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 |