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

6153 Commits

Author SHA1 Message Date
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
minggo a27a6e077b Merge pull request #1603 from minggo/iss1564-update-tests 
update ShaderTest
 2012-11-20 00:17:48 -08:00
James Chen 8a21d4e824 issue #1564: Moved physics_node to extension. 2012-11-20 16:17:20 +08:00
minggo c026a1f488 issue #1564:update ShaderTest 2012-11-20 16:16:16 +08:00
James Chen 3d275dc8cf issue #1564: Updated Chipmunk to v6.1.2. 2012-11-20 16:15:21 +08:00
minggo 85a230287e Merge pull request #1602 from minggo/iss1564-update-tests 
update SpriteTest
 2012-11-19 23:21:59 -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
minggo 93821be7e4 Merge pull request #1599 from folecr/androidlinkerfix 
cc_utf8_strlen is used in Android native code; should not be static
 2012-11-19 17:33:54 -08:00
folecr 03d9a04608 cc_utf8_strlen is used in Android native code; should not be static 2012-11-19 15:57:16 -08:00
folecr f111602adf Don't generate JS bindings for CCTimer::getSelector 2012-11-19 15:56:11 -08:00
Rolando Abarca d9baa8a24d fixes merge conflict 2012-11-19 11:23:08 -08:00
James Chen c3e02f3e52 Merge pull request #1597 from dumganhar/iss1555-update 
issue #1555: Updated ActionsTest.cpp, enabled point size in DrawPrimitivesTest.cpp.
 2012-11-19 02:15:22 -08:00
James Chen af36ada6e4 issue #1555: Enabled point size in DrawPrimitivesTest.cpp. 2012-11-19 17:16:45 +08:00
James Chen 18d583153b setUniformLocationwithMatrix4fv ~> setUniformLocationWithMatrix4fv 2012-11-19 17:16:06 +08:00