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

30914 Commits

Author SHA1 Message Date
WenhaiLin 20d445ad1a Label:The texture of system font should be cropped if the height of label is not enough to show the entire string on Mac. 2015-07-29 16:11:27 +08:00
andyque 6de387b3ac fix Mac system font crash issue 2015-07-29 15:20:31 +08:00
pandamicro dc931db932 Merge pull request #13069 from dmurtagh/debug_draw_patch 
Fixed a compile error when CC_SPRITE_DEBUG_DRAW is on
 2015-07-29 09:51:43 +08:00
pandamicro 9f39134669 Merge pull request #13058 from CocosRobot/update_cocosfiles_1438067509 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-07-28 22:49:53 +08:00
pandamicro f9df68a2fd Merge pull request #13063 from xiaofeng11/v3.7.1 
Fix parser compatible for layer project file
 2015-07-28 22:49:19 +08:00
XiaoFeng faee3e7807 Fix parser compatible for layer project file 2015-07-28 18:11:07 +08:00
CocosRobot 6e7c3c636f [AUTO][ci skip]: updating cocos2dx_files.json 2015-07-28 07:11:50 +00:00
pandamicro 2d805b052b Merge pull request #13057 from natural-law/v3.7.1 
[ci skip] Update the reference of submodule cocos2d-console.
 2015-07-28 15:10:15 +08:00
zhangbin 8bc96a10b4 Update the reference of submodule cocos2d-console. 2015-07-28 15:06:28 +08:00
pandamicro 605f181a4d Merge pull request #13056 from natural-law/v3.7.1 
[ci skip] Solve the error in lua template.
 2015-07-28 14:58:11 +08:00
zhangbin 4d46a03797 Solve the error : the VS release configuration of lua template cause `cocos run` error. 2015-07-28 14:54:42 +08:00
Damien 7fb4dabcb7 Fixed a compile error when CC_SPRITE_DEBUG_DRAW is on 2015-07-27 14:46:15 -07:00
pandamicro 8ac75f6c6c Merge pull request #13029 from pandamicro/v3.7.1 
[ci skip] Update web ref
 2015-07-27 11:19:17 +08:00
pandamicro 6ed325afe8 Update web ref 2015-07-27 11:18:16 +08:00
pandamicro bd6e385d87 Merge pull request #13027 from CocosRobot/update_lua_bindings_1437966576 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-07-27 11:16:41 +08:00
CocosRobot e986aac617 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-27 03:14:03 +00: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
pandamicro 632b36fa43 Fix bindings generator for Lua 2015-07-27 10:21:18 +08:00
pandamicro 08e3d8d533 Gen bindings for BoneNode and SkeletonNode 2015-07-27 09:56:55 +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 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 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
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
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
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