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

31241 Commits

Author SHA1 Message Date
pandamicro 48376db17a Merge pull request #12832 from pandamicro/jsb_loader_fix 
Fix jsb loader
 2015-07-14 15:25:24 +08:00
Jacky ea773cac20 Fixed setAnimationInterval JNI bug. 2015-07-14 15:11:35 +08:00
pandamicro 09775d6f2a Ensure backward compatibility 2015-07-14 14:14:36 +08:00
WenhaiLin b701fd9e73 Fixed compile error 2015-07-14 13:47:35 +08:00
子龙山人 e6ccad3fe4 Merge pull request #12831 from CocosRobot/update_lua_bindings_1436852228 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-07-14 13:44:49 +08:00
WenhaiLin 964713355b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-label-createfail 2015-07-14 13:43:43 +08:00
CocosRobot 6b9a5b8264 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-14 05:41:48 +00:00
pandamicro 43a5b6f020 Fix jsb loaders issues 2015-07-14 13:40:09 +08:00
子龙山人 616efbf0c3 Merge pull request #12812 from neokim/refactor_scroll_view_bar 
Refactor scroll view bar
 2015-07-14 13:34:07 +08:00
子龙山人 e1ae3631fc Merge pull request #12818 from zilongshanren/v3 
merge v3.7 back to v3
 2015-07-14 13:32:56 +08:00
pandamicro 69a70010cf Merge pull request #12827 from yangws/issue_12668 
Fixed #12668 : Lua-bindings-manual-network--LuaMinXmlHttpRequest have…
 2015-07-14 12:05:29 +08:00
WenhaiLin d4f62a8063 Label:improving the code readability. 2015-07-14 11:30:56 +08:00
andyque ef5d4ddf86 Merge remote-tracking branch 'upstream/v3' into v3 
# Conflicts:
#	tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/cpp-tests.Shared.vcxitems.filters
 2015-07-14 11:24:38 +08:00
pandamicro 62ee9d32a6 Merge pull request #12825 from yangws/issue_12621 
Merge pr11866: FileUtilsWin32 correct use all unicode version winapi.
 2015-07-14 11:03:13 +08:00
Neo Kim 7882a534c1 Correct the wrong boolean statement and make it easy to read 2015-07-14 11:58:44 +09:00
Vincent Yang 0a6933cc8c Fixed #12668 : Lua-bindings-manual-network--LuaMinXmlHttpRequest have a memory leak. 2015-07-14 10:46:17 +08:00
andyque ac1bf36208 update submodule 2015-07-14 10:10:20 +08:00
pandamicro 365c51cfab Merge pull request #12824 from darkdukey/v3.7-release 
update release notes for sdkbox
 2015-07-14 09:46:06 +08:00
Vincent Yang 0589c14302 Restructure CCFileUtils class, move platform related functions to CCFileUtilsXXX. 
Add TestIsDirectoryExist and TestUnicodePath in cpp-tests FileUtil test.
 2015-07-14 09:44:36 +08:00
pandamicro 5dc0cab4a5 Merge pull request #12823 from natural-law/v3.7-release 
[ci skip] Update the reference of submodule cocos2d-console.
 2015-07-14 09:42:50 +08:00
Nite Luo 55037345a4 update release notes for sdkbox 2015-07-13 18:42:35 -07:00
Bin Zhang 569695d844 Update the reference of submodule cocos2d-console. 2015-07-14 09:40:42 +08:00
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
Neo Kim 863c3a0a2a Correct a typo 2015-07-14 10:17:05 +09:00
Nite Luo 5631fa33e0 update release notes for sdkbox 2015-07-13 17:44:44 -07:00
andyque fc673ee502 Merge branch 'v3.7-release' into v3 2015-07-13 22:44:54 +08:00
Vincent Yang 74227eaf16 Add TestIsDirectoryExist and TestUnicodePath in cpp-tests FileUtil test. 2015-07-13 22:44:40 +08: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
Neo Kim 9757ee4ea8 Refine scroll event dispatching. And add an event to track every move including jump and so on. 2015-07-13 21:28:17 +09:00
Neo Kim 22ea504af8 Add methods to manipulate scroll bar's opacity 2015-07-13 21:28:16 +09:00
Neo Kim f558158667 Use addProtectedChild() instead of addChild() in ScrollViewBar 2015-07-13 21:28:16 +09: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
Vincent Yang e65b01bdc0 Merge pr11866: FileUtilsWin32 correct use all unicode version winapi. 2015-07-13 17:06:01 +08:00
pandamicro 36e1f26570 Fix CCSprite ; missing 2015-07-13 16:44:33 +08:00