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

26449 Commits

Author SHA1 Message Date
CocosRobot 612284f3f2 [AUTO][ci skip]: updating cocos2dx_files.json 2014-12-25 08:05:31 +00:00
minggo 6ec03010a7 Merge pull request #9630 from andyque/fixCICompile 
fix ci compile error
 2014-12-25 16:03:50 +08:00
minggo 803af3e009 Merge pull request #9625 from CocosRobot/update_lua_bindings_1419487927 
[AUTO]: updating luabinding automatically
 2014-12-25 15:55:23 +08:00
andyque 60893607cc fix ci compile error 2014-12-25 15:38:51 +08:00
XiaoYang 8ffe37d6dc Merge pull request #192 from lvlonggame/frustum 
Frustum
 2014-12-25 14:28:50 +07:00
lvlong 75d2deb2c8 revert 2014-12-25 15:25:19 +08:00
lvlong 3f91957e79 revert 2014-12-25 15:21:53 +08:00
Liam fa85faec68 update for cocos reader 2014-12-25 15:02:22 +08:00
yangxiao de7b70f63e skip Node::set/getRotationQuat 2014-12-25 14:55:43 +08:00
yangxiao 04e273e245 bind setRotationQuat 2014-12-25 14:54:20 +08:00
minggo 6487cebead [ci skip]Don't notify because we don't use travis now. 2014-12-25 14:28:27 +08:00
minggo b2d457ee88 Merge pull request #9624 from CocosRobot/update_cocosfiles_1419487850 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-12-25 14:22:50 +08:00
CocosRobot 6b15f4edcb [AUTO]: updating luabinding automatically 2014-12-25 06:14:03 +00:00
Liam 807e63eae3 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into CocoReader 2014-12-25 14:13:02 +08:00
Liam bd37d806ff update for cocos reader 2014-12-25 14:11:05 +08:00
CocosRobot 542b2b6bd2 [AUTO][ci skip]: updating cocos2dx_files.json 2014-12-25 06:10:51 +00:00
minggo 2ec85f8c4e Merge pull request #8922 from TimothyZhang/do-not-lock-when-no-message-in-websocket 
avoid locking when message queue is empty in websocket
 2014-12-25 14:09:35 +08:00
minggo 9643b87ed0 Merge pull request #9173 from 2youyouo2/v3 
improve ActionTimeline api
 2014-12-25 14:06:02 +08:00
lvlong a4a108f766 fix lua binding again!! 2014-12-25 14:04:41 +08:00
minggo 0c66e638f7 Merge pull request #8183 from xseekerj/patch-3 
CCPlatformMacros.h
 2014-12-25 14:02:52 +08:00
minggo 2ca143959b Merge pull request #9620 from yinjimmy/LuaStackExecuteScriptFile 
execute script with full file path
 2014-12-25 13:45:46 +08:00
youyou f678d1027c Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp
 2014-12-25 12:09:31 +08:00
minggo 836e5196d6 Merge pull request #9616 from seedofjoy/patch-1 
Rewrite using already existing director's variable
 2014-12-25 10:52:42 +08:00
yangxiao 0db70977f9 wrong scale order 2014-12-25 10:39:48 +08:00
yangxiao 510633ba72 wrong spelling 2014-12-25 10:33:49 +08:00
minggo c5151079b7 Merge pull request #9612 from CocosRobot/update_lua_bindings_1419413955 
[AUTO]: updating luabinding automatically
 2014-12-25 09:49:19 +08:00
yinjimmy b4a442cd8c fix compile error on windows 2014-12-25 09:33:28 +08:00
Igor Mozharovsky d0c223c3e0 Rewrite using already existing director's variable 2014-12-24 19:21:32 +02:00
minggo 668aa4a9c4 Merge pull request #9607 from andyque/doxygenTools 
[ci skip]Doxygen tools
 2014-12-24 18:28:49 +08:00
yangxiao 6eed142e03 rename _rotation_quat to _rotationQuat 2014-12-24 18:12:00 +08:00
minggo ce6aea3849 Merge pull request #9610 from CocosRobot/update_cocosfiles_1419413858 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-12-24 17:55:17 +08:00
CocosRobot 381be0f6f0 [AUTO]: updating luabinding automatically 2014-12-24 09:41:09 +00:00
CocosRobot 95df9ba145 [AUTO][ci skip]: updating cocos2dx_files.json 2014-12-24 09:37:39 +00:00
minggo 03d53ba7c4 Merge pull request #9585 from doomsdayer/v3_armature_reader 
V3 armature reader
 2014-12-24 17:36:09 +08:00
yangxiao 17207673ff merge cocos 2014-12-24 17:34:58 +08:00
yangxiao 88e0f025ef make it clean 2014-12-24 17:18:09 +08:00
yangxiao 22ae384edf Rotation representation with quaternion fix #9510 2014-12-24 17:07:54 +08:00
minggo 705bf500f7 Merge pull request #9604 from CocosRobot/update_lua_bindings_1419403220 
[AUTO]: updating luabinding automatically
 2014-12-24 17:06:05 +08:00
XiaoYang 988cc5e48c Merge pull request #190 from lvlonggame/frustum 
fix compile error!
 2014-12-24 15:57:50 +07:00
andyque 78e3f92d5c add generate_docs.sh to tools 2014-12-24 16:40:14 +08:00
youyou 3f46f2e641 update project file 2014-12-24 16:22:25 +08:00
yusheng.lu 7c34b06969 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_armature_reader 2014-12-24 16:02:37 +08:00
youyou db6ffd7962 Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x; branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-12-24 15:59:50 +08:00
minggo 6949f468f2 [ci skip] Update CHANGELOG 2014-12-24 15:36:23 +08:00
minggo 0b7572f3ee [ci skip] 2014-12-24 15:35:58 +08:00
minggo 3254339007 [ci skip] Update CHANGELOG 2014-12-24 15:34:57 +08:00
minggo 9af7efa922 [ci skip] Update CHANGELOG 2014-12-24 15:32:37 +08:00
yusheng.lu c64792959c Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_armature_reader 2014-12-24 15:32:02 +08:00
lvlong da2683aad9 Merge branch 'frustum' of github.com:lvlonggame/cocos2d-x into frustum 2014-12-24 15:10:48 +08:00
lvlong 4d1ca0966c lua binding 2014-12-24 15:09:26 +08:00