115 Commits

Author	SHA1	Message	Date
Ricardo Quesada	81c2d92355	yeah... love in includes ... <3	2014-04-26 10:35:57 -07:00
samuele3hu	6fbf1b4cdf	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_test	2014-03-27 11:21:20 +08:00
samuele3hu	06f4cb31b2	Replace NativeActivity with Cocos2dActivity and modify lua android project setting.	2014-03-27 11:18:13 +08:00
faryang-rmbp	491dc202df	remove deprecated code in lua tests & template	2014-03-26 19:42:07 +08:00
samuele3hu	d3487d2d3c	close #4400: Use the newest version of LuaSocket for lua	2014-03-20 17:04:54 +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
James Chen	27a7dce447	Adds lua-empty-test to VS project.	2014-03-12 16:20:27 +08:00
James Chen	611cccd3e7	[win32] HelloCpp -> cpp-empty-test, HelloLua -> lua-empty-test.	2014-03-12 15:59:48 +08:00
andyque	cb4acc6311	fix linux compile error	2014-03-12 11:03:23 +08:00
James Chen	79e979ac71	updates CMakeLists.txt	2014-03-11 19:10:37 +08:00
James Chen	25604d3872	Update CMakeLists.txt	2014-03-11 19:10:37 +08:00
James Chen	431e800dd6	All tests could run on Android.	2014-03-11 19:10:36 +08:00
James Chen	91a3ba61da	lua-empty-test, cpp-empty-test work for iOS/Mac	2014-03-11 19:10:36 +08:00
James Chen	2485f86777	lua-empty-test folder structure refactoring.	2014-03-11 19:10:35 +08:00
James Chen	7504a25d9c	cpp-hello -> cpp-empty-test, lua-hello -> lua-empty-test, ouch....	2014-03-11 19:10:35 +08:00