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

27520 Commits

Author SHA1 Message Date
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
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
Dale Stammen e4db9f396e disable LTCG. set warning level to W3 2015-02-27 11:16:40 -08:00
Dale Stammen fb25ce9d1b disabled LTCG to speed up release builds 2015-02-27 11:10:33 -08:00
Dale Stammen f68a966485 disabled Check SDL to allow CC_DEPRECATED to work as warning and not error 2015-02-27 11:07:51 -08:00
Dale Stammen e04fd6eb1d updated cocos2d dll name from 3.4 to 3.5 2015-02-27 10:54:27 -08:00
Dale Stammen d486cc78fb updated cocos2d dll name from 3.4 to 3.5 2015-02-27 10:52:32 -08:00
Dale Stammen 8bc5b37b40 removed missing include files from project 2015-02-27 10:48:53 -08:00
Dale Stammen b5e936c657 disabled LTCG to speed up release builds 2015-02-27 10:43:13 -08:00
Dale Stammen 5e6865ce53 added missing CC_PLATFORM_WINRT 2015-02-27 10:38:18 -08:00
Dale Stammen 2eb919bb7a disabled Check SDL to allow CC_DEPRECATED to work as warning and not error 2015-02-27 10:36:48 -08:00
Dale Stammen e9ef92291f renamed cocos2d dll from 3.4 to 3.5 2015-02-27 10:26:58 -08:00
Dale Stammen 49b16718a2 removed missing .h files from solution 2015-02-27 10:24:02 -08:00
minggo 0365b5dd4c Merge pull request #10645 from yinjimmy/orig-v3 
update runtime to 2.0
 2015-02-27 18:31:07 +08:00
CocosRobot a5a1bd3994 [AUTO][ci skip]: updating cocos2dx_files.json 2015-02-27 10:12:08 +00:00
Huabing.Xu 6f7455c440 Merge pull request #10641 from Dhilan007/v3-physics-fix 
Fixed the position of physics body is wrong when the position of parent node has been change.
 2015-02-27 18:09:31 +08:00
Wenhai Lin 5af895b24d Fixed the position of physics body is wrong when the position of parent node has been change. 2015-02-27 17:55:25 +08:00
minggo 503c46a9e8 Merge pull request #10286 from flamefox/v3_fix_dos2unix 
fix dos2unix not in run path, on new lua project
 2015-02-27 16:35:02 +08:00
yinjimmy 2042633294 update runtime to 2.0 2015-02-27 14:49:04 +08:00
minggo 7805adce94 Merge pull request #10325 from seobyeongky/httpclient_bugfix 
HttpResponse reference counting bug fixed
 2015-02-27 14:32:41 +08:00
minggo 2735e0ce4c Merge pull request #10627 from CocosRobot/update_lua_bindings_1425009120 
[AUTO]: updating luabinding automatically
 2015-02-27 11:56:04 +08:00
minggo 1a54c302c9 Merge pull request #10626 from super626/v3 
add changelog
 2015-02-27 11:55:35 +08:00