11 Commits

Author	SHA1	Message	Date
minggo	84a102edf8	merge v3.13.1 back to v3	2016-09-15 10:08:28 +08:00
minggo	937525a4de	prevent restarting activity on some events (#16525)	2016-09-06 16:12:49 +08:00
minggo	04fd2b16b2	merge v3.13 back to v3	2016-08-29 11:57:13 +08:00
minggo	3ce4134ab3	use java reflection to avoid API level dependent, use app-abi 10 (#16371) ... * use java reflection to avoid API level dependent, use app-abi 10 * add license header	2016-08-17 13:55:26 +08:00
Greg Rynkowski	14b8fc0a71	Remove AppDelegate memory leak in Android projects (#16333) ... * Remove AppDelegate memory leak from Android projects AppDelegate object and all its members are never released. As a solution I propose to use static unique_ptr that could destroy it at the end of the application. Issue: https://github.com/cocos2d/cocos2d-x/issues/14110 * Correct code style in Android main.cpp files - removed redundant headers (reduced dependencies) - removed redundant code - corrected code style	2016-08-08 10:53:04 +08:00
James Chen	b135d512d2	Update copyright to 2016. (#16311)	2016-08-05 09:42:15 +08:00
minggo	7131451f1b	change to use api 19 (#16248) ... * change to use api 19 * update deps version	2016-07-29 13:57:01 +08:00
minggo	5f2c1df448	use android 21 to fix compiling error	2016-07-22 10:53:56 +08:00
minggo	4e125d84a4	fix compiling and linking error with ndk r12b	2016-07-08 15:29:35 +08:00
zhangbin	5b90476f65	Write the test result file to sdcard on Android.	2015-09-09 17:00:38 +08:00
zhangbin	f3ade30b0b	Add proj.android & proj.android-studio support.	2015-09-09 16:02:33 +08:00