17 Commits

Author	SHA1	Message	Date
James Chen	12cc6c6153	Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into iss2171-new-renderer ... Conflicts: cocos/2d/CMakeLists.txt	2013-12-17 15:50:24 +08:00
James Chen	4e01769cd5	issue #2171: [New Renderer] Fixing compilation errors for Android.	2013-12-17 14:18:41 +08:00
Dhilan007	39280d55f3	new label:add support for distanceField ... PerformanceTest:add performance test for label.	2013-12-13 12:42:15 +08:00
James Chen	b5bab598b3	issue #2790: Disables deprecated warning for android to make Travis-CI happy.	2013-12-12 10:35:13 +08:00
James Chen	b0af2667f8	Merge commit 'refs/pull/4433/head' of git://github.com/cocos2d/cocos2d-x into ccconsole ... Conflicts: cocos/scripting/auto-generated	2013-12-05 12:48:32 +08:00
Ricardo Quesada	49b25231f2	Compiles on Android	2013-12-04 19:16:01 -08:00
James Chen	60874ece64	issue #2790: Updates Makefile, Moves some codes to CCValue.cpp.	2013-12-04 16:18:22 +08:00
boyu0	8346fe4b4d	issue #2771: edit android.mk, CMakeLists.txt, change PHYSICS_CONTACT_POINT_MAX to PhysicsContactData:POINT_MAX	2013-11-26 18:22:52 +08:00
boyu0	04c8e9f34e	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical	2013-11-02 00:12:14 +08:00
boyu0	2efef34144	issue #2771: fix vs compile errors	2013-10-31 18:18:02 +08:00
Nite Luo	771844fc58	Fix android build after adding MouseEvent and MouseTest	2013-10-31 00:40:38 -07:00
minggo	d07d054a01	issue #2905:ndk-r8e build ok now	2013-10-23 17:44:20 +08:00
minggo	5f65cdc3c0	fix xcode compiling error and simplify android.mk	2013-10-18 15:39:09 +08:00
minggo	e50f9fc43b	issue #2905: jsbinding samples and lua binding samples build ok on android	2013-10-17 15:04:30 +08:00
minggo	8f7a489a4d	issue #2905:make cocostudio and gui flat	2013-10-16 16:48:39 +08:00
minggo	95acb1b9e3	issue #2905: helloworld build ok on android	2013-10-14 14:01:00 +08:00
minggo	4313c46e93	issue #2905:adjust folder structure	2013-10-12 11:22:05 +08:00