38 Commits

Author	SHA1	Message	Date
minggo	866906fd58	issue #2905:modify project settings to include correct audio path	2013-10-10 15:40:06 +08:00
Dhilan007	9727436a5d	issues #2834:Use Android standalone toolchain on windows to remove the dependence of cygwin	2013-09-27 21:54:48 +08:00
minggo	ddaff9cce6	make cocos2dx depend chipmunk	2013-09-17 19:24:30 +08:00
samuele3hu	29f0909714	issue #2768:Add LuaObjectBridge and LuaJavaBridge	2013-09-11 09:48:24 +08:00
samuele3hu	32d056df18	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into TableView	2013-09-04 14:03:21 +08:00
samuele3hu	6815e01f84	issue #2764:Add TableView lua binding and releated test sample	2013-09-04 14:02:22 +08:00
zhangbin	b854c25103	Add parameter in method cocos_android_app_init() to initialize plugin.	2013-09-02 16:10:08 +08:00
minggo	e567b6c54b	fix warnings on ndk-r9	2013-08-26 18:02:51 +08:00
folecr	cbd7796438	Update nojava.txt with readme.	2013-08-07 12:29:58 -07:00
folecr	1721e90e3d	Update TestLua	2013-08-05 16:41:34 -07:00
James Chen	5aab0cab7b	[Android] Fixing build errors for ndk-r9.	2013-07-29 14:54:00 +08:00
James Chen	d345ac7f3f	[Android] Usage changes: ccGLInvalidateStateCache --> GL::invalidateStateCache();	2013-07-26 14:00:10 +08:00
James Chen	a1c3631962	issue #2404: DrawPrimitives deprecated.	2013-07-25 22:38:55 +08:00
James Chen	56419b9e90	issue #2410: [Android] Adding listener for CCDrawNode when application resume from background. ... Reset the order of reloading shaders and textures in main.cpp.	2013-07-17 12:53:30 +08:00
James Chen	759831c1d8	issue #2397: Application::sharedApplication --> Application::getInstance.	2013-07-15 16:24:42 +08:00
James Chen	f8cd252c5c	issue #2397: sharedNotificationCenter --> getInstance	2013-07-12 14:17:42 +08:00
James Chen	1f8e852020	issue #2397: Shader::sharedShaderCache() --> Shader::getInstance().	2013-07-12 13:40:01 +08:00
James Chen	2c1b26acf8	issue #2397: EGLView::sharedOpenGLView() --> EGLView::getInstance()	2013-07-12 13:11:21 +08:00
James Chen	88a28b041e	issue #2397: Director::sharedDirector --> Director::getInstance() for all files.	2013-07-12 11:50:36 +08:00
folecr	6708983de2	Update target to android-10 for NDK code	2013-06-24 15:14:14 -07:00
folecr	7d4ce91b6b	Up the minSdkVersion to 9	2013-06-24 15:14:14 -07:00
minggo	0a768da240	issue #2305: use 4.7 toolchain to fix compiling errors	2013-06-21 17:17:23 +08:00
James Chen	1fb9f44d15	issue #2129: Removing CC prefix for samples module.	2013-06-20 14:17:10 +08:00
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