Commit Graph

9 Commits

Author SHA1 Message Date
chuanweizhang2013 eb6ef4d067 tab to 4 space 2014-04-10 15:51:25 +08:00
cw c0fe791aae Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into luaruntime
Conflicts:
	templates/lua-template-runtime/src/main.lua
2014-04-04 18:17:54 +08:00
samuele3hu 0a1d23753b fix the lua template error that would lead to crash when do rotate 2014-03-31 23:11:26 +08:00
cw 2649c5b971 add socket 2014-03-28 16:26:56 +08:00
chuanweizhang2013 46d58775d7 update search path 2014-03-19 17:23:06 +08:00
chuanweizhang2013 7af5060896 add pc args 2014-03-18 18:24:58 +08:00
James Chen cc8738ee94 Simulator fix: After main loop, NSApplication needs to be terminated immediately. 2014-03-12 21:45:15 +08:00
andyque 2c2a5ee38e rename gui to ui 2014-03-12 10:46:49 +08:00
cw 133a68f614 add runtime template 2014-03-11 16:52:06 +08:00