Commit Graph

78 Commits

Author SHA1 Message Date
minggo 39f4b68302 V8 fix (#1816)
* use ndk's stl

* update external version: update v8
2019-08-30 17:24:54 +08:00
yinkaile 88d02075a7 fixed build android release (#1802) 2019-08-23 15:14:30 +08:00
minggo 1e37ff1ec4 synchronize v2.1.3 to 2.2 2019-08-02 18:07:50 +08:00
minggo 57fd102dd5 fix compling error on android x86 2019-07-26 11:34:57 +08:00
minggo f884dcf19e use jsc for non arm64 devices and some other fix 2019-07-12 14:14:21 +08:00
owen ed12e82812 Fix android compile 2019-07-02 16:28:18 +08:00
santy-wang 6b19429228 fix loading subpackages's file failed(#1285) 2019-04-08 17:07:47 +08:00
吴智明 0a748c28c3 V2.0 upgrade gradle to gradle-4.10.3, plugin 3.2 (#1671)
* upgrade gradle and gradle tools version to support app bundle

*  upgrade gradle
2019-01-28 17:05:56 +08:00
吴智明 1aa63adca6 allow cleartext HTTP traffic (#1664) 2019-01-17 15:36:53 +08:00
吴智明 2f6b44a2fc Change network module (#1655)
* change USE_NET_WORK to USE_SOCKET  and add xmlhttprequest default for ios platform

* change USE_NET_WORK to USE_SOCKET  and add xmlhttprequest default for android platform
2019-01-14 16:26:32 +08:00
dreamtravel 094ce6b41d SDKWrapper新增public Context getContext() 接口 (#1635)
* SDKWrapper新增public Context getContext() 接口

* Update SDKWrapper.java

* Update SDKWrapper.java

* Update SDKWrapper.java

* Update SDKWrapper.java

* Update SDKWrapper.java
2018-12-19 11:03:05 +08:00
dreamtravel 79cb270254 remove AnySDK and Cocos Analytics, move both into Creator Service Panel (#1619)
* 移除cocos-2dx-lite的依赖external中的AnySDK和Cocos Analytics,转移这两者的集成到Service in Creator项目 修改Runtime默认工程,清理模版工程对AnySDK和Cocos Analytics的依赖

* 修改iOS link 模版

* 修改cocos2s-x-lite的deps目标
2018-12-07 17:32:44 +08:00
owen c9c6634e7e v2.0 skeleton optimize (#1603)
* v2.0 skeleton optimize

* v2.0 skeleton offical source file

* Rename jsbDragonBones to dragonbones
Rename jsbSpine to spine
Rename editor to middleware
Rename EditorManager to MiddlewareManager

* Rename Macro.h to MiddlewareMacro to avoid duplication of name

* Middleware update by js

* recover other ini generate

* Update cocos2dx-file.json

* createArrayBuffer support null point

* Rename MiddlewareMacro

* skeleton windows 工程

* add checkspace before write buffer

* add math include

* modify dragonBones to dragonbones

* modify dragonBones to dragonbones

* modify dragonBones to dragonbones

* remove useless code

* Change copyright time
2018-12-03 19:58:00 +08:00
leda 742b0462ac update gradle to 4.4, plugin 3.1.4 (#1589)
* update gradle to 4.4, plugin 3.1.4

* change Build.VERSION_CODES.LOLLIPOP to 21
2018-11-08 16:02:22 +08:00
Arnold 2dab6b175e [android] add compile switch for libtiff (#1565)
* add switch for libtiff

* add macro

* revert cocos2dx-files.json

* add more macro

* update default value

* update external/config.json
2018-10-29 10:15:38 +08:00
leda 71d8cf11ad refine native module separate (#1547)
* refine module separate -> gfx renderer

* refine module separate

* modify Application.mk, add macro

* “#if USE_GFX_RENDERER” means “#if USE_GFX_RENDERER > 0”

* improve macro define in binding code
2018-10-18 09:10:05 +08:00
leda 73f62c9da6 enable Proguard for release build on Android (#1545)
* enable Proguard for release build to reduce apk size

* add Proguard to default template

* consider anysdk at proguard

* remove un-used permissions

* disbale gfx & renderer binding register
2018-10-16 18:35:18 +08:00
Jare Guo 63d7ba61e8 bump to 2.1 and merge commit v2.0-release into develop 2018-09-06 15:33:43 +08:00
leda 92b21a2264 add "launchmode" and "taskAffinity" on android (#1493) 2018-09-04 09:53:50 +08:00
吴智明 5656a04593 remove facebook_id from gradle.properties (#1459) 2018-08-16 15:45:56 +08:00
leda a816ffd743 modify android config, use clang (c++_static) to build (#1385)
* correct head file include error

* modify build tool to clang

* remove one useless file include

* remove armeabi files in 2d-x_files
2018-07-25 09:24:29 +08:00
吴智明 42c1904831 add facebook sdk support (#1378)
* add facebook sdk support

* add facebook support for default template

* add facebook support for link template

* add another space line
2018-07-24 16:49:54 +08:00
吴智明 bf72d76f14 add some support for facebook (#1402) 2018-07-24 13:38:35 +08:00
leda b3b37cf457 Add AssetsManager to iOS & Mac & Android & win32 (#1405)
* Add incomplete AssetsManager to iOS & Mac

* remove Android.mk refer on Xcode project config

* re-add assetmanager for android

* re-add assetmanager for win32 project config

* remove unused macro define for win32

* remove unused marco define COCOS2D_JAVASCRIPT

* added header include for assetsManager

* Add CCAsyncTaskPool

* Fix AssetsManager event trigger issue

* update win32 project config, added CCAsyncTaskPool

* add CCAsyncTaskPool to extensions Android.mk
2018-07-23 17:50:04 +08:00
leda 64643b4922 fix build crash on android when enable AnySDK (#1397)
* disable anysdk comments in link template

* extra init callback when JNI_OnLoad

* add some comment to explain both init function

* sync changes from link template to default for android
2018-07-19 09:55:51 +08:00
leda a142b03938 fix default template android lib path error (#1362) 2018-07-04 16:00:53 +08:00
minggo 25bf7c5162 Remove jar (#1351)
* readd jar files

* remove unneeded file
2018-06-29 15:51:21 +08:00
minggo 5b7cbcd9e7 Analytics issue (#1347)
* fix template compiling error on android

* fix compiling error on android
2018-06-29 15:26:40 +08:00
minggo 6c9b3f9b4a fix template compiling error on android (#1345) 2018-06-29 14:56:30 +08:00
minggo 3d561fa281 Merge branch 'next' of github.com:cocos-creator/cocos2d-x-lite into merge-develop 2018-06-28 16:38:39 +08:00
minggo 9705967973 move analytics codes to game activity 2018-06-28 16:05:04 +08:00
leda 1d1c375516 correct copy jsb-adapter folder when build (#1338)
* update win32 build custom copy script

* update gradle build script

* update ios/macos project config
2018-06-28 13:50:24 +08:00
PP 7e6ca8a445 change jsb.js load path (#1335) 2018-06-27 15:52:50 +08:00
leda 89901807a5 default template works on android studio (#1307)
* adapt android studio build config files, compile success

* remove hard coded sign info

* remove  -DHAVE_INSPECTOR, it have been defined in config.hpp

* remove anysdk related code

* revert wrong remove of anysdk and CocosAnalytics
2018-06-08 15:05:33 +08:00
James Chen 669f3cecb3 cocos_android_app_init returns Application*. 2018-04-19 11:17:18 +08:00
Jare Guo d9bd3d763c update license (#1089)
* updating license

* update license
2018-02-01 15:20:01 +08:00
James Chen cdad6b5868 Some Android Simulators don't support SSE instruction, so disable it for x86 arch. (#1011) 2017-11-23 15:13:34 +08:00
James Chen 7739e2c47d Updates template AndroidManifest.xml. 2017-11-07 16:05:44 +08:00
James Chen 50d6a4947d Reverts jniLibs.srcDir 2017-11-02 11:50:09 +08:00
James Chen 2c793ac5ba Android Studio 3.0 Support.
Depends on https://github.com/cocos-creator/cocos2d-console/pull/49
2017-10-30 11:28:34 +08:00
yinkaile d38e168441 support native modules 2017-10-12 17:35:08 +08:00
James Chen 2e3e474c3e [android] Adds APP_CFLAGS for template projects. 2017-10-10 14:28:51 +08:00
2youyouo2 859b9b1302 remove copy_resources from android-studio build-cfg.json 2017-09-29 16:10:56 +08:00
James Chen a0a312814d Merge branch 'v1.6' of git://github.com/cocos-creator/cocos2d-x-lite into fix/jsb2.0-sync-v1.6 2017-09-22 17:32:36 +08:00
James Chen f19fb0b1f8 [android] Fixes AppAcitivity (Sub class of Cocos2dxActivity) is re-created which causes crash if launching app first time and re-opening from icon. 2017-09-15 10:41:32 +08:00
2youyouo2 9c12fcb2d9 add jailbreak anysdk files 2017-09-12 14:31:50 +08:00
2youyouo2 672d00478f fixed android-studio debug error 2017-09-01 11:18:27 +08:00
2youyouo2 19be5234c7 refine build.gradle 2017-08-23 10:45:28 +08:00
2youyouo2 49bfa517f2 update build tool version and gradle version 2017-08-23 10:45:07 +08:00
2youyouo2 93862c24fa fixed not copy .so files when first build android-studio project 2017-08-16 17:44:18 +08:00