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

26358 Commits

Author SHA1 Message Date
yinjimmy e75d283455 1. do not setFrameSize when resetDesignResolution 
2. read config.json when ConfigParser init
 2014-12-29 09:16:07 +08:00
dualface a4d17998d3 update lua-template-runtime 2014-12-29 05:55:56 +08:00
dualface 2ba25a473f update lua-default-template 2014-12-29 05:51:49 +08:00
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
pandamicro 1e32d0fb80 Added getSearchPaths API in Manifest 2014-12-28 11:55:31 +08:00
pandamicro e3795c0223 Added restart game feature 2014-12-28 11:55:06 +08:00
SunLightJuly 4d08128e89 fixed bug which caused crash when display FPS: the value of "_secondsPerFrame" of Director was not be Initialized 2014-12-27 22:05:29 +08:00
andyque 13032be21d fix hd png file warning 2014-12-27 20:59:37 +08:00
andyque 9c974eebd0 fix libpng warning 2014-12-27 20:47:59 +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
naito 8b5e06b5a0 README typo 2014-12-27 10:17:26 +09:00
yinjimmy 4280ffcf58 add new lua runtime 2014-12-27 02:21:55 +08:00
yinjimmy 4567cf1c40 Fix: Address family not supported by protocol 2014-12-26 21:04:49 +08:00
geron-cn b25e307dee fix add search path for armaturenodereader 2014-12-26 18:27:47 +08:00
lite3 b102587590 fix incorrect font path 2014-12-26 16:20:04 +08:00
yangxiao afb01dcd9a config linux 2014-12-26 16:19:02 +08:00
CocosRobot f8b1b34025 [AUTO]: updating luabinding automatically 2014-12-26 08:10:13 +00:00
minggo f01cc596a3 Merge pull request #9637 from geron-cn/v3_actionline_animationlist 
V3 actiontimeline animationlist
 2014-12-26 16:05:49 +08:00
yinjimmy 5bcd3d9a00 bind address is available for all platform 2014-12-26 16:02:24 +08:00
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
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