15 Commits

Author	SHA1	Message	Date
minggo	cd5bcb87af	issue #2284: merge master and fixed some conflicts	2013-06-13 17:54:05 +08:00
James Chen	aee8e829ca	[Android] Updating Application.mk for HelloLua and TestLua.	2013-06-08 17:28:03 +08:00
samuele3hu	c021f700d3	issue #2103 add webSocket lua test sample	2013-06-07 12:54:39 +08:00
samuele3hu	afa6b81ba7	issue #2103 add cocosbuilder lua bind and add a simple sample	2013-06-03 13:47:12 +08:00
minggo	4f484cbcbf	enable c++11 for android projects	2013-06-03 11:02:41 +08:00
James Chen	79d58bcdb9	issue #1847: Adding sources of Luajit2.0.1-hotfix, and adding android support.	2013-04-16 17:34:58 +08:00
minggo	07eaf286fb	add c project setting for lua samples	2013-03-19 16:49:16 +08:00
minggo	0a8b4f923f	delete parameter(-o igncr) when running build_native.sh in eclipse project	2013-03-19 13:48:32 +08:00
folecr	6dba49f25b	Android build_native.sh now reads local.properties for environment variables	2013-03-15 16:44:16 -07:00
minggo	3ea562b4ad	fix some logical errors and compiling errors	2013-01-28 23:19:57 +08:00
James Chen	c19b9885fe	Adding COCOS2D_DEBUG=1 for sample projects.	2013-01-28 10:22:32 +08:00
moadib	e39829269d	Added <uses-feature android:glEsVersion="0x00020000" /> to AndroidManifest.xml	2013-01-21 13:03:55 +04:00
minggo	89fb58e791	issue #1603:change pathes of android codes	2012-12-21 17:28:14 +08:00
James Chen	dcfd38756d	Updated android build files.	2012-12-20 14:04:49 +08:00
James Chen	4660e72eda	issue #1603: Moved the position of some projects.	2012-12-20 12:58:21 +08:00