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

30898 Commits

Author SHA1 Message Date
Wenhai Lin 45e0eda81c Fixed compile error 2015-07-17 11:34:26 +08:00
子龙山人 3167029929 Merge pull request #12884 from natural-law/v3.7-release 
[ci skip] Update the reference of submodule cocos2d-console.
 2015-07-17 10:10:37 +08:00
Bin Zhang a5e3267c98 Update the reference of submodule cocos2d-console. 2015-07-17 10:08:35 +08:00
pandamicro edebcd92c5 Merge pull request #12883 from pandamicro/v3.7-release 
[ci skip] Fix download section in readme
 2015-07-17 01:27:08 +08:00
pandamicro 2507673c5a Fix download section in readme 2015-07-16 23:32:18 +08:00
WenhaiLin f0b29814c3 Label:support font that contains GB2312 char map.[android] 2015-07-16 21:35:10 +08:00
子龙山人 c928976e96 Merge pull request #12880 from CocosRobot/update_lua_bindings_1437037100 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-07-16 17:19:06 +08:00
WenhaiLin a6f8031af9 Label:support font that contains GB2312 char map.[except android] 2015-07-16 17:10:05 +08:00
CocosRobot 047d3dd398 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-16 09:02:35 +00:00
pandamicro 65f647ce00 Merge pull request #12879 from pandamicro/v3.7-release 
[ci skip] Update versions and docs for v3.7
 2015-07-16 16:55:24 +08:00
pandamicro e2068ab84a Update versions and docs for v3.7 2015-07-16 16:53:43 +08:00
pandamicro 4d18b6895a Merge pull request #12877 from CocosRobot/update_lua_bindings_1437034712 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-07-16 16:41:05 +08:00
CocosRobot f2567f498c [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-16 08:22:58 +00:00
pandamicro b094367c94 Merge pull request #12874 from pandamicro/v3.7-release 
Remove cleanup from auto bindings add made it support override in JS
 2015-07-16 16:15:26 +08:00
pandamicro ae2d955955 Update web engine ref 2015-07-16 14:39:09 +08:00
pandamicro 949eca2846 Improve some manual binding code 2015-07-16 14:34:14 +08:00
pandamicro 490d5a3747 Remove cleanup from auto bindings add made it support override in JS 2015-07-16 14:09:26 +08:00
pandamicro 0b1d105803 Merge pull request #12870 from VisualSJ/v3.7-release-parser 
[ci skip] Fixed parser's bug
 2015-07-16 13:04:06 +08:00
VisualSj 0bb385f37c Check texture for existence 2015-07-16 11:54:45 +08:00
VisualSj ef70e1f996 Fixed a bug that is Armature parser 2015-07-16 10:30:22 +08:00
pandamicro 73a75ea5fb Merge pull request #12868 from pandamicro/v3.7-release 
Update web ref
 2015-07-15 22:37:08 +08:00
pandamicro 04fd171e77 Update web ref 2015-07-15 22:36:28 +08:00
pandamicro 95a7afcd36 Merge pull request #12862 from CocosRobot/update_lua_bindings_1436948312 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-07-15 17:16:31 +08:00
CocosRobot be71b6d563 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-15 08:23:23 +00:00
子龙山人 b2d83350ff Merge pull request #12860 from zilongshanren/fix-scale9sprite-gray 
fixed Scale9Sprite gray state issue.
 2015-07-15 16:15:32 +08:00
andyque 2f31f6baa6 fixed Scale9Sprite gray state issue. 
When call `setCapInsets`, the Scale9Sprite's inner sprite will be
rebuild and it's state will be lose.

This commit reset the shader state.
 2015-07-15 14:35:13 +08:00
pandamicro 650f045192 Merge pull request #12858 from pandamicro/v3.7-release 
[ci skip]Update requirements info
 2015-07-15 14:15:26 +08:00
pandamicro 0064dfbc71 Update requirements info 2015-07-15 14:11:59 +08:00
pandamicro 1e84b8c156 Merge pull request #12850 from pandamicro/v3.7-release 
[ci skip] v3.7 rc1 release doc
 2015-07-14 23:24:30 +08:00
pandamicro d768df51ed Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3.7-release 2015-07-14 23:22:54 +08:00
pandamicro c126aac35f v3.7 rc1 release doc 2015-07-14 23:21:34 +08:00
pandamicro b49054876c Merge pull request #12846 from VisualSJ/v3.7-release-parser 
[ci skip] update we index
 2015-07-14 18:23:29 +08:00
VisualSj 909ff57231 update we index 2015-07-14 18:21:03 +08:00
pandamicro 373ab0e5b8 Merge pull request #12844 from CocosRobot/update_cocosfiles_1436868917 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-07-14 18:16:35 +08:00
CocosRobot 3ba4d7230e [AUTO][ci skip]: updating cocos2dx_files.json 2015-07-14 10:15:18 +00:00
pandamicro b6c02cb0ea Merge pull request #12843 from natural-law/v3.7-release 
[ci skip] Update the JS templates to keep the directory structure is same with before.
 2015-07-14 18:13:46 +08:00
Bin Zhang 55890f6206 Update the JS templates to keep the directory structure is same with before. 2015-07-14 18:07:17 +08:00
pandamicro eb56ad6d60 Merge pull request #12836 from pandamicro/v3.7-release 
Fixed #12834 Invoke cleanup function when override in JS
 2015-07-14 17:37:00 +08:00
pandamicro a90a8b12c6 Merge pull request #12840 from pandamicro/path 
[ci skip] Add cc.path.mainFileName
 2015-07-14 16:41:16 +08:00
pandamicro 41778f35fb Add cc.path.mainFileName 2015-07-14 16:33:38 +08:00
pandamicro 658fe74141 Merge pull request #12838 from VisualSJ/v3.7-release-parser 
[ci skip] Remove getRes (parser)
 2015-07-14 16:20:42 +08:00
pandamicro efffea5b91 Fixed #12834 Invoke cleanup function when override in JS 2015-07-14 15:35:29 +08:00
VisualSj a9deb6dda5 Remove getRes (parser) 2015-07-14 15:26:13 +08:00
pandamicro 48376db17a Merge pull request #12832 from pandamicro/jsb_loader_fix 
Fix jsb loader
 2015-07-14 15:25:24 +08:00
pandamicro 09775d6f2a Ensure backward compatibility 2015-07-14 14:14:36 +08:00
pandamicro 43a5b6f020 Fix jsb loaders issues 2015-07-14 13:40:09 +08:00
pandamicro 365c51cfab Merge pull request #12824 from darkdukey/v3.7-release 
update release notes for sdkbox
 2015-07-14 09:46:06 +08:00
pandamicro 5dc0cab4a5 Merge pull request #12823 from natural-law/v3.7-release 
[ci skip] Update the reference of submodule cocos2d-console.
 2015-07-14 09:42:50 +08:00
Nite Luo 55037345a4 update release notes for sdkbox 2015-07-13 18:42:35 -07:00
Bin Zhang 569695d844 Update the reference of submodule cocos2d-console. 2015-07-14 09:40:42 +08:00