Commit Graph

22 Commits

Author SHA1 Message Date
Wang Nan c3de6d4152 Merge pull request #448 from cocos-creator/v1.3
merge V1.3
2016-12-21 14:32:08 +08:00
knoxHuang 8812ead9bf add semicolon import android.os.Bundle for AppActivity 2016-12-20 18:10:18 +08:00
knoxHuang 871732c527 add android.os.Bundle for AppActivity 2016-12-20 17:29:41 +08:00
Nan Wang 563a2621ab merged v1.3 2016-12-16 13:54:56 +08:00
knoxHuang 1223dd2592 rm extra code for AppActivity 2016-12-16 10:35:50 +08:00
zhangbin a70c941f59 Update the icon of Android Studio project in templates. 2016-11-11 11:46:31 +08:00
zhangbin ddda30122d Solve the error application name of Android Studio project. 2016-10-10 13:44:38 +08:00
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
2youyouo2 4aadc944c3 add project.properties 2016-06-29 18:36: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 d45928a655 reset build.gradle 2016-06-01 17:40:12 +08:00
2youyouo2 4a991bd642 update android-studio templates 2016-05-26 18:42:54 +08:00
2youyouo2 54f91df786 update templates 2016-04-12 10:32:10 +08:00
Wenhai Lin 94c95d5838 Withespaces does matter. 2016-03-31 23:50:02 +08:00
Wenhai Lin b3441f7981 Add template project 2016-03-30 21:12:14 +08:00