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

18734 Commits

Author SHA1 Message Date
zhangbin 7874cd8045 closed #4786, Show tip message when python is not compatible. 2014-04-14 17:29:37 +08:00
chuanweizhang2013 3e9a401a6f Merge pull request #24 from cocos2d/develop 
update cocos2d-x
 2014-04-14 17:22:15 +08:00
Huabing.Xu a5e900a86b manually enable depth test in test case TMXIsoVertexZ 2014-04-14 17:06:35 +08:00
minggo de5f52857a Merge pull request #6273 from CocosRobot/update_lua_bindings_1397458473 
[AUTO]: updating luabinding automatically
 2014-04-14 14:56:35 +08:00
CocosRobot daccbdb2bf [AUTO]: updating luabinding automatically 2014-04-14 06:55:48 +00:00
minggo 26494c000b Merge pull request #6257 from dumganhar/group-command-manager-not-singleton 
GroupCommandManager should not be a singleton, it should be managed by Renderer.
 2014-04-14 14:52:39 +08:00
minggo 45b2a7b2a5 [ci skip] 2014-04-14 14:52:01 +08:00
minggo bb15d0ecf9 Merge pull request #6267 from dabingnn/develop_add_culling_enabled_option 
Add interface setCullingEnabled(), culling is disabled by default
 2014-04-14 14:50:11 +08:00
James Chen eb651a6ae4 Merge pull request #6272 from Dhilan007/develop 
LabelTTF:fixed display incorrect if create by FontDefinition.
 2014-04-14 14:09:50 +08:00
Dhilan007 aef2767d23 change variable name. 2014-04-14 13:42:37 +08:00
James Chen 71015184c3 Merge pull request #6271 from shujunqiao/autotest-close 
[ci skip], add close app in autotest.py
 2014-04-14 13:38:54 +08:00
shujunqiao 884974f5e4 [ci skip], add close app in autotest.py 2014-04-14 11:55:11 +08:00
minggo b073e65cf4 Merge pull request #6269 from natural-law/develop 
Solve the problem of setup.py on windows.
 2014-04-14 11:51:49 +08:00
zhangbin 7e807f3ea9 closed #4784, Solve the problem of setup.py on windows. 2014-04-14 11:48:48 +08:00
zhangbin 17fe267644 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-04-14 11:47:54 +08:00
Huabing.Xu d2dd57d412 change indention to space and remove comment code 2014-04-14 11:45:06 +08:00
Dhilan007 6fe64b83f8 LabelTTF:fixed display incorrect if create by FontDefinition. 2014-04-14 11:33:46 +08:00
Huabing.Xu 9935e8ddfb setCullingEnabled set to public access 
changed renderer->culling test case
 2014-04-14 11:33:40 +08:00
James Chen 2ee06a3533 Update AUTHORS [ci skip] 2014-04-14 11:15:54 +08:00
James Chen 81171910b3 Merge pull request #6259 from iSevenDays/patch-7 
Fix incompatible pointer conversion
 2014-04-14 11:14:29 +08:00
minggo 09911b712b [ci skip] 2014-04-14 10:50:32 +08:00
minggo 4faa1c9651 Merge pull request #6243 from koowolf/wp8_audio 
closed #4762: fix some problems in cocosdension in wp8
 2014-04-14 10:47:45 +08:00
minggo 9f9a87f09d Merge pull request #6254 from dumganhar/clippingnode-leak 
Memory leak fix for ClippingNode
 2014-04-14 10:17:37 +08:00
minggo 4669e7fa39 Merge pull request #6255 from dumganhar/cocostudio-leak 
Memory leak fix in macro IMPLEMENT_CLASS_INFO
 2014-04-14 10:13:52 +08:00
James Chen 44a01be0f5 Merge pull request #6266 from dumganhar/develop 
Const love: std::function<void(Texture2D*)> -> const std::function<void(Texture2D*)>&
 2014-04-14 10:04:44 +08:00
zhangbin c2b7e9798a Merge branch 'develop' of https://github.com/natural-law/cocos2d-x; branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-04-14 10:01:18 +08:00
James Chen 5000873778 Const love: std::function<void(Texture2D*)> -> const 
std::function<void(Texture2D*)>&
 2014-04-14 10:01:17 +08:00
Huabing.Xu 37bfeff8f0 Add interface setCullingEnabled(), culling is disabled by default 2014-04-14 09:56:01 +08:00
minggo 1e4f43d75d Merge pull request #6256 from dumganhar/scheudlertest-leak 
Memory leak fix in SchedulerTest
 2014-04-14 09:55:04 +08:00
minggo c99f503a10 [ci skip] 2014-04-14 09:52:15 +08:00
minggo 6ab462ccf0 Merge pull request #6265 from sachingarg05/AndroidJavaActivityOrientation 
Fix Orientation Change Support for Android Java Activity
 2014-04-14 09:50:15 +08:00
Sachin Garg 69223549f3 Add support for orientation change callback (applicationScreenSizeChanged) in Android Java activity. 2014-04-14 05:46:30 +05:30
Anton Sokolchenko 65cf2e1256 Update CCImage.cpp 2014-04-13 01:13:58 +03:00
Anton Sokolchenko a9ccb812ed Fix memory leak 2014-04-12 18:47:00 +03:00
Anton Sokolchenko d778a947f5 Fix incompatible pointer conversion 2014-04-12 18:29:50 +03:00
James Chen b276c42ae6 GroupCommandManager should not be a singleton, it should be managed by Renderer. 2014-04-12 13:01:42 +08:00
James Chen 043f86cd6b Memory leak fix in SchedulerTest 2014-04-12 12:59:28 +08:00
James Chen b715a87791 Memory leak fix in macro IMPLEMENT_CLASS_INFO 2014-04-12 12:58:00 +08:00
James Chen 922b399ef2 Memory leak fix for ClippingNode 2014-04-12 12:56:36 +08:00
James Chen 6feef5fa55 Merge pull request #6251 from dumganhar/develop 
Small fix in Lua test.
 2014-04-11 20:57:12 +08:00
James Chen 427ca4ecf0 Small fix in Lua test. 2014-04-11 05:45:18 -07:00
zhangbin 6483f0d3ec Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-04-11 20:33:00 +08:00
James Chen 377b50e6fd Merge pull request #6249 from dumganhar/develop 
Fixes for Console, 1) wrong lambda capture, 2) Crashes when click 'next' in ConsoleTest.
 2014-04-11 20:28:00 +08:00
zhangbin e27545df61 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-04-11 20:27:42 +08:00
James Chen b71e1c1570 Merge pull request #6250 from natural-law/develop 
fix the error effect of ` FontTest` in lua-tests.
 2014-04-11 20:26:30 +08:00
James Chen 350f61c4da Merge pull request #5921 from koowolf/Branch_cocos2d-x-3.0rc0 
closed #4497: use /z7 to build without .pdb
 2014-04-11 20:20:47 +08:00
zhangbin 99766cdd03 fix the error show of ` FontTest` 2014-04-11 20:17:34 +08:00
James Chen 576d9d872c Fixes for Console, 1) wrong lambda capture, 2) Crashes when click 'next' 
in ConsoleTest.
 2014-04-11 20:07:54 +08:00
James Chen 8e9e72c88c Merge pull request #6248 from natural-law/develop 
Solve the incorrect effect of some transition test case in lua-tests.
 2014-04-11 20:07:04 +08:00
zhangbin d611cfb49f Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-04-11 20:03:24 +08:00