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

6269 Commits

Author SHA1 Message Date
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
James Chen f17f5bbe7b issue #1564: Updated ClippingNodeTest. 2012-11-21 15:41:47 +08:00
minggo 33bc7507e2 Merge pull request #1613 from minggo/gles20 
add ClippingNodeTest
 2012-11-20 23:37:51 -08:00
minggo 2e152ada45 issue #1564:add CClippingNodeTest 2012-11-21 15:36:48 +08:00
James Chen 17a0372744 Merge pull request #1612 from dumganhar/iss1564-update-tests 
issue #1564: Added ClippingNodeTest.
 2012-11-20 23:28: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 635fda446f Merge pull request #1600 from folecr/jsbindingsfix 
Don't generate JS bindings for CCTimer::getSelector
 2012-11-20 22:25:44 -08:00
minggo 2784124267 Merge pull request #1610 from minggo/iss1564-update-tests 
add ChipmunkTest
 2012-11-20 20:03:35 -08:00
minggo 3a789c075f issue #1564:add ChipmunkTest 2012-11-21 12:02:29 +08:00
minggo e9c5c65fd0 Merge pull request #1609 from minggo/iss1564-update-tests 
update DrawPrimitivesTest
 2012-11-20 19:46:36 -08:00
minggo 5a4da366ed issue #1564:update DrawPrimitivesTest 2012-11-21 11:43:08 +08:00
James Chen d73cb4101c Merge pull request #1608 from dumganhar/iss1564-update-tests 
issue #1564: Minor fix in CCLabelBMFont::createFontChars().
 2012-11-20 18:08:53 -08:00
James Chen b632c3cd7c issue #1564: Minor fix in CCLabelBMFont::createFontChars(). 2012-11-21 10:06:03 +08:00
minggo c9c9141640 Merge pull request #1607 from minggo/iss1564-update-tests 
update tests
 2012-11-20 02:21:25 -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 65b4cbd492 Merge pull request #1606 from minggo/iss1564-update-tests 
Iss1564 update tests
 2012-11-20 01:31:59 -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 9ffdcbff18 Merge pull request #1605 from minggo/iss1564-update-tests 
update tests
 2012-11-20 00:47:37 -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
James Chen eed80761be issue #1564: Bugs fixes in CCDrawNode.cpp. 2012-11-20 16:31:33 +08:00
James Chen e8cf71407d issue #1564: Deleted physics_nodes in cocos2dx since it was moved to extension. 2012-11-20 16:27:47 +08:00
James Chen b73b30d1b0 issue #1564: Deleted duplicated declare in ScriptingCore.h 2012-11-20 16:26:06 +08:00
James Chen 76c5ad8b32 issue #1564: Deleted physics_nodes in cocos2dx since it was moved to extension. 2012-11-20 16:24:40 +08:00
minggo f15135f26a issue #1564:update SchedulerTest 2012-11-20 16:24:27 +08:00
James Chen 0d0234de2a issue #1564: Updated Project configurations for android and win32 since physics_nodes was moved to Extension folder. 2012-11-20 16:22:14 +08:00
James Chen 28b692279e issue #1564: Deleted CCPhysicsSprite in jsbindings since it's supported at Extension. 2012-11-20 16:20:16 +08:00
James Chen 62a502e365 issue #1564: Renamed ChipmunkAccelTouchTest to ChipmunkTest. 2012-11-20 16:19:05 +08:00