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

7198 Commits

Author SHA1 Message Date
dualface 8d99d8a78e fix typo 2014-12-29 05:47:37 +08:00
dualface 9684d6e164 update corelib 2014-12-29 05:41:13 +08:00
dualface 74daae1c39 update framework 2014-12-29 01:58:16 +08:00
dualface cc3021467f add more usable functions 2014-12-27 15:31:31 +08:00
dualface 46a0ad11ac update lua corelib 2014-12-27 11:59:14 +08:00
minggo f01cc596a3 Merge pull request #9637 from geron-cn/v3_actionline_animationlist 
V3 actiontimeline animationlist
 2014-12-26 16:05:49 +08:00
minggo 275de89746 Merge pull request #9650 from pipu/update_checkboxreader 
Update that parse plist for CheckBoxReader.
 2014-12-26 15:43:30 +08:00
minggo 84a88f4f76 Merge pull request #9649 from minggo/fileutil-extend 
make FileUtils extendable
 2014-12-26 15:37:51 +08:00
minggo 42e6232113 fix typo and memory leak 2014-12-26 14:25:55 +08:00
pipu bc18bafaa7 Update that parse plist for CheckBoxReader. 2014-12-26 14:18:28 +08:00
minggo 94d70358b7 make FileUtils extendable 2014-12-26 11:34:31 +08:00
CocosRobot a30d606fe6 [AUTO]: updating luabinding automatically 2014-12-26 02:40:22 +00:00
minggo 9e8582e01a Merge pull request #9643 from CocosRobot/update_lua_bindings_1419557440 
[AUTO]: updating luabinding automatically
 2014-12-26 10:35:53 +08:00
minggo 564b9f0aef Merge pull request #9635 from super626/sync_load 
ReleaseNote for Sprite3D::createAsync
 2014-12-26 09:37:19 +08:00
CocosRobot ff37578611 [AUTO]: updating luabinding automatically 2014-12-26 01:32:36 +00:00
minggo 1c87c53ff8 Merge pull request #9636 from musikov/v3-language 
added Turkish and Ukrainian language;
 2014-12-26 09:31:57 +08:00
minggo 491d36c62b Merge pull request #9626 from liamcindy/CocoReader 
update for cocos reader
 2014-12-26 09:29:37 +08:00
minggo 3581c00301 Merge pull request #9619 from yinjimmy/trackLogForWindows 
Track log for windows
 2014-12-26 09:28:23 +08:00
minggo 3b01762db4 Merge pull request #9638 from yinjimmy/writablepath 
set default resource root path & writable path
 2014-12-26 09:27:59 +08:00
yinjimmy 744a9043f9 set default resource root path & writable path 2014-12-25 20:33:47 +08:00
yinjimmy b21eaab047 using suitable variable name 2014-12-25 19:39:44 +08:00
andyque 19dc8b5d19 fix conflicts and wp8, wp8.1 linker error 2014-12-25 18:11:59 +08:00
Mykyta Usikov d9b5ab4a4c added Turkish and Ukrainian language; 
replaced 'tabs' with 'spaces' in Application::getCurrentLanguage();
 2014-12-25 12:08:23 +02:00
andyque 29e9ef7edf Merge branch 'v3' into modifyWidgetDefaultBehavior 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
	cocos/2d/libcocos2d_wp8.vcxproj.filters
 2014-12-25 18:08:07 +08:00
geron-cn 70eef1f660 fix play 2014-12-25 17:45:14 +08:00
yangxiao 64ff6bb51c modify msg word 2014-12-25 17:42:58 +08:00
yangxiao d9d5e1a5cb add release note 2014-12-25 17:40:26 +08:00
geron-cn 490b33405d Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3_actionline_animationlist 2014-12-25 17:37:05 +08:00
geron-cn 79e5341742 remove animation list binary parse 2014-12-25 17:22:49 +08:00
minggo 6ec03010a7 Merge pull request #9630 from andyque/fixCICompile 
fix ci compile error
 2014-12-25 16:03:50 +08:00
andyque 60893607cc fix ci compile error 2014-12-25 15:38:51 +08:00
Liam fa85faec68 update for cocos reader 2014-12-25 15:02:22 +08:00
CocosRobot 6b15f4edcb [AUTO]: updating luabinding automatically 2014-12-25 06:14:03 +00:00
Liam 807e63eae3 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into CocoReader 2014-12-25 14:13:02 +08:00
Liam bd37d806ff update for cocos reader 2014-12-25 14:11:05 +08:00
minggo 2ec85f8c4e Merge pull request #8922 from TimothyZhang/do-not-lock-when-no-message-in-websocket 
avoid locking when message queue is empty in websocket
 2014-12-25 14:09:35 +08:00
minggo 9643b87ed0 Merge pull request #9173 from 2youyouo2/v3 
improve ActionTimeline api
 2014-12-25 14:06:02 +08:00
minggo 0c66e638f7 Merge pull request #8183 from xseekerj/patch-3 
CCPlatformMacros.h
 2014-12-25 14:02:52 +08:00
minggo 2ca143959b Merge pull request #9620 from yinjimmy/LuaStackExecuteScriptFile 
execute script with full file path
 2014-12-25 13:45:46 +08:00
youyou f678d1027c Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp
 2014-12-25 12:09:31 +08:00
yinjimmy b4a442cd8c fix compile error on windows 2014-12-25 09:33:28 +08:00
CocosRobot 381be0f6f0 [AUTO]: updating luabinding automatically 2014-12-24 09:41:09 +00:00
minggo 03d53ba7c4 Merge pull request #9585 from doomsdayer/v3_armature_reader 
V3 armature reader
 2014-12-24 17:36:09 +08:00
minggo 705bf500f7 Merge pull request #9604 from CocosRobot/update_lua_bindings_1419403220 
[AUTO]: updating luabinding automatically
 2014-12-24 17:06:05 +08:00
yusheng.lu 7c34b06969 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_armature_reader 2014-12-24 16:02:37 +08:00
youyou db6ffd7962 Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x; branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-12-24 15:59:50 +08:00
minggo 0b7572f3ee [ci skip] 2014-12-24 15:35:58 +08:00
yusheng.lu c64792959c Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_armature_reader 2014-12-24 15:32:02 +08:00
minggo 42f1d5fdf3 Merge pull request #9601 from minggo/set-glcolor 
Director supports setting clear color
 2014-12-24 14:45:43 +08:00
CocosRobot a5d3e8361b [AUTO]: updating luabinding automatically 2014-12-24 06:42:09 +00:00