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

30935 Commits

Author SHA1 Message Date
Vincent Yang 3d9aa402ac Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into issue_9586 2015-07-10 14:40:28 +08:00
Vincent Yang 52293ad451 Fixed #9586 : FileUtils::isDirectoryExist not correct on Android when using relative path in 'assets'. 2015-07-10 14:37:42 +08:00
pandamicro bd5ae151d9 Merge pull request #12735 from yangws/issue_11887 
Fix bug: Need to replace thread unsafe code from TextureCache::addImageAsync
 2015-07-10 09:47:01 +08:00
Vincent Yang 8ff0ac6951 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into issue_9586 2015-07-10 09:35:41 +08:00
Vincent Yang d9bc8b7c1b fix bug: don't decrease _asyncRefCount correct in addImageAsyncCallback. 2015-07-09 17:06:55 +08:00
子龙山人 268605270e Merge pull request #12760 from CocosRobot/update_lua_bindings_1436427684 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-07-09 15:49:44 +08:00
CocosRobot 2065e5b4a7 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-09 07:45:43 +00:00
子龙山人 8e256dcd09 Merge pull request #12718 from WenhaiLin/v3-label-addchild 
Label:Support add child nodes.
 2015-07-09 15:37:49 +08:00
pandamicro cab670f0ff Merge pull request #12748 from fusijie/refineSetTexture 
refine setTexture.
 2015-07-09 14:56:06 +08:00
子龙山人 0c9ae99365 Merge pull request #12740 from zilongshanren/format-socket-io 
improve coding style of Socket.IO
 2015-07-09 14:21:01 +08:00
子龙山人 4cbaf730d1 Merge pull request #12759 from zilongshanren/fix-pr-build-scripts 
[ci skip]fix template daily build
 2015-07-09 14:19:16 +08:00
andyque 9857a4acc4 fix template daily build 2015-07-09 14:17:49 +08:00
子龙山人 379236479d Merge pull request #12758 from zilongshanren/fix-pr-build-scripts 
fix template daily build
 2015-07-09 13:52:02 +08:00
andyque 6cf38586c2 fix template daily build 2015-07-09 13:50:58 +08:00
子龙山人 86ce915d80 Merge pull request #12755 from zilongshanren/fix-pr-build-scripts 
fix pr build scripts
 2015-07-09 12:07:12 +08:00
andyque 32171c491a fix slave scripts path 2015-07-09 11:34:37 +08:00
andyque 0d0787b212 fix pr build scripts 2015-07-09 11:26:55 +08:00
andyque 7243f2cff5 add const & to string arguments 2015-07-09 11:23:20 +08:00
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
子龙山人 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
子龙山人 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
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
WenhaiLin 6a33702c80 Refine Label::onDraw 2015-07-08 17:59:24 +08:00
andyque d4066a5ff8 improve coding style of Socket.IO 2015-07-08 17:23:48 +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
WenhaiLin 8cf27b9174 Update comments. 2015-07-08 15:30:34 +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
子龙山人 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
子龙山人 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
子龙山人 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
子龙山人 e162edd867 Merge pull request #12727 from andyque/improve-template-dialy-build 
[ci skip]fix ios/mac/win32/win8.1 compile error
 2015-07-08 07:37:41 +08:00
andyque dda07bebf5 fix ios/mac/win32/win8.1 compile error 2015-07-08 07:36:26 +08:00
xpol 8179fe04f0 And more warnings. 2015-07-07 23:10:04 +08:00
xpol 29dcbe6685 Fixes some warnings and a related bug in CCSprite. 
This story tells us that we should not just ignore warnings.
 2015-07-07 23:01:24 +08:00
子龙山人 d02da9d2f2 Merge pull request #12725 from andyque/improve-template-dialy-build 
[ci skip]change sign team to none.
 2015-07-07 22:03:22 +08:00
andyque 451bedbaad change sign team to none. 2015-07-07 22:02:35 +08:00