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

28779 Commits

Author SHA1 Message Date
Igor Mats 60759764ff Add getStroke method. 2015-04-09 12:05:21 +03:00
pipu 80ad7bbee8 Animation easing. 2015-04-09 16:55:15 +08:00
minggo 96f446ad93 Merge pull request #11362 from WenhaiLin/v3-autotest 
Test automation support: Fixed may not to restore TestList to the original position.
 2015-04-09 16:51:59 +08:00
songchengjiang 98211a8c3f fix the bug of PURibbonTrail 2015-04-09 16:49:03 +08:00
WenhaiLin 8b839edfde Test automation support: Fixed may not to restore TestList to the original position. 2015-04-09 16:46:35 +08:00
minggo 4e4b8bcea0 Merge pull request #11361 from WenhaiLin/v3-autotest 
Remove unneeded code.
 2015-04-09 16:29:56 +08:00
WenhaiLin f502c5900b [ci skip]Remove unwanted code. 2015-04-09 16:23:29 +08:00
WenhaiLin c5ff21f7c6 [ci skip]Remove unwanted code. 2015-04-09 16:18:24 +08:00
minggo 238d677db0 Merge pull request #11360 from super626/releasenote 
add terrain to release note
 2015-04-09 16:12:05 +08:00
yangxiao 9b363e5193 add terrain to release note 2015-04-09 16:05:42 +08:00
minggo a4bcb82983 Merge pull request #11359 from WenhaiLin/v3-autotest 
Fixed crashes in test case of Scene/Node.
 2015-04-09 15:58:08 +08:00
minggo 1765d53413 [ci skip]update CHANGELOG 2015-04-09 15:49:34 +08:00
WenhaiLin 16bce0bfd3 Fixed crashes in test case of Scene/Node. 2015-04-09 15:43:01 +08:00
minggo d9acaa444a Merge pull request #11358 from WenhaiLin/v3-autotest 
Fixed the test case of BillBoard not respond touch event as expected.
 2015-04-09 15:11:17 +08:00
WenhaiLin 2e24f302d6 Fixed the test case of BillBoard not respond click event as expected. 2015-04-09 15:08:49 +08:00
minggo 5938fce905 Merge pull request #11357 from WenhaiLin/v3-autotest 
Test automation support:Make test cases didn't need to care about TestSuite when invoking Director::getInstance()->replaceScene.
 2015-04-09 15:05:44 +08:00
WenhaiLin e5bd611604 Test automation support:Make test cases didn't need to care about TestSuite when invoking Director::getInstance()->replaceScene. 2015-04-09 14:59:34 +08:00
minggo 961d00a94d Merge pull request #11356 from WenhaiLin/v3-autotest 
Fixed some test cases of action not respond click event as expected.
 2015-04-09 14:36:03 +08:00
minggo 3dcd123c09 [ci skip]update release note 2015-04-09 14:30:06 +08:00
minggo e9c88a61da Merge pull request #11354 from samuele3hu/v3_terrain 
Update the Lua bindings for terrain and TerrainTest.lua
 2015-04-09 14:22:19 +08:00
WenhaiLin a378651320 Fixed some test cases of action not respond click event as expected. 2015-04-09 14:20:59 +08:00
minggo 9891a94e87 Merge pull request #11352 from super626/v3 
Fix Sprite3D memory leak
 2015-04-09 13:57:03 +08:00
minggo 76d66798ec Merge pull request #11355 from natural-law/v3 
[ci skip] Update the reference of submodule cocos2d-console.
 2015-04-09 13:44:51 +08:00
samuele3hu 9bf2a920b4 Update the Lua bindings for terrain and TerrainTest.lua 2015-04-09 13:41:52 +08:00
minggo c022b7d615 Merge pull request #11351 from WenhaiLin/v3-autotest 
Test automation support:
 2015-04-09 13:41:20 +08:00
zhangbin 4929b584e2 Update the reference of submodule cocos2d-console. 2015-04-09 13:39:01 +08:00
Ricardo Quesada 8a31138160 Merge pull request #11353 from ricardoquesada/xcode_6_3_tests_compiles 
Xcode 6 3 tests compiles
 2015-04-08 22:31:29 -07:00
Ricardo Quesada 510d502631 Merge remote-tracking branch 'cocos2d/v3' into xcode_6_3_tests_compiles 2015-04-08 21:59:22 -07:00
WenhaiLin 57508b3c12 Fixed compile errors 2015-04-09 12:49:32 +08:00
Ricardo Quesada 49e2e8964e more compilations issues. 
compiles on Android
 2015-04-08 21:40:39 -07:00
Ricardo Quesada 23b0d4d2f6 more fixes with the namespaces 2015-04-08 21:23:47 -07:00
WenhaiLin 565a79022b Test automation support: 
1.TestList support mouse scroll.
2.TestList respond click event in the right response area.
 2015-04-09 11:56:49 +08:00
minggo 504e49d910 Merge pull request #11350 from CocosRobot/update_lua_bindings_1428551264 
[AUTO]: updating luabinding automatically
 2015-04-09 11:56:39 +08:00
CocosRobot 22da4c4832 [AUTO]: updating luabinding automatically 2015-04-09 03:50:13 +00:00
minggo 69eac3b78f Merge pull request #11337 from super626/terrain 
Terrain fix
 2015-04-09 11:44:26 +08:00
yangxiao 575d32c5ec correct words 2015-04-09 11:31:56 +08:00
yangxiao 9cefa3a9da weak ref to vertexdata 2015-04-09 10:52:05 +08:00
minggo e9ea77adcc Merge pull request #11348 from WenhaiLin/v3-fixCocosRobot 
[ci skip]Removes unneeded zlib files from the external/zlib folder.
 2015-04-09 10:25:35 +08:00
XiaoYang ff64b58311 Merge pull request #294 from tangziwen/terrain 
remove unnecessary reload in terrain test
 2015-04-09 10:22:03 +08:00
tangziwen 0649f9709c remove unnecessary reload in terrain test 2015-04-09 10:20:06 +08:00
WenhaiLin 9984dacf18 [ci skip]Removes unneeded zlib files from the external/zlib folder. 2015-04-09 10:17:42 +08:00
minggo 5b834eb90e Merge pull request #11343 from MSOpenTech/v3-wp8-fix 
V3 wp8 fixes
 2015-04-09 10:08:27 +08:00
minggo f28d444856 Merge pull request #11347 from WenhaiLin/v3-fixCocosRobot 
Fixed CocosRobot may commit unnecessary files
 2015-04-09 10:08:12 +08:00
WenhaiLin 76db62c1e9 Fixed CocosRobot may commit unnecessary files 2015-04-09 10:06:21 +08:00
minggo e7ec8f97b8 Merge pull request #11340 from CocosRobot/update_cocosfiles_1428499804 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-04-09 10:05:42 +08:00
XiaoYang 83b38a61e0 Merge pull request #293 from tangziwen/terrain 
Terrain
 2015-04-09 10:05:19 +08:00
tangziwen 176532eef4 update Terrain Lua binding 2015-04-09 10:01:40 +08:00
tangziwen 4ca6b559e6 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into terrain 2015-04-09 09:40:22 +08:00
tangziwen 58a9e43c9c update terrain test 2015-04-09 09:39:27 +08:00
Ricardo Quesada 51374eb822 tests compiles on xcode 6.3 
no more USING_NS in the header files.
it creates conflict with xcode 6.3
 2015-04-08 17:37:30 -07:00