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

30962 Commits

Author SHA1 Message Date
Vincent Yang 8bc68395de Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into issue_9586 2015-07-13 11:00:18 +08:00
子龙山人 e3a9042236 Merge pull request #12785 from WenhaiLin/v3-update-nibirusdk 
Update Nibiru SDK.
 2015-07-13 10:34:18 +08:00
pandamicro 0d2200f3e3 Merge pull request #12791 from cocos2d/revert-12773-bind-missing-function 
Revert "add lua-binding of EventDispacher::dispatchCustomEvent()"
 2015-07-12 12:20:11 +08:00
pandamicro 15bb633adb Revert "add lua-binding of EventDispacher::dispatchCustomEvent()" 2015-07-12 20:19:52 +08:00
pandamicro 0d9da2f500 Merge pull request #12773 from minggo/bind-missing-function 
add lua-binding of EventDispacher::dispatchCustomEvent()
 2015-07-11 17:17:32 +08:00
pandamicro 2e3d7cb1f5 Merge pull request #12779 from CocosRobot/update_lua_bindings_1436512627 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-07-11 17:14:13 +08:00
WenhaiLin 5c9e8848bf [ci skip]Add missing configuration for Nibiru. 2015-07-10 21:16:21 +08:00
WenhaiLin 205e77a4fb Add missing configuration for Nibiru. 2015-07-10 21:09:15 +08:00
WenhaiLin 142d354485 [ci skip]Replace tab with spaces. 2015-07-10 21:03:43 +08:00
WenhaiLin 7f3e0b2a8c [ci skip]Replace tab with spaces. 2015-07-10 20:56:21 +08:00
WenhaiLin b459940bb8 [ci skip]Replace tab with spaces. 2015-07-10 20:47:21 +08:00
WenhaiLin c68469a611 Update Nibiru SDK. 2015-07-10 20:42:05 +08:00
子龙山人 bb4a3d4c1e Merge pull request #12783 from CocosRobot/update_lua_bindings_1436519205 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-07-10 17:14:20 +08:00
CocosRobot 0e8a3f14f0 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-10 09:11:50 +00:00
子龙山人 3adecedcee Merge pull request #12776 from fusijie/refine_capture 
CaptureScreen save in thread.
 2015-07-10 17:03:18 +08:00
Vincent Yang 34aa7a0bb1 Remove unused variable. 2015-07-10 16:40:02 +08:00
Vincent Yang 1711a70869 Merge v3 branch. 2015-07-10 16:39:36 +08:00
Vincent Yang 187c72e2b9 [ci skip] replace tab with 4 space. 2015-07-10 16:17:34 +08:00
CocosRobot 2542b7c033 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-10 07:21:50 +00:00
pandamicro 2d27091398 Merge pull request #12717 from jianglong0156/FileUtilsWriteFunctionMerge 
add write api in FileUtils
 2015-07-10 15:13:21 +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
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
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
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