fape
|
e259467873
|
update marmalade languages
|
2012-11-25 12:13:30 +01: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
|
14ac15ebda
|
Merge pull request #1642 from dumganhar/iss1573-cocosdragonjs
issue #1573: Adding CocosDragonJS project, crash wasn't fixed. :(
|
2012-11-22 23:16:07 -08:00 |
James Chen
|
a1ebfd9ed8
|
Don't add CCNode::removeChild to skip field.
|
2012-11-23 15:12:42 +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 |
Rohan Kuruvilla
|
36bbd80b68
|
Adding changes to CCBreader
|
2012-11-23 15:08:55 +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 |
minggo
|
91b370e0f0
|
Merge pull request #1639 from minggo/gles20
make lua work
|
2012-11-22 18:38:44 -08:00 |
minggo
|
542c407346
|
make lua work
|
2012-11-23 10:36:26 +08:00 |
James Chen
|
00ad0689ec
|
Merge pull request #1620 from fape/remove_physics_nodes
remove physics_nodes from marmalade
|
2012-11-22 03:43:24 -08:00 |
James Chen
|
7d5f974817
|
Merge pull request #1638 from dumganhar/iss1572-game
fixed #1572: Adding WatermelonWithMe project.
|
2012-11-22 03:09:07 -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
|
ee97633a4f
|
Merge pull request #1637 from dumganhar/gles20
Minor fix in ScriptingCore::log;Avoiding pointer point to a destroyed variable.
|
2012-11-22 01:53:57 -08:00 |
James Chen
|
c0097db48c
|
Avoiding pointer point to a destroyed variable.
|
2012-11-22 17:36:49 +08:00 |
James Chen
|
692d16f296
|
Minor fix in ScriptingCore::log.
|
2012-11-22 17:34:58 +08:00 |
James Chen
|
d2bf88bedf
|
Merge pull request #1636 from CocosRobot/updategeneratedsubmodule_1353576131
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
|
2012-11-22 01:25:36 -08:00 |
CocosRobot
|
10ceef62dc
|
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
|
2012-11-22 17:22:19 +08:00 |
James Chen
|
4bb11b6aa2
|
Merge pull request #1635 from dumganhar/iss1564-update-tests
issue #1564: Updated tools/tojs/cocos2dx.ini.
|
2012-11-22 01:20:50 -08:00 |
James Chen
|
f701248e58
|
issue #1564: Updated tools/tojs/cocos2dx.ini.
|
2012-11-22 17:19:15 +08:00 |
minggo
|
2ba1bcb5af
|
Merge pull request #1633 from minggo/gles20
issue #1564:enable depth test by default
|
2012-11-22 00:02:28 -08:00 |
minggo
|
76197f1126
|
issue #1564:enable depth test by default
|
2012-11-22 16:01:30 +08:00 |
James Chen
|
c3a65822bc
|
Merge pull request #1632 from CocosRobot/updategeneratedsubmodule_1353569881
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
|
2012-11-21 23:40:08 -08:00 |
CocosRobot
|
ce19b26771
|
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
|
2012-11-22 15:38:09 +08:00 |
James Chen
|
2c628cfb53
|
Merge pull request #1631 from dumganhar/iss1564-update-tests
Updated tools/tojs/cocos2dx.ini.
|
2012-11-21 23:37:07 -08:00 |
James Chen
|
1a3891970f
|
Updated tools/tojs/cocos2dx.ini.
|
2012-11-22 15:35:42 +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 |
minggo
|
c771958e0a
|
Merge pull request #1628 from minggo/gles20
fix a logical bug in CCRenderTExture
|
2012-11-21 19:07:04 -08:00 |
minggo
|
14dbe091c8
|
fix a logical bug in CCRenderTExture
|
2012-11-22 11:06:07 +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
|
15cd80fa17
|
Merge pull request #1626 from minggo/gles20
Gles20
|
2012-11-21 18:47:08 -08:00 |
minggo
|
b5bf49e9c6
|
issue #1564: make TestJavasripteTest work on iOS
|
2012-11-22 10:44:21 +08:00 |
minggo
|
039c665b57
|
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
|
2012-11-22 10:25:56 +08:00 |
James Chen
|
140d63ae91
|
Merge pull request #1625 from dumganhar/iss1564-update-tests
issue #1564: Make TestJavascript works on windows.
|
2012-11-21 18:25:18 -08:00 |
James Chen
|
89a51433b8
|
issue #1564: Make TestJavascript works on windows.
|
2012-11-22 10:24:26 +08:00 |
minggo
|
94a9e1f53c
|
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
|
2012-11-22 10:13:03 +08:00 |