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

31713 Commits

Author SHA1 Message Date
子龙山人 bd0bdae530 Merge pull request #12993 from WenhaiLin/v3.8-label-layout-refine 
Label:refine the implementation about text layout and support debug draw.
 2015-07-27 11:10:31 +08:00
pandamicro aa21cd5937 Merge pull request #13024 from pandamicro/v3.7.1 
[LUA] Gen bindings for BoneNode and SkeletonNode
 2015-07-27 11:06:42 +08:00
jianglong0156 48147ff08a add the Animate3D and Animation3D js implements 2015-07-27 10:53:34 +08:00
jianglong0156 d51f0b1f05 add animate support new 2015-07-27 10:51:53 +08:00
fusijie f2f425d19c fix 13025 wild pointer. 2015-07-27 10:39:31 +08:00
jianglong0156 e25c4f88ae add animation3d support new to create 2015-07-27 10:31:35 +08:00
pandamicro 632b36fa43 Fix bindings generator for Lua 2015-07-27 10:21:18 +08:00
dualface affca12a0e Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3.7.1 2015-07-27 10:18:14 +08:00
pandamicro 08e3d8d533 Gen bindings for BoneNode and SkeletonNode 2015-07-27 09:56:55 +08:00
dualface 4c7e4c654a update cocos2dx.ini for luabinding 2015-07-26 17:16:50 +08:00
pandamicro 82f4e96870 Merge pull request #13022 from CocosRobot/update_cocosfiles_1437892027 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-07-26 16:27:43 +08:00
CocosRobot 42c42ccd7e [AUTO][ci skip]: updating cocos2dx_files.json 2015-07-26 06:27:09 +00:00
pandamicro ded0295c5f Merge pull request #13021 from dualface/v3.7.1 
Add Luabinding conversions for std::map<std::string, std::string>
 2015-07-26 14:24:49 +08:00
dualface bd39247192 Add Luabinding conversions for std::map<std::string, std::string> 2015-07-26 07:40:34 +08:00
pandamicro 05fce87e9b Merge pull request #13018 from CocosRobot/update_lua_bindings_1437808838 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-07-25 15:27:08 +08:00
CocosRobot 2dedba4acf [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-25 07:24:55 +00:00
pandamicro 5be905c181 Merge pull request #13017 from pandamicro/v3.7.1 
[ci skip] Release docs for v3.7.1
 2015-07-25 15:17:52 +08:00
pandamicro a2a32ef58c Release docs for v3.7.1 2015-07-25 15:16:39 +08:00
pandamicro c16cab7e53 Merge pull request #13015 from VisualSJ/v3.7.1-12940 
[ci skip] Moveing ActionTimeline tests
 2015-07-25 14:44:10 +08:00
VisualSj a0bf2c782f Moveing ActionTimeline tests 2015-07-25 14:37:56 +08:00
VisualSj c49053fce4 Moveing ActionTimeline tests 2015-07-25 14:37:44 +08:00
pandamicro 9615545e11 Merge pull request #12890 from jianglong0156/FileUtilsJSB 
[ci skip]add fileUtils writeString,writeValueMap,writeValueVector in jsb
 2015-07-25 14:16:14 +08:00
jianglong0156 c14ca98203 set file name to label.change the file dir 2015-07-25 14:04:41 +08:00
pandamicro 33007e832f Merge pull request #13014 from CocosRobot/update_lua_bindings_1437802542 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-07-25 13:40:55 +08:00
CocosRobot f7fced7b70 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-25 05:40:05 +00:00
pandamicro ac8b5e361d Merge pull request #13013 from CocosRobot/update_cocosfiles_1437802446 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-07-25 13:38:56 +08:00
CocosRobot 3c1a3677ff [AUTO][ci skip]: updating cocos2dx_files.json 2015-07-25 05:34:07 +00:00
pandamicro a5bbe58b87 Merge pull request #13012 from pandamicro/v3.7.1 
[ci skip]Gen bindings and cocos2dx_files for v3.7.1
 2015-07-25 13:32:43 +08:00
pandamicro 93c1cb70c4 Gen bindings and cocos2dx_files for v3.7.1 2015-07-25 13:31:52 +08:00
pandamicro 1bad0e937c Merge pull request #13011 from pandamicro/v3.7.1 
Gen bindings for v3.7.1
 2015-07-25 13:29:00 +08:00
pandamicro c1bc03b342 Gen bindings for v3.7.1 2015-07-25 13:28:02 +08:00
pandamicro fba892f4aa Merge pull request #13002 from VisualSJ/v3.7.1-12940 
[ci skip]Issue #12940: Fixed a bug that is removing SimpleAudio play
 2015-07-25 13:20:27 +08:00
pandamicro 7ae3dd12a1 Merge pull request #12995 from fusijie/fix_12505 
fix blur shader compliant on win8 universal.
 2015-07-25 12:42:35 +08:00
pandamicro 21f3dca627 Merge pull request #13010 from pandamicro/v3.7.1 
[ci skip]Gen bindings for v3.7.1
 2015-07-25 12:13:15 +08:00
pandamicro 14aaf2acc3 Gen bindings for v3.7.1 2015-07-25 12:10:01 +08:00
pandamicro 4fdfbd05c4 Merge pull request #13005 from geron-cn/3.7.1 
fix bug:use wrong _modelviewTransform in director to draw bone
 2015-07-25 09:53:38 +08:00
pandamicro fa46a0abb4 Merge pull request #12992 from yangws/v3.7.1 
Fixed #12962 : Scene can't have std::vector member.
 2015-07-25 09:52:00 +08:00
Ricardo Quesada 2d04e995d7 Merge pull request #13007 from ricardoquesada/cocos2d_version 
updates cocos2d version
 2015-07-24 15:53:51 -07:00
Ricardo Quesada 76982dac89 updates cocos2d version 2015-07-24 15:53:18 -07:00
pandamicro 09d8b8829e Merge pull request #13006 from MSOpenTech/v3.7.1-winrt 
v3.7.1: added missing cocostudio files to Win10 libcocos2d project
 2015-07-24 23:43:21 +08:00
pandamicro a666658764 Merge pull request #12998 from pandamicro/v3.7.1 
Add BoneNode/SkeletonNode/SkinNode JS bindings
 2015-07-24 23:42:38 +08:00
WenhaiLin a1e682ca65 Improves the test to reproduce issue 12996 2015-07-24 21:34:59 +08:00
WenhaiLin b1bd8338aa Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3.8-label-gb2312 2015-07-24 21:30:28 +08:00
fusijie 647848e843 fix blur sprite shader on win8 universal. 2015-07-24 21:04:44 +08:00
pandamicro 05bb775438 Sync timelineParser and fix issue 2015-07-24 20:16:56 +08:00
pandamicro 54330576e6 Fix JS binding issues for skeleton animation 2015-07-24 20:16:01 +08:00
pandamicro a256df68c1 Merge pull request #13000 from yangws/v3 
Fix bug: app will crash if move mouse over window when launching.
 2015-07-24 20:11:25 +08:00
geron-cn a4b6f4d103 Merge branch 'v3.7.1' of github.com:cocos2d/cocos2d-x into 3.7.1 2015-07-24 19:51:45 +08:00
Dale Stammen 8940eb829f added missing cocostudio files 2015-07-24 04:48:14 -07:00
geron-cn a5d41aac0d fix bug:use wrong _modelviewTransform in director to draw bone 2015-07-24 19:48:05 +08:00