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

31357 Commits

Author SHA1 Message Date
pandamicro 2d27091398 Merge pull request #12717 from jianglong0156/FileUtilsWriteFunctionMerge 
add write api in FileUtils
 2015-07-10 15:13:21 +08:00
WenhaiLin eca192f7a6 Fixed compile error 2015-07-10 14:43:28 +08:00
Vincent Yang 3d9aa402ac Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into issue_9586 2015-07-10 14:40:28 +08:00
WenhaiLin 81bc0b09da Label:Fixed create fail if the font(TTF) not contain a Unicode charmap. 2015-07-10 14:39:21 +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 07fd337052 Merge pull request #12763 from folgerhu/v3.7-release 
CCTMXXMLParser code negligence
 2015-07-10 11:49:30 +08:00
yangxiao c4587ecda1 if has normal use the shader with normal 2015-07-10 11:44:20 +08:00
Jacky 9eb5a1833b fix malloc failed need to call afterCaptured callback. 2015-07-10 11:21:03 +08:00
minggo 3911e1d696 add lua-binding of EventDispacher::dispatchCustomEvent() 2015-07-10 10:29:21 +08:00
子龙山人 0468cf7ba9 Merge pull request #12772 from zilongshanren/v3.7-release 
[ci skip]fix js template run error on linux.
 2015-07-10 10:20:31 +08:00
andyque 1ea7926083 fix js template run error on linux. 2015-07-10 10:19:36 +08:00
pandamicro 69cdaca306 Auto add extend to jsb need to extend classes 2015-07-10 09:49:39 +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
yangxiao 10fe728eee animation quality default to low, do not interpolation 2015-07-09 17:54:21 +08:00
Vincent Yang d9bc8b7c1b fix bug: don't decrease _asyncRefCount correct in addImageAsyncCallback. 2015-07-09 17:06:55 +08:00
folgerhu@sina.com a79586c052 CCTMXXMLParser code negligence 2015-07-09 17:02:12 +08:00
Vincent Yang 02226c6a26 Fix bug: Clipping node doesn't work on Android 5.0. 2015-07-09 16:49:26 +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 a2da5d5f9d Merge pull request #12738 from super626/v3.7-release 
Update tiny obj loader and fix empty textrue
 2015-07-09 14:57:10 +08:00
pandamicro cab670f0ff Merge pull request #12748 from fusijie/refineSetTexture 
refine setTexture.
 2015-07-09 14:56:06 +08:00
pandamicro 17ef09551b Merge pull request #12756 from VisualSJ/v3.7-release-update 
[ci skip]Fixed a bug that is SingleNode setColor is null
 2015-07-09 14:55:32 +08:00
WenhaiLin 86a68f5a09 AudioEngine:refine thread pool 2015-07-09 14:31:03 +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
VisualSj 9f52b1e6fb Fixed a bug that is SingleNode setColor is null 2015-07-09 11:49:11 +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
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
子龙山人 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