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

31734 Commits

Author SHA1 Message Date
jianglong0156 9c6b5730d0 add Physics3DPointToPointConstraint support new 2015-07-27 16:02:13 +08:00
Zhang Menghe a96ea2342a Update OpenGLTest.js 2015-07-27 15:53:48 +08:00
pandamicro 3cc039b063 Merge pull request #13036 from fusijie/fix_12505 
fix shader-basic testcase 'center' uniform error.
 2015-07-27 15:40:44 +08:00
XiaoFeng 8421ff7149 Disable new function bind to lua to avoid compile error 2015-07-27 15:09:34 +08:00
ZhangMenghe 232f738bf7 Fix OpenGL testcase 'center' uniform error 2015-07-27 15:08:07 +08:00
jianglong0156 1be5981d6a add Physics3DComponent support new 2015-07-27 14:26:50 +08:00
fusijie f8de67a0c4 fix shader-basic testcase 'center' uniform error. 2015-07-27 14:18:17 +08:00
pandamicro 3fb45f28f5 Merge pull request #13033 from CocosRobot/update_cocosfiles_1437975533 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-07-27 13:41:41 +08:00
CocosRobot f751234b7f [AUTO][ci skip]: updating cocos2dx_files.json 2015-07-27 05:38:54 +00:00
子龙山人 7f383f961a Merge pull request #13026 from fusijie/fix_13025 
fix 13025 wild pointer.
 2015-07-27 13:38:38 +08:00
子龙山人 ce06f148a5 Merge pull request #13031 from natural-law/remove-unused-files 
Remove the unused files in tools/gen-prebuilt.
 2015-07-27 13:37:07 +08:00
pandamicro bb15225ff7 Merge pull request #13028 from CocosRobot/update_lua_bindings_1437966796 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-07-27 12:04:22 +08:00
XiaoFeng f410fcd737 Fix issue https://github.com/cocos2d/cocos2d-x/issues/12968 2015-07-27 11:55:18 +08:00
dualface 6d16d1674d Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3.7.1 2015-07-27 11:50:14 +08:00
zhangbin e73fc94345 Remove the unused files in tools/gen-prebuilt. 2015-07-27 11:38:41 +08: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
jianglong0156 4005ef6588 add skybox support new 2015-07-27 11:19:17 +08:00
pandamicro 6ed325afe8 Update web ref 2015-07-27 11:18:16 +08:00
CocosRobot d9b5ce8d28 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-27 03:17:29 +00: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
子龙山人 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