Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
7,015 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

7015 Commits

Author SHA1 Message Date
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
James Chen ab86068ec4 Merge pull request #1624 from dumganhar/iss1564-update-tests 
issue #1564: Fixed some bugs as follows.
Adding missing setter and getter function.
Removing one unnecessary line in CCRenderTexture::visit.
Set depth buffer to 24bit, stencil buffer to 8bit for windows.
Enable point size by default on windows. This can fix point size is always equal to 1 pixel in DrawPrimitivesTest.
 2012-11-21 18:10:52 -08:00
minggo 7bfb75b90c Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-11-22 10:06:50 +08:00
minggo 543eca47b1 issue #1564:add resource for RenderTextureTest 2012-11-22 10:06:18 +08:00
James Chen 73b409f116 issue #1564: Enable point size by default on windows. This can fix point size is always equal to 1 pixel in DrawPrimitivesTest. 2012-11-22 10:04:35 +08:00
James Chen 6c81e21935 issue #1564: Set depth buffer to 24bit, stencil buffer to 8bit. 2012-11-22 09:55:44 +08:00
James Chen e1f7c0bab6 issue #1564: Removing one unnecessary line in CCRenderTexture::visit. 2012-11-22 09:55:43 +08:00
James Chen add23eecda issue #1564: Adding missing setter and getter function. 2012-11-22 09:55:43 +08:00
James Chen f848f12424 Merge pull request #1621 from fape/box2d_rope 
fixed #1571: Adding box2d rope to marmalade project.
 2012-11-21 17:44:58 -08:00
fape db883f4efc remove physics_nodes from marmalade 2012-11-21 21:34:33 +01:00
fape 3cebbc6cf9 add box2d rope path to marmalade project 2012-11-21 20:50:51 +01:00
James Chen 7f74113e05 Merge pull request #1619 from CocosRobot/updategeneratedsubmodule_1353505578 
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
 2012-11-21 05:50:34 -08:00
CocosRobot c991b0b6b0 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2012-11-21 21:46:28 +08:00
James Chen 9abb63b670 Merge pull request #1589 from funkaster/gles20 
fixed #1570: Improves the debugger for JSBindings.
 2012-11-21 05:32:24 -08:00
James Chen cb8aeaf918 Merge pull request #1618 from dumganhar/gles20 
Updated the submodule reference of cocos2d-js-tests and cxx-generator.
 2012-11-21 05:28:46 -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 3fc2f9888b issue #1564: Fix crash of ParticlesTest. 2012-11-21 17:22:26 +08:00
minggo 89de8223ef Merge pull request #1616 from minggo/gles20 
fix a logical erroe in CCRotationTo
 2012-11-21 00:55:15 -08:00
minggo a69ff7957c issue #1564:fix a logical erroe in CCRotationTo 2012-11-21 16:53:23 +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 01b9383a5c Merge pull request #1614 from dumganhar/iss1564-update-tests 
issue #1564: Updated ClippingNodeTest.
 2012-11-20 23:44:19 -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