64 Commits

Author	SHA1	Message	Date
cw	1e551f8ca4	Merge branch 'luamerage' of https://github.com/chuanweizhang2013/cocos2d-x into luamerage ... Conflicts: templates/lua-template-runtime/src/main.lua	2014-03-15 10:37:26 +08:00
chuanweizhang2013	59011f86a0	Merge pull request #17 from cocos2d/develop ... update coco2d-x	2014-03-15 10:05:46 +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	f76582ae9e	update res path	2014-03-14 21:06:45 +08:00
cw	d192619ddf	add prebuilt runtime	2014-03-14 16:33:53 +08:00
chuanweizhang2013	0dc85e42a7	modify module_path	2014-03-13 09:51:43 +08:00
James Chen	ac0aecb394	Merge pull request #5737 from dumganhar/runtime-fix ... Lua Runtime fix	2014-03-12 21:48:35 +08:00
James Chen	cc8738ee94	Simulator fix: After main loop, NSApplication needs to be terminated immediately.	2014-03-12 21:45:15 +08:00
minggo	e1afa0ad5c	Merge pull request #5735 from minggo/template-java-des ... add description for how to load .so	2014-03-12 21:31:30 +08:00
minggo	656211a72f	add description for how to load .so	2014-03-12 21:28:38 +08:00
chuanweizhang2013	fafc292d33	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into luamerage	2014-03-12 15:28:07 +08:00
chuanweizhang2013	4153667249	add runtime template	2014-03-12 11:04:56 +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