Commit Graph

55 Commits

Author SHA1 Message Date
2youyouo2 8f531c6dd9 Merge branch 'v1.4' of github.com:cocos-creator/cocos2d-x-lite into develop 2017-03-10 10:17:53 +08:00
Wang Nan 54505ece06 Merge pull request #536 from natural-law/issue5210
Solve the warning in NDK build with binary/link template.
2017-02-27 09:37:00 +08:00
yanli.huang 2d6c6d60e7 fix https://github.com/cocos-creator/fireball/issues/5249 2017-02-17 16:00:41 +08:00
James Chen 18537b6a8a Updates project configuration for win32 and assert logic fix for HttpClient. 2017-02-16 11:13:31 +08:00
zhangbin d5cd326059 Solve the warning in NDK build with binary/link template. 2017-02-13 11:58:21 +08:00
zhangbin 4caac936ae Set the default APP_ABI with armeabi-v7a for binary template.. 2017-02-08 14:22:34 +08:00
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
Nan Wang 384cfa8b6b fix CocosDenshion namespace compile error 2016-12-01 13:45:51 +08:00
Nan Wang 9ff81c656b fix CocosDenshion namespace compile error 2016-12-01 09:58:33 +08:00
Wang Nan 6a85ff24a1 Merge pull request #420 from cocos-creator/v1.3
merge V1.3
2016-11-29 10:10:54 +08:00
James Chen 5996fe0866 Don’t invoke simple audio engine stuff in AppDelegate. And send missing game_on_hide & game_on_show event for Appdelegate in Simulator. 2016-11-28 11:51:37 +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
zhangbin ad9593f9b6 Solve the error in binary template. 2016-09-27 16:17:11 +08:00
2youyouo2 ba0c01341c support binary android-studio 2016-09-23 16:00:17 +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
pandamicro 66a38aa3a4 Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into develop
Conflicts:
	cocos/2d/CCFastTMXTiledMap.cpp
2016-08-26 20:48:38 +08:00
zhangbin f97b23514b Use java reflection to avoid API level dependent, Use API Level 10. 2016-08-25 09:56:32 +08:00
pandamicro b742058510 Fix all compilation and linking issues 2016-08-16 16:09:39 +08:00
2youyouo2 034aa113cf fixed mac templates 2016-08-03 14:11:15 +08:00
yanli.huang af7ff67577 fix: proj.android-studio compiled failed 2016-07-28 22:18:18 +08:00
yanli.huang 44796089f7 Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into develop 2016-07-28 13:57:19 +08:00
yanli.huang 4fb94eef21 strip anysdk from template.add anysdk by copy way 2016-07-28 13:56:06 +08:00
2youyouo2 b90fa73948 upload missed files 2016-07-27 16:26:10 +08:00
yanli.huang 1b0f781b81 add extensions/anysdk/js-bindings
remove anysdk js-binding files
2016-07-22 14:09:56 +08:00
yanli.huang d0d6066166 allow to copy proj.android/libs in js-template-binary 2016-07-21 18:25:17 +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 cdc643a22c remove local information 2016-07-20 11:43:35 +08:00
minggo 73e93fddc1 fix compiling error with Xcode7.3 caused by libpng 2016-07-18 17:55:21 +08:00
2youyou2 3c525de2a9 update binary windows template 2016-07-14 15:45:37 +08:00
2youyouo2 d130fdfa23 remove unused files 2016-07-14 11:28:07 +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
子龙山人 498bdd79d8 Merge pull request #165 from zilongshanren/add-system-font-overflow
Add system font overflow
2016-06-14 11:15:16 +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
zilongshanren 0733fe707c fix template settings 2016-06-12 18:30:04 +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
pandamicro 88cfbbe17e Merge pull request #123 from 2youyouo2/develop
fixed templates
2016-05-18 18:17:03 +08:00
2youyou2 a2b623cd32 fixed templates 2016-05-18 15:04:19 +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