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

26639 Commits

Author SHA1 Message Date
yangxiao b0a6720cb2 reset auto lua, fix #9515 2014-12-26 15:52:27 +08:00
yangxiao 25ce54b43b reset 2014-12-26 15:46:45 +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
sifenzhu cd2dc03d87 Merge pull request #2 from super626/v3 
get
 2014-12-26 14:47:40 +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
XiaoYang 1a5b2690db Merge pull request #194 from lvlonggame/frustum 
merge cocos2d-x
 2014-12-26 13:13:53 +07:00
minggo 9212520363 Merge pull request #9648 from CocosRobot/update_lua_bindings_1419561514 
[AUTO]: updating luabinding automatically
 2014-12-26 13:57:24 +08:00
lvlong f592671df6 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into frustum 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
	cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp
 2014-12-26 13:42:13 +08:00
lvlong fdb498a8d2 camera test 2014-12-26 13:37:02 +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
minggo 696e2ffad8 [ci skip] Update CHANGELOG 2014-12-26 09:33:41 +08:00
minggo fd1cca2a02 [ci skip]Update Authors 2014-12-26 09:32:59 +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 72de6367c4 Merge pull request #9641 from CocosRobot/update_cocosfiles_1419557353 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-12-26 09:30:02 +08:00
minggo 491d36c62b Merge pull request #9626 from liamcindy/CocoReader 
update for cocos reader
 2014-12-26 09:29:37 +08:00
CocosRobot a8fedda82c [AUTO][ci skip]: updating cocos2dx_files.json 2014-12-26 01:29:15 +00:00
minggo 4291202a7c Merge pull request #9632 from CocosRobot/update_cocosfiles_1419494730 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-12-26 09:28:45 +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
minggo dde5648d7e Merge pull request #9594 from andyque/modifyWidgetDefaultBehavior 
modify widget default behavior
 2014-12-26 09:27:45 +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
yangxiao 5f124eaa4b correct spelling 2014-12-25 17:46:05 +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
andyque 4398710207 modify changelog 2014-12-25 16:21:31 +08:00
andyque 3f0f7c289f change setColor to setTextColor 2014-12-25 16:07:34 +08:00
CocosRobot 612284f3f2 [AUTO][ci skip]: updating cocos2dx_files.json 2014-12-25 08:05:31 +00:00
minggo 6ec03010a7 Merge pull request #9630 from andyque/fixCICompile 
fix ci compile error
 2014-12-25 16:03:50 +08:00
minggo 803af3e009 Merge pull request #9625 from CocosRobot/update_lua_bindings_1419487927 
[AUTO]: updating luabinding automatically
 2014-12-25 15:55:23 +08:00
andyque 60893607cc fix ci compile error 2014-12-25 15:38:51 +08:00
XiaoYang 8ffe37d6dc Merge pull request #192 from lvlonggame/frustum 
Frustum
 2014-12-25 14:28:50 +07:00
lvlong 75d2deb2c8 revert 2014-12-25 15:25:19 +08:00
lvlong 3f91957e79 revert 2014-12-25 15:21:53 +08:00
Liam fa85faec68 update for cocos reader 2014-12-25 15:02:22 +08:00
yangxiao de7b70f63e skip Node::set/getRotationQuat 2014-12-25 14:55:43 +08:00
yangxiao 04e273e245 bind setRotationQuat 2014-12-25 14:54:20 +08:00
minggo 6487cebead [ci skip]Don't notify because we don't use travis now. 2014-12-25 14:28:27 +08:00