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

30830 Commits

Author SHA1 Message Date
gero 2037616a2d Merge pull request #4 from fusijie/3.7.1 
fix compile on iOS/Android/Linux/Win8Universal.
 2015-07-23 17:46:28 +08:00
geron-cn 4d58aa2668 remove setcontentsize in skeletonnode 2015-07-23 17:41:37 +08:00
fusijie e9cbb6b084 fix compile on iOS/Android/Linux/Win8Universal. 2015-07-23 17:32:52 +08:00
geron-cn 7255b5308b config for mac 2015-07-23 15:13:14 +08:00
geron-cn d46c8c6802 add lack file 2015-07-23 15:12:09 +08:00
geron-cn 16ee74b845 add bonenode to CocoStudio.h 2015-07-23 13:34:11 +08:00
geron-cn 915cefa208 bone node 2015-07-23 11:51:49 +08:00
pandamicro 5b8371aaa2 Merge pull request #12958 from VisualSJ/v3.7.1-bindCallback 
[ci skip] Parse Touch/Click callback in JS Studio parser
 2015-07-23 09:30:40 +08:00
pandamicro 50fb53fbbc Merge pull request #12956 from liamcindy/SkyBox_3.7.1 
update resource index
 2015-07-22 22:24:41 +08:00
VisualSj d4900493e2 JS Studio parser (Modify callback method) 2015-07-22 17:56:35 +08:00
VisualSj b282d75346 Parse Touch/Click callback in JS Studio parser 2015-07-22 16:51:44 +08:00
Liam 99c1c33c61 update resource 2015-07-22 15:56:35 +08:00
pandamicro e0e5ae9d99 Merge pull request #12924 from liamcindy/SkyBox_3.7.1 
update for Game3DNodeReader & UserCameraReader
 2015-07-22 15:34:18 +08:00
pandamicro e097dca997 Merge pull request #12954 from VisualSJ/v3.7.1-transform-2 
[ci skip] Add cc.affineTransformConcatIn
 2015-07-22 15:33:31 +08:00
VisualSj 1496224c6d Add cc.affineTransformConcatIn 2015-07-22 15:21:13 +08:00
Liam d8155a20ae update for code format 2015-07-22 14:11:20 +08:00
pandamicro 4873995867 Merge pull request #12951 from natural-law/v3.7.1 
[ci skip] Solve the error in Xcode project of simulator.
 2015-07-22 13:47:00 +08:00
Bin Zhang 0a6186d68f Solve the error in Xcode project of simulator. 2015-07-22 13:44:34 +08:00
pandamicro 78314eca35 Merge pull request #12945 from xiaofeng11/v3.7.1 
Synchronize skybox parser with C++ version
 2015-07-22 10:36:07 +08:00
XiaoFeng fcd7388936 Synchronize skybox parser with C++ version 2015-07-22 09:45:35 +08:00
pandamicro 25dff88ff4 Merge pull request #12922 from xiaofeng11/v3.7-release 
[ci skip]Add Skybox parser to js
 2015-07-22 09:12:38 +08:00
pandamicro 00e3641700 Merge pull request #12932 from cocos2d/v3.7-release 
Merge v3.7 release
 2015-07-21 11:08:32 +08:00
pandamicro 55840b4561 Merge pull request #12930 from pandamicro/v3.7-release 
[ci skip] Update release docs for v3.7
 2015-07-21 09:50:32 +08:00
pandamicro f98e9495fe Update release docs for v3.7 2015-07-21 09:49:41 +08:00
pandamicro 273ce6270c Merge pull request #12929 from pandamicro/v3.7-release 
Update html5 engine ref
 2015-07-21 09:25:08 +08:00
pandamicro ed6d759145 Update html5 engine ref 2015-07-21 09:24:31 +08:00
子龙山人 29497c5bb7 Merge pull request #12916 from CocosRobot/update_lua_bindings_1437375818 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-07-20 15:11:51 +08:00
CocosRobot 0a23e4a305 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-20 07:08:12 +00:00
pandamicro 1afc0c1e48 Merge pull request #12912 from zilongshanren/addTwoAPIToNode 
add Two APIs to Node.
 2015-07-20 15:00:20 +08:00
andyque c4d8ebc780 add Two APIs to Node. 
1. add getNodeToParentTransform(Node* ancestor)

2. add getNodeToParentAffineTransform(Node* ancestor)
 2015-07-20 13:49:23 +08:00
子龙山人 0ea8dca299 Merge pull request #12881 from WenhaiLin/v3.7-label-gb2312 
Label:support font that contains GB2312 char map.
 2015-07-17 17:33:52 +08:00
Wenhai Lin 66dadea0cd Rollback log level 2015-07-17 15:56:51 +08:00
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