7 Commits

Author	SHA1	Message	Date
chuanweizhang2013	d502e41af4	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into codeidev3 ... Conflicts: templates/lua-template-runtime/frameworks/runtime-src/Classes/AppDelegate.cpp	2014-05-09 14:28:14 +08:00
chuanweizhang2013	5164a66e10	add config parser	2014-05-05 21:04:04 +08:00
Tom Whittock	a587da13fc	Lua template should fail to launch on lua error ... Without this change, the app continues to run, attempts to access the badly-initialised scene and issues more error messages. This causes further errors every frame, covering up the original error in the output	2014-05-05 13:12:42 +01:00
chuanweizhang2013	d5940243e1	mofiy wrong indention	2014-04-10 15:37:59 +08:00
faryang-rmbp	491dc202df	remove deprecated code in lua tests & template	2014-03-26 19:42:07 +08:00
boyu0	f23db68151	build lua.a for arm64bit and iOS simulator 64 bit architectures, change .ma3 files to .caf files.	2014-03-15 01:19:06 +08:00
cw	133a68f614	add runtime template	2014-03-11 16:52:06 +08:00