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

19199 Commits

Author SHA1 Message Date
zhangbin b3bc69fccc Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-04-22 15:38:26 +08:00
James Chen 83c1c74475 Merge pull request #6341 from samuele3hu/develop_fix 
fix two bugs found in the testing
 2014-04-22 15:09:10 +08:00
lm 2c55c740ba [Jenkins][ci skip] Git fetch tag 2014-04-22 14:31:56 +08:00
zhangbin 7a147ce46c Update the reference of submodule plugin-x. 2014-04-22 13:55:59 +08:00
James Chen a267c8eb55 Merge pull request #6348 from qq573011406/patch-2 
SimpleAudioEngine::sharedEngine() -> SimpleAudioEngine::getInstance() for cpp-template
 2014-04-22 13:54:31 +08:00
samuele3hu cd2a8e90d2 Remove the comments for ClippingNodeTest 2014-04-22 13:52:52 +08:00
samuele3hu 6b34239d75 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_fix 2014-04-22 13:48:00 +08:00
samuele3hu 771ce05d95 fix the bugs of SpriteTest that the Sprite created by passing rect display error 2014-04-22 13:41:10 +08:00
James Chen b8e77d8968 Fixed compilation errors when disabling CC_ENABLE_STACKABLE_ACTION 2014-04-21 22:38:15 -07:00
袁全伟 56f9def298 Update AppDelegate.cpp 
use getInstance replace :)
 2014-04-22 13:20:07 +08:00
lm 7005d6664d [Jenkins][ci skip] Clean workspace before debug build or release build 2014-04-22 12:36:40 +08:00
lm 9f7021fd6c [Jenkins][ci skip] Add [ci release xxx] command 2014-04-22 11:41:14 +08:00
minggo 4bf84f58df Merge pull request #6345 from dabingnn/develop_fix_clippingNodeTestRawStencilBug 
3.0hotfix: Node: Clipping->RawStencilTest4-6
 2014-04-22 11:36:52 +08:00
minggo 90fb49c1ad Merge pull request #6346 from natural-law/develop 
Update the reference of submodule cocos2d-console.
 2014-04-22 11:22:56 +08:00
zhangbin b7ff312c7c Update the reference of submodule cocos2d-console. 2014-04-22 11:21:13 +08:00
James Chen b5f30ff7ec Merge pull request #6340 from shujunqiao/emptytest-device 
[ci skip], add get android device infomation in emptytest.py.
 2014-04-22 11:14:07 +08:00
shujunqiao 48d3714bf2 [ci skip], delete wake function in emptytest.py. 2014-04-22 11:04:17 +08:00
Huabing.Xu 560d24545a 3.0hotfix: Node: Clipping->RawStencilTest4-6 2014-04-22 10:58:42 +08:00
James Chen 99654289ed Invokes 'Node::onExit' only when the node is running. 2014-04-21 22:31:34 +08:00
James Chen 8038d3daa5 Fixed tilemaptest crashes when click 'next' button quickly 2014-04-21 22:24:44 +08:00
samuele3hu 3b3836db36 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_fix 2014-04-21 18:28:31 +08:00
samuele3hu 582e961f2a Replace getContentSize with getVirtualRendererSize related with Button in the CocoStudioGuiTest 2014-04-21 18:28:05 +08:00
shujunqiao 79e9c315d8 [ci skip], add get android device infomation in emptytest.py. 2014-04-21 18:18:48 +08:00
Huabing.Xu 7a38050e09 Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-21 17:47:34 +08:00
Huabing.Xu 83ee1b4bdc android OK 2014-04-21 17:38:10 +08:00
Huabing.Xu 68e058b12d IOS/Mac OK: remove kazMath 
Make code compatible with old tests
 2014-04-21 17:37:52 +08:00
minggo 2037c2e232 Merge pull request #6339 from andyque/fix_project 
fix project
 2014-04-21 17:30:54 +08:00
andyque a6b81ec772 issue #3333, fix project unused link 2014-04-21 17:13:43 +08:00
samuele3hu b3ac3b2324 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_fix 2014-04-21 17:13:34 +08:00
samuele3hu b313b4ce74 Comment the last three test cases 2014-04-21 17:09:44 +08:00
minggo 82d70e3492 Merge pull request #6338 from natural-law/develop 
Enable depth test in test case : TilemapTest->TMXOrthoVertexZ.
 2014-04-21 15:38:21 +08:00
zhangbin 440702aa06 Enable depth test in test case : TilemapTest->TMXOrthoVertexZ. 2014-04-21 15:26:57 +08:00
minggo 3ac08b7349 Merge pull request #6300 from elvman/develop 
Flipping RenderTexture's sprite instead of scaling it by -1
 2014-04-21 15:23:10 +08:00
minggo 816692ea37 [ci skip] 2014-04-21 14:55:31 +08:00
minggo daf07a255c Merge pull request #6336 from minggo/update-release-note 
update release note
 2014-04-21 14:51:45 +08:00
minggo ec721dd448 update release note 2014-04-21 14:50:27 +08:00
James Chen 84208937c3 Merge pull request #6334 from CocosRobot/update_lua_bindings_1398062637 
[AUTO]: updating luabinding automatically
 2014-04-21 14:47:56 +08:00
minggo a29f34f765 Merge pull request #6335 from minggo/update-release-note 
update release note
 2014-04-21 14:47:07 +08:00
minggo c897f33eec update release note 2014-04-21 14:45:36 +08:00
CocosRobot 77130708c2 [AUTO]: updating luabinding automatically 2014-04-21 06:45:09 +00:00
minggo 0a5b92c56f Merge pull request #6305 from samuele3hu/developAudio 
fix the bug that exit layer can’t end the SimpleAudioEngine
 2014-04-21 14:40:40 +08:00
minggo 02c2fc8abf Merge pull request #6333 from chuanweizhang2013/luaruntime 
translate
 2014-04-21 14:06:32 +08:00
minggo 8a75bccdc1 Merge pull request #6332 from minggo/develop 
update version
 2014-04-21 13:44:40 +08:00
minggo b53b9ceb3e update version 2014-04-21 13:43:42 +08:00
boyu0 710fe9d940 closed #4771: modify test. 2014-04-21 13:32:47 +08:00
minggo 360b63aa53 Merge pull request #6331 from natural-law/develop 
Update the description of "how to start a new game" in README.md.
 2014-04-21 11:41:32 +08:00
zhangbin c0dfbc7561 Update the description of "how to start a new game" in README.md. 2014-04-21 11:37:35 +08:00
James Chen 5a81ed6521 Update AUTHORS [ci skip] 2014-04-21 11:20:52 +08:00
James Chen 8da373f358 Update AUTHORS [ci skip] 2014-04-21 11:20:16 +08:00
James Chen c39a69895d Update CHANGELOG [ci skip] 2014-04-21 11:19:39 +08:00