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

20761 Commits

Author SHA1 Message Date
Huabing.Xu 6686b657a4 Migrate getPostion and correspondent member variable to Vector2 2014-04-15 16:28:59 +08:00
Huabing.Xu 071cbc7565 migrate setPosition to Vector2 2014-04-15 16:16:14 +08:00
zhangbin dd5c2aacd6 Merge branch 'develop' into issue4727 
Conflicts:
	tools/cocos2d-console
 2014-04-15 15:18:00 +08:00
Huabing.Xu ec2ef0f64b migrate convertXXXX to Vector2 step2 2014-04-15 14:41:09 +08:00
Huabing.Xu 633173005b migrate convertXXXX to Vector2 2014-04-15 14:29:12 +08:00
Huabing.Xu 4df714b9d8 Migrate to Vector2 in class Director 2014-04-15 14:18:40 +08:00
Huabing.Xu 44be9a38ec Node convertToNodeSpace and convertToWorldSpace use Vector2 2014-04-15 14:09:46 +08:00
minggo b68ff69ad0 Merge pull request #6287 from minggo/update-version 
update version information
 2014-04-15 14:00:08 +08:00
minggo 46e7058587 update version information 2014-04-15 13:58:51 +08:00
Huabing.Xu 11fc8ac308 conversion from Vector2 and Point 2014-04-15 13:58:08 +08:00
shujunqiao 3b8934f205 [ci skip], modify print infomation in emptytest.py 2014-04-15 13:43:38 +08:00
minggo 38b982f938 Merge pull request #6286 from dumganhar/rename-listener-method 
Renames the protected method: 'EventListener::(s|g)etSceneGraphPriority'-> 'EventListener::(s|g)etAssociatedNode'
 2014-04-15 13:43:25 +08:00
minggo eea099866c Merge pull request #6285 from dumganhar/template-ios5.1-crash-fix 
closed #4607: Fixed project created by template crashes on iOS5.1 device...
 2014-04-15 13:42:47 +08:00
boyu0 b53961b78d issue $4771: fix lua test and fix some bugs 2014-04-15 13:40:44 +08:00
James Chen 8134404734 Renames the protected method: 'EventListener::(s|g)etSceneGraphPriority' 
-> 'EventListener::(s|g)etAssociatedNode'
 2014-04-15 12:50:33 +08:00
Huabing.Xu 3f496069b4 add interface in Vector2 for Point 2014-04-15 11:58:08 +08:00
James Chen cb807e61c2 closed #4607: Fixed project created by template crashes on iOS5.1 device. 2014-04-15 11:56:50 +08:00
minggo c693765edd Merge pull request #6284 from natural-law/issue4849 
The environment variable take effect without reboot machine on windows
 2014-04-15 11:51:21 +08:00
zhangbin e622b1fa0e closed #4849, The environment variable take effect without reboot machine on windows. 2014-04-15 11:49:16 +08:00
James Chen 1586b074a3 Merge pull request #6283 from CocosRobot/update_lua_bindings_1397533229 
[AUTO]: updating luabinding automatically
 2014-04-15 11:42:07 +08:00
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
boyu0 c98f50026f issue $4771: move PhysicsWorld to layer. 2014-04-15 03:21:18 +08: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
andyque 87b437dd3a closed #4783. replace deprecated function call 2014-04-14 13:48:17 +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