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

21383 Commits

Author SHA1 Message Date
2youyou2 0ce51162af support Label widget 2014-06-19 14:11:37 +08:00
yangxiao c5bb10e5f4 add comments 2014-06-19 14:11:14 +08:00
samuele3hu 65f51181c6 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_lua_fix 2014-06-19 14:06:14 +08:00
samuele3hu 3a350e11ae Add Lua binding for Animation3D and Animate3D ,and add related test case 2014-06-19 14:05:38 +08:00
子龙山人 e1095c4f09 Merge pull request #9 from geron-cn/guanghuiv3 
Guanghuiv3
 2014-06-19 13:38:53 +08:00
yangxiao 4db0bea73f bone original pose 2014-06-19 12:01:03 +08:00
minggo dff3feeeb7 Merge pull request #7128 from natural-law/v3 
Modify the lua runtime template for prebuilt engine.
 2014-06-19 11:49:04 +08:00
zhangbin 3b19b07915 Modify the lua runtime template for prebuilt engine. 2014-06-19 11:33:39 +08:00
minggo 56777e6d61 [ci skip] 2014-06-19 09:47:01 +08:00
minggo e60e3c217d Merge pull request #7046 from Dhilan007/v3-label-improve 
1.Support setting up the line height and additional kerning of label.
 2014-06-19 09:44:51 +08:00
geron-cn 797085574c add binary read to test-cpp 2014-06-18 20:13:06 +08:00
geron-cn 6abc9aba0e add binary read to test-cpp 2014-06-18 20:09:12 +08:00
andyque b55b95adc3 fix linux compile error 2014-06-18 18:28:31 +08:00
andyque 20b41d2886 fix android compile error 2014-06-18 18:25:31 +08:00
boyu0 d89c2176c3 issue #4437: add vertex z support, fix some bugs. 2014-06-18 18:19:13 +08:00
geron-cn d2746f64a6 cpp-tests 2014-06-18 18:11:21 +08:00
Dhilan007 9351172baf add test case for new API of Label. 2014-06-18 18:01:55 +08:00
geron-cn 5cfbd3a2bd add binary decode to armature 2014-06-18 17:43:13 +08:00
yangxiao 9eaff7465d Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-06-18 17:17:33 +08:00
yangxiao 052b4fa1ce bone origin matrix 2014-06-18 17:16:54 +08:00
minggo 719c8995cf Merge pull request #7118 from natural-law/v3 
Remove the debug symbols for release mode in xcode projects.
 2014-06-18 17:10:34 +08:00
zhangbin 1b056b6c49 Remove the debug symbols for release mode in xcode projects. 
Modify the template of lua runtime.
 2014-06-18 17:06:56 +08:00
andyque 9398395de8 fix custom property 2014-06-18 16:19:24 +08:00
andyque 1533374bd1 add ui animation for binary parsing 2014-06-18 15:55:01 +08:00
andyque aa5df68b96 Merge branch 'v3' into cleanupBinaryLoader 
Conflicts:
	cocos/3d/CCAnimationCurve.h
	cocos/3d/CCAnimationCurve.inl
 2014-06-18 15:13:34 +08:00
andyque f614e9a89b fix tests 2014-06-18 15:06:45 +08:00
子龙山人 0b677a86d7 Merge pull request #8 from geron-cn/guagnhuiv3 
Guagnhuiv3
 2014-06-18 14:47:11 +08:00
andyque 63475a6f81 refactor Loader 2014-06-18 14:44:00 +08:00
geron-cn 12bb7564cd fix cannot compile in windows 2014-06-18 14:35:43 +08:00
2youyou2 b323f5772e optimize frame 2014-06-18 14:21:33 +08:00
andyque 615995af54 add base property parser for WidgetReader 2014-06-18 14:15:11 +08:00
minggo a587931ce3 Merge pull request #7115 from minggo/windows-fix 
fix compiling error on windows
 2014-06-18 14:14:39 +08:00
minggo b28a482ec4 Merge pull request #7116 from CocosRobot/update_lua_bindings_1403071752 
[AUTO]: updating luabinding automatically
 2014-06-18 14:12:53 +08:00
CocosRobot 155638f2de [AUTO]: updating luabinding automatically 2014-06-18 06:10:38 +00:00
minggo a68d89bce3 Merge pull request #7113 from samuele3hu/v3_lua_fix 
Skip some functions for Lua bindings for compile error
 2014-06-18 14:05:41 +08:00
minggo d6776b664a fix compiling error on windows 2014-06-18 14:01:57 +08:00
samuele3hu ed72202e68 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_lua_fix 2014-06-18 13:44:27 +08:00
samuele3hu 98fde94647 Skip some functions for Lua bindings 2014-06-18 13:43:22 +08:00
minggo afb49f2e81 Merge pull request #7112 from CocosRobot/update_cocosfiles_1403069812 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-06-18 13:38:14 +08:00
minggo 08453b911d Merge pull request #7071 from pandamicro/Script_onEnter_fix 
Fixed #5563: Wrap override onEnter function by script call detection code to solve bugs in JSB
 2014-06-18 13:37:57 +08:00
CocosRobot 9aeb1510ed [AUTO][ci skip]: updating cocos2dx_files.json 2014-06-18 05:36:54 +00:00
minggo a672f03382 Merge pull request #7110 from CocosRobot/update_lua_bindings_1403062939 
[AUTO]: updating luabinding automatically
 2014-06-18 13:35:36 +08:00
pandamicro 950894de80 Fixed #5563: Fix include issue 2014-06-18 12:47:48 +08:00
andyque 95f1bd7e72 update loader 2014-06-18 11:54:25 +08:00
pandamicro 94fdff1da9 Fixed #5563: Make sendNodeEventToXXX as static functions of ScriptEngineManager in CCScriptSupport 2014-06-18 11:51:52 +08:00
samuele3hu 15d070f7fc Update submodule 2014-06-18 11:50:24 +08:00
samuele3hu 00611f7ec1 Update cocos2dx_spine.ini 2014-06-18 11:47:43 +08:00
CocosRobot d58d36d1c8 [AUTO]: updating luabinding automatically 2014-06-18 03:44:06 +00:00
minggo c9492cbbef [ci skip] 2014-06-18 11:31:16 +08:00
minggo 6ecca08340 Merge pull request #7039 from minggo/get-child-by-name 
issue #4693: add getName(), setName() and getChildByName()
 2014-06-18 11:30:14 +08:00