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

31001 Commits

Author SHA1 Message Date
Vincent Yang 06bf6ffa90 Merge pr11866: FileUtilsWin32 correct use all unicode version winapi. 2015-07-14 09:35:01 +08:00
pandamicro cfd9e9cbdf Merge pull request #12817 from CocosRobot/update_lua_bindings_1436798257 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-07-14 09:28:47 +08:00
pandamicro 8035e1e47d Merge pull request #12821 from darkdukey/release_notes_sdkbox 
update 3.7 release notes for sdkbox
 2015-07-14 09:25:04 +08:00
Nite Luo 5631fa33e0 update release notes for sdkbox 2015-07-13 17:44:44 -07:00
CocosRobot 9e60713322 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-13 14:41:58 +00:00
子龙山人 3d06ca297f Merge pull request #10255 from WenhaiLin/v3-activitylife-fix 
Fixed game awaked by the clock on Android
 2015-07-13 22:34:22 +08:00
子龙山人 cdc7e5205b Merge pull request #11995 from MAUSMAUSgames/v3 
using Action::_tag as flag field
 2015-07-13 22:19:03 +08:00
子龙山人 22b4f5a11e Merge pull request #12238 from lite3/patch-3 
remove old path When added existing new searchPath
 2015-07-13 22:16:50 +08:00
子龙山人 d1bef4db8d Merge pull request #12369 from Dimon4eg/Fix_crash_cocos2d_log 
Fix crash on Windows if pass string more than 16kb to cocos2d::log
 2015-07-13 22:16:04 +08:00
子龙山人 2c40c762e4 Merge pull request #12736 from marzapower/patch-1 
Fixed inertial scrolling for `CCScrollView`
 2015-07-13 22:14:58 +08:00
子龙山人 c151ba89e5 Merge pull request #12774 from WenhaiLin/v3-label-createfail 
Label:Fixed create fail if the font(TTF) not contain a Unicode charmap.
 2015-07-13 21:58:39 +08:00
pandamicro b03c0698cc Merge pull request #12813 from CocosRobot/update_lua_bindings_1436791902 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-07-13 21:06:17 +08:00
CocosRobot 300da3e3fc [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-13 12:57:03 +00:00
pandamicro 8944e932a1 Merge pull request #12786 from WenhaiLin/v3-animation-getCurrentFrame 
Add Animate:getCurrentFrameIndex
 2015-07-13 20:48:01 +08:00
pandamicro 765561ebc2 Merge pull request #12807 from CocosRobot/update_lua_bindings_1436778626 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-07-13 17:58:23 +08:00
子龙山人 fc41463e6e Merge pull request #12809 from CocosRobot/update_lua_bindings_1436779844 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-07-13 17:50:25 +08:00
CocosRobot 8b50c307e5 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-13 09:35:35 +00:00
pandamicro d559971379 Merge pull request #12808 from pandamicro/v3 
Fix CCSprite ; missing
 2015-07-13 17:27:27 +08:00
CocosRobot 697f21d3d1 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-13 09:15:10 +00:00
子龙山人 db71e073dd Merge pull request #12742 from WenhaiLin/v3-audioengine-preload 
AudioEngine:support preload for audio
 2015-07-13 17:06:17 +08:00
pandamicro 36e1f26570 Fix CCSprite ; missing 2015-07-13 16:44:33 +08:00
WenhaiLin adfa6d4f0d Add test case for issue 12775 2015-07-13 15:38:33 +08:00
WenhaiLin 2ddc1ccf3e [ci skip]Update web index 2015-07-13 13:45:05 +08:00
WenhaiLin c95283f563 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-animation-getCurrentFrame 2015-07-13 12:54:02 +08:00
pandamicro 8ab1dce2a0 Merge pull request #12778 from yangws/issue_9586 
Fix bug: FileUtils::isDirectoryExist not correct on Android when using relative path in 'assets'
 2015-07-13 11:03:24 +08:00
WenhaiLin dee13756ec Add Animate:getCurrentFrameIndex 2015-07-13 10:40:43 +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
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
Jacky 9eb5a1833b fix malloc failed need to call afterCaptured callback. 2015-07-10 11:21:03 +08:00