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

35088 Commits

Author SHA1 Message Date
WenhaiLin 41bc3a1900 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3.8 
Conflicts:
	AUTHORS
 2015-07-09 11:11:34 +08:00
子龙山人 2013515978 Merge pull request #12751 from zilongshanren/update-authors-v3 
[ci skip]update Author
 2015-07-09 10:36:20 +08:00
andyque cbfbda6e71 update Author 2015-07-09 10:35:50 +08:00
pandamicro 893d39c543 Merge pull request #12737 from chengstory/FixReaderBug 
Fix cocos reader bug.
 2015-07-09 10:33:45 +08:00
子龙山人 d6220ae513 Merge pull request #12750 from zilongshanren/improve-template-dialy-build 
[ci skip]fix daily build win32 and winrt build error
 2015-07-09 10:28:01 +08:00
andyque c83a398381 fix win32 and winrt build error 2015-07-09 10:27:13 +08:00
Liam c6ebaa19ec add scene 3d test 2015-07-09 10:19:07 +08:00
子龙山人 60c10e3878 Merge pull request #12749 from zilongshanren/improve-template-dialy-build 
[ci skip]fix scripts path error
 2015-07-09 10:18:13 +08:00
andyque 4bdbca829b fix scripts path error 2015-07-09 10:15:27 +08:00
子龙山人 45844cb54a Merge pull request #12747 from zilongshanren/improve-template-dialy-build 
[ci skip]unassigned shouldn't trigger jenkins rebuild
 2015-07-09 10:13:03 +08:00
andyque 8b1f0fe3f3 update AUTHORS 2015-07-09 10:12:16 +08:00
Jacky 1dbb2ab17a refine setTexture. 2015-07-09 10:11:15 +08:00
andyque 7098261523 unassigned shouldn't trigger jenkins rebuild 2015-07-09 10:10:37 +08:00
子龙山人 21394ecbf1 Merge pull request #12746 from zilongshanren/improve-template-dialy-build 
[ci skip]refactor  all daily build into one
 2015-07-09 10:05:16 +08:00
andyque 3f07b0c67a refactor daily build into one 2015-07-09 09:53:20 +08:00
pandamicro 0c2bb9f691 Merge pull request #12745 from CocosRobot/update_lua_bindings_1436403718 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-07-09 09:27:12 +08:00
CocosRobot bfe6db174e [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-09 01:07:59 +00:00
pandamicro 7f4675b43f Merge pull request #12739 from pandamicro/v3.7-release 
Add auto bindings for Frame::g|setTweenType
 2015-07-09 08:58:07 +08:00
Jacky 02597eb369 Completed test case and comment. 2015-07-08 22:34:33 +08:00
Jacky 34d1cc0b1d refactory Effects test case. 2015-07-08 21:56:14 +08:00
WenhaiLin 6127aa5df2 [ci skip]Update AUTHORS. 2015-07-08 18:07:24 +08:00
子龙山人 8273b3823a Merge pull request #12741 from andyque/improve-template-dialy-build 
[ci skip]fix runtime ios build error
 2015-07-08 18:06:08 +08:00
andyque 2df9ce8909 fix runtime ios build error 2015-07-08 18:05:12 +08:00
Wenhai Lin 5d50663c35 AudioEngine:support preload for audio[MAC/iOS] 2015-07-08 18:04:43 +08:00
WenhaiLin 6a33702c80 Refine Label::onDraw 2015-07-08 17:59:24 +08:00
Jacky a59828605b Support TileGrid rectangle. 2015-07-08 17:47:04 +08:00
Jacky 4a9e9f3744 completed api. 2015-07-08 17:26:29 +08:00
andyque d4066a5ff8 improve coding style of Socket.IO 2015-07-08 17:23:48 +08:00
pandamicro 30c79fea02 Add auto bindings for Frame::g|setTweenType 2015-07-08 17:19:30 +08:00
yangxiao 97a17cdc8a program created dummy texture instead of empty texture 2015-07-08 17:00:01 +08:00
zhangcheng 0862d313b2 Fix cocos reader bug. 
Fixes child nodes can't be rendered when particle and TiledMap as parent and their resource have been removed from disk.
 2015-07-08 16:13:38 +08:00
子龙山人 155ac8c07e Merge pull request #11583 from hannon235/v3-update-sio 
Updates socket.io network extension to correctly detect and manage connection to socket.io server versions 0.9.x - 1.x
 2015-07-08 16:11:05 +08:00
Daniele Di Bernardo 7a36a57aff Fixed inertial scrolling for `CCScrollView` 
The inertial scrolling in `CCScrollView` usually works only if you're using the `Direction::BOTH` direction, and if there's enough scrolling space *both* on the X and the Y axis. But when you use the `Direction::HORIZONTAL` or `Direction::VERTICAL` directions you usually have 0px of available space on the Y or X axis respectively, so it won't work.
This change enables you to scroll the view just on the X or on the Y axis using `Direction::HORIZONTAL` or `Direction::VERTICAL` and to use the inertial scroll accordingly.
 2015-07-08 10:03:03 +02:00
Jacky 260ce177d7 refine GridNode with rect. 2015-07-08 15:57:27 +08:00
yangxiao f7cdd7162b adapter according to latest objloader 2015-07-08 15:33:43 +08:00
WenhaiLin 8cf27b9174 Update comments. 2015-07-08 15:30:34 +08:00
jianglong0156 d55c0c64c5 add std::nothrow 2015-07-08 15:19:17 +08:00
Vincent Yang 7f9028b20c Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into issue_11887 2015-07-08 15:14:08 +08:00
Vincent Yang 1f8b46e911 Fixbug: Need to replace thread unsafe code from TextureCache::addImageAsync. 2015-07-08 15:13:48 +08:00
子龙山人 3f550ef331 Merge pull request #12663 from xiaofeng11/v3.7-release 
Fix drawLine & drawPoints won't use blendFunc bug
 2015-07-08 14:38:10 +08:00
jianglong0156 7e26c381c6 remove invalid code 2015-07-08 14:36:37 +08:00
子龙山人 5e8609e5d7 Merge pull request #12728 from fusijie/fix_polygonsprite 
fix polygon sprite bug.
 2015-07-08 14:13:32 +08:00
子龙山人 2bcd70f681 Merge pull request #12726 from xpol/fixes-warnings-and-related-bug-in-CCSprite 
Fixes some warnings and a related bug in CCSprite.
 2015-07-08 14:12:40 +08:00
yangxiao dac84ade0d index to short 2015-07-08 14:03:53 +08:00
子龙山人 5621ce08ba Merge pull request #12730 from CocosRobot/update_lua_bindings_1436334238 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-07-08 13:55:46 +08:00
CocosRobot 9638ae628a [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-08 05:48:55 +00:00
yangxiao 40b33604d8 adjust objloader to cocos 2015-07-08 13:44:15 +08:00
yangxiao fdd78ef73f update objloader to latest 2015-07-08 13:42:14 +08:00
子龙山人 0475f50f45 Merge pull request #12723 from neokim/add_setter_for_line_width 
Add a setter for line width in DrawNode
 2015-07-08 13:40:22 +08:00
WenhaiLin b395ef06d8 AudioEngine:support preload for audio[WIN32/WINRT 8.1/WP8.1] 2015-07-08 10:48:20 +08:00