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

27540 Commits

Author SHA1 Message Date
minggo 15853a435e Merge pull request #10738 from newnon/v3_mingw_build_fix 
MinGW build fix
 2015-03-06 15:49:13 +08:00
minggo 8d781d9671 Merge pull request #10756 from samuele3hu/v3_5_rc_check 
[ci skip]Fix the error that Android.mk for lua template re-assign the value of  LOCAL_C_INCLUDES
 2015-03-06 15:44:58 +08:00
minggo 65926a9f0b Merge pull request #10734 from pipu/projectnode_animation_innerspeed 
Serialize and parse attribute "innerspeed" for ProjectNode.
 2015-03-06 15:43:57 +08:00
samuele3hu 1844fdd806 Fix the error that Android.mk for lua template re-assign the value of LOCAL_C_INCLUDES 2015-03-06 15:41:48 +08:00
minggo c96f3b135a Merge pull request #10733 from pipu/modify_layout_attribute_name 
To modify layout attribute name that are used in serialized and parsed.
 2015-03-06 15:00:33 +08:00
minggo 065102ae7c Merge pull request #10753 from natural-law/v3 
[ci skip] Update the reference of submodule cocos2d-console.
 2015-03-06 14:53:31 +08:00
zhangbin 8c57edbad5 Update the reference of submodule cocos2d-console. 2015-03-06 14:51:29 +08:00
Huabing.Xu f77fddffe1 Merge pull request #10741 from andyque/fix-linux-compile 
fix Linux glfw linker error on v3
 2015-03-05 17:08:00 +08:00
andyque e93f39fae1 fix typo 2015-03-05 17:05:08 +08:00
andyque a229793e31 fix Linux glfw linker error on v3 2015-03-05 16:34:51 +08:00
Sergey de284c98ce MinGW build fix 2015-03-05 11:11:13 +03:00
minggo e792b6aa9a Merge pull request #10725 from fusijie/fixsource 
fixed source coding error.
 2015-03-05 16:08:33 +08:00
pipu fadac31868 Serialize and parse attribute "inner speed" for ProjectNode. 2015-03-05 15:48:17 +08:00
pipu be1b0b7239 To modify layout attribute name that are used in serialized and parsed. 2015-03-05 14:34:35 +08:00
Jacky c38c4a1373 fixed source coding error. 2015-03-04 18:15:05 +08:00
Huabing.Xu 106c67fa4f Merge pull request #10722 from CocosRobot/update_cocosfiles_1425456816 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-03-04 16:23:26 +08:00
CocosRobot 721804a30e [AUTO][ci skip]: updating cocos2dx_files.json 2015-03-04 08:13:38 +00:00
Huabing.Xu 1b32110f8a Merge pull request #10713 from andyque/upgrade-v3-deps 
Upgrade v3 deps
 2015-03-04 16:11:49 +08:00
Huabing.Xu 714cb3db14 Merge pull request #10719 from andyque/fix-win32-jenkin-issue 
fix android and win32 compile error
 2015-03-04 14:14:40 +08:00
andyque 942ceccd99 fix android and win32 compile error 2015-03-04 14:12:11 +08:00
minggo 6805d24ba3 Merge pull request #10716 from andyque/fix-jenkinw-win32 
fix jenkins compile erorr
 2015-03-04 12:50:49 +08:00
andyque 92fb735611 fix jenkins compile erorr 2015-03-04 12:09:12 +08:00
andyque d942cc5a70 upgrade v3-deps to 34 2015-03-04 10:30:18 +08:00
andyque cf2062ac64 ignore certain folders 2015-03-04 10:29:24 +08:00
minggo 38b24b3c10 Merge pull request #10712 from MSOpenTech/v3-wp8-fix 
V3 WP8/Universal App fixes
 2015-03-04 09:45:06 +08:00
Dale Stammen e93fe1b13b Merge branch 'v3' into v3-wp8-fix 2015-03-03 08:40:07 -08:00
minggo 009c94b422 Merge pull request #10710 from CocosRobot/update_lua_bindings_1425395595 
[AUTO]: updating luabinding automatically
 2015-03-03 23:18:17 +08:00
CocosRobot 93c2b48779 [AUTO]: updating luabinding automatically 2015-03-03 15:15:43 +00:00
minggo 13e4525772 Merge pull request #10659 from super626/v3 
Remove expolosion particle
 2015-03-03 23:03:02 +08:00
Huabing.Xu ccded2cb1a Merge pull request #10706 from andyque/fix-jenkins-compile-issue 
fix v3 win32 build issue
 2015-03-03 21:14:56 +08:00
andyque 2e2fb122e6 fix v3 win32 build issue 2015-03-03 18:35:43 +08:00
minggo 885a740a76 Merge pull request #10702 from andyque/fix-jenkins-compile-issue 
refactoring Jenkins PR builder script and add backup slave name to slave build name list
 2015-03-03 17:09:00 +08:00
andyque 23e49fe2b7 modify building slaves name lists in each slave 2015-03-03 16:42:48 +08:00
andyque 7b183a13ad sync jenkins script with v4-develop 2015-03-03 16:36:42 +08:00
yangxiao 38636dc8b7 allow transition time to 0 2015-03-03 11:04:34 +08:00
yangxiao 874f7c7f99 fix transparent render bug 2015-03-03 10:42:47 +08:00
Dale Stammen 44b951a51a Merge branch 'v3' into v3-wp8-fix 2015-03-02 16:42:05 -08:00
Huabing.Xu e836e98dc4 Merge pull request #10694 from andyque/fix-windows-jenkins-compile-issue 
fix new windows jenkins slave compile error
 2015-03-02 21:00:14 +08:00
andyque 992cc52a02 fix new windows jenkins slave compile error 2015-03-02 19:43:27 +08:00
yangxiao 56f3f34ee3 add Animate3D::setTransitionTime 2015-02-28 17:40:25 +08:00
yangxiao 924a3cdff0 create particle with pu and material 2015-02-28 14:26:33 +08:00
yangxiao d5bde9e536 add missing material 2015-02-28 12:57:15 +08:00
yangxiao 218de84cc5 remove expolosion particle 2015-02-28 11:31:15 +08:00
minggo 4c2dd74502 Merge pull request #10654 from CocosRobot/update_lua_bindings_1425093659 
[AUTO]: updating luabinding automatically
 2015-02-28 11:24:04 +08:00
CocosRobot 84fb4094fc [AUTO]: updating luabinding automatically 2015-02-28 03:23:08 +00:00
minggo 16803fb919 [ci skip]update AUTHORS 2015-02-28 11:20:19 +08:00
minggo d092d829be [ci skip]update CHANGELOG 2015-02-28 11:19:07 +08:00
minggo 0755400a79 Merge pull request #10279 from seobyeongky/motionstreak_bug_fix 
MotionStreak MoveTo/MoveBy action OK
 2015-02-28 11:17:28 +08:00
minggo 1608e26a43 Merge pull request #10642 from CocosRobot/update_cocosfiles_1425031927 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-02-28 09:36:32 +08:00
Dale Stammen fd11984e0a disable LTCG 2015-02-27 11:21:36 -08:00