Commit Graph

17 Commits

Author SHA1 Message Date
yanli.huang 19bf2d5ee5 fix built-in android project compiled failed 2016-09-23 12:04:24 +08:00
yanli.huang 6606b2ec23 update AnySDK 2.2.3 2016-09-20 16:37:23 +08:00
zhangbin f97b23514b Use java reflection to avoid API level dependent, Use API Level 10. 2016-08-25 09:56:32 +08:00
yanli.huang 4fb94eef21 strip anysdk from template.add anysdk by copy way 2016-07-28 13:56:06 +08:00
yanli.huang 9f916841fe Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into develop
Conflicts:
	templates/js-template-binary/frameworks/runtime-src/Classes/AppDelegate.cpp
	templates/js-template-binary/frameworks/runtime-src/proj.android/jni/Android.mk
	templates/js-template-binary/frameworks/runtime-src/proj.android/jni/hellojavascript/main.cpp
	templates/js-template-binary/frameworks/runtime-src/proj.android/src/org/cocos2dx/javascript/AppActivity.java
	templates/js-template-binary/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
2016-07-21 16:11:50 +08:00
yanli.huang 0aaab3fa5e add anysdk to templates 2016-07-13 16:37:07 +08:00
2youyouo2 259fc314a1 remove runtime files from binary template 2016-07-13 15:11:09 +08:00
knoxHuang 048266e40b add JS and JAVA reflection test tips for AppActivity.java 2016-06-13 18:06:18 +08:00
knoxHuang fb6d6d7b8a update CCJavascriptJavaBridge 2016-06-13 17:39:33 +08:00
2youyouo2 fa94995e70 fixed android template 2016-06-07 14:51:37 +08:00
2youyou2 f0d947d66f update android template sdk level 2016-05-24 18:29:05 +08:00
2youyou2 6c38a81b22 pointer COCOS_X_ROOT to cocos-x directory 2016-05-24 16:58:05 +08:00
zhangbin a4a2e86973 Solve the issue : can't build android portrait project from binary template in Creator. 2016-05-23 11:56:32 +08:00
2youyouo2 1cb724543e update android.mk 2016-05-18 00:10:07 +08:00
2youyou2 3812522182 fixed binary template 2016-05-16 17:21:35 +08:00
2youyouo2 38b01891bd fixed binary template 2016-04-15 18:36:21 +08:00
2youyouo2 e64e5e0178 add binary template 2016-04-13 17:14:11 +08:00