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

18919 Commits

Author SHA1 Message Date
CocosRobot 4f9387447d [AUTO]: updating luabinding automatically 2014-04-15 03:41:34 +00:00
Ricardo Quesada 582a597d78 Merge pull request #6281 from ricardoquesada/autoculling_working_ok 
Culling working again
 2014-04-14 20:37:43 -07:00
Ricardo Quesada 3978cee2ee compiles on windows 2014-04-14 20:00:06 -07:00
Ricardo Quesada 584ccf65e4 Culling working again 2014-04-14 16:46:19 -07:00
minggo 31fdca1045 Merge pull request #6280 from chuanweizhang2013/luaruntime 
update
 2014-04-14 21:23:42 +08:00
chuanweizhang2013 82e0c26ad0 Merge branch 'luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into luaruntime 2014-04-14 21:21:45 +08:00
chuanweizhang2013 8f50cee43c add no-res 2014-04-14 21:21:04 +08:00
minggo f07dedd084 Merge pull request #6279 from minggo/update-console 
update console submodule
 2014-04-14 21:17:28 +08:00
minggo 0ecd8e271e update console submodule 2014-04-14 21:02:01 +08:00
shujunqiao 58f2de8598 [ci skip], add emptytest.py 2014-04-14 18:43:26 +08:00
Huabing.Xu c081fc61aa comment kmMat4 & Matrix conversion code 2014-04-14 17:49:45 +08:00
minggo 34144f9821 Merge pull request #6277 from natural-law/issue4786 
Show tip message when python is not compatible.
 2014-04-14 17:42:48 +08:00
James Chen 3f65ec2eb5 Merge pull request #6276 from dabingnn/develop_fix_depth_in_IOSvertexZ 
manually enable depth test in test case TMXIsoVertexZ
 2014-04-14 17:30:48 +08:00
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
Huabing.Xu 15cc63c2ba remove kmVec3 in ActionCamera 2014-04-14 15:26:05 +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
Huabing.Xu 3601fe9297 android can work 2014-04-14 14:30:17 +08:00
Huabing.Xu c3bf78494a remove CCFrustum.cpp, we will use new instead 2014-04-14 14:18:32 +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
Huabing.Xu ec5398e7c6 Merge branch 'develop' into develop_migrate_math_lib_merge 
Conflicts:
	tests/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.h
 2014-04-14 14:08:19 +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
Huabing.Xu 80f96398b3 1. changed comment message in CCNode.cpp 
2. changed Director projection to Matrix
 2014-04-14 09:30:51 +08:00
Sachin Garg 69223549f3 Add support for orientation change callback (applicationScreenSizeChanged) in Android Java activity. 2014-04-14 05:46:30 +05:30