Commit Graph

366 Commits

Author SHA1 Message Date
minggo 89fc67594a update template file (#1821) 2019-08-30 18:37:41 +08:00
minggo 95315c1a73 V2.1.3 update v8 android (#1817)
* use ndk's stl

* update external version: update v8
2019-08-30 17:37:58 +08:00
minggo e3dd5e8458 fix instant template compiling error on android (#1799) 2019-08-23 09:43:40 +08:00
minggo b76f9b27a2 correct coping files for default template 2019-07-26 11:44:36 +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
Arnold 974605ea42 run tools/travis-scripts/generate-template-files.py (#1717) 2019-04-15 16:03:04 +08:00
santy-wang 6b19429228 fix loading subpackages's file failed(#1285) 2019-04-08 17:07:47 +08:00
owen 0acb69851b optimize spine memory (#1694)
* Optimize spine memory

* roll back genbindings.py
Remove unused function

* visual studio project config

* modify Android mk

* Modify default project config

* Fix restart vm crash

* Fix if listen spine dispose event, will triggle crash bug

* Move some function to private

* move release skeletondata behind depose skeleton

* optimize spine load file

* Add dragon bones and spine global time scale api

* clear tracks and listener

* change tab to 4 spaces

* optimized code logic
2019-03-12 11:51:51 +08:00
吴智明 9c18b3a404 support app bundle for instant app (#1673)
* upgrade gradle and gradle tools version to support app bundle

*  upgrade gradle

* support app bundle for android instant
2019-02-14 17:05:09 +08:00
owen a9887b4638 Fix vertex exceed 65535 error and dragonbones leak (#1669)
* fix exceed native-renderer

* fix dragonbones memery leak

* fix native db leak

* fix native db leak

* indent issue

* add MeshBuffer into vs project

* modify cocos2d_files template

* optimize spine
2019-02-12 17:14:03 +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
CocosRobot 90b862182c [AUTO][ci skip]: updating cocos2dx_files.json (#1663) 2019-01-14 20:38:43 +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
owen 788244869f Spine upgrade (#1652)
* upgrade spine

* upgrade spine

* upgrade spine

* upgrade spine

* upgrade spine

* upgrade spine

* upgrade spine

* gulp: auto retry when git ref locked

* upgrade spine

* upgrade spine

* upgrade spine

* upgrade spine

* upgrade spine
2019-01-11 11:48:38 +08:00
吴智明 aca87582d3 change macro setting to xcconfig on ios and mac platform (#1653)
* change macro setting to xcconfig on ios an mac platform

* remove unuse files
2019-01-08 11:48:21 +08:00
leda 8b9a06010c add spine & DB macros into android instant template (#1651) 2018-12-29 16:13:28 +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
owen 5240493448 fix release compile error (#1634) 2018-12-18 16:46:58 +08:00
dreamtravel 2794a9da80 调整android instans模版,适配cocos service (#1631) 2018-12-18 14:39:28 +08:00
CocosRobot 22a6368e77 [AUTO][ci skip]: updating cocos2dx_files.json (#1626) 2018-12-07 20:20:32 +08:00
leda 5232eb4121 cocos2dx_files.json update (#1625) 2018-12-07 18:41:08 +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
CocosRobot 5c4e691465 [AUTO][ci skip]: updating cocos2dx_files.json (#1598) 2018-11-16 16:52:55 +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 e612da914f upgrade Tremolo to v0.08 (#1586)
* update tremolo files

* update deps to next-8
2018-11-07 23:55:51 +08:00
leda 52adcf9a34 adapt google instant template to creator 2.1 (#1585)
* add native module divide into instant app Application.mk

* minify java code Enabled

* gcc -> clang

* add macro to game target
2018-11-07 17:46:05 +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
Jare Guo fbea90a258 Merge branch 'v2.0-release' into v2.1-release 2018-10-22 15:40:45 +08:00
吴智明 09b3f033a1 Gpi change manifest (#1550)
* add autoVerify property for intent-filter

* add add http and https support
2018-10-19 12:29:51 +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
Jare Guo 35d0a0b19f Merge 2.0.2 into gpi 2018-10-17 18:47:09 +08:00
吴智明 a047891c9e add package name for instant activity (#1546) 2018-10-17 09:41:33 +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 ccd3c113b0 Merge branch 'v2.0-release' into v2.1-release
# Conflicts:
#	extensions/anysdk/platform/android/src/org/cocos2dx/javascript/SDKWrapper.java
2018-10-15 17:42:53 +08:00
leda 448b88cd49 update cocos2dx_files.json rules, reduce copy (#1541)
* update cocos2dx_files.json rules

* reduce files copy
2018-10-12 10:24:56 +08:00
wuzhiming dbbaa22a4a revert code 2018-10-10 09:18:46 +08:00
wuzhiming 61db1068f8 add context getter for appActivity 2018-10-10 09:18:46 +08:00
wuzhiming fb341236d7 add project.properties to instant template 2018-10-10 09:18:46 +08:00
wuzhiming 0083becb00 reset instant config to gradle.properties 2018-10-10 09:18:46 +08:00
wuzhiming 7cc0b4d34b add instant template for google play instant 2018-10-10 09:18:46 +08:00
leda beb45454ad support parse waitForConnect and debugPort from simulator/config.json (#1521)
* revert v8 debugger ip to 0.0.0.0 for simulator

* parse isWaitForConnect and debug port from config.json

* remove macro useless, since we parse the options from config.json
2018-09-26 18:57:56 -07:00
leda a5391aaabd add macro to support custom v8 debug option for creator (#1518)
* add macro to support custom v8 debug option for creator

* update console with version compare fixed

* revert debugger ip to 0.0.0.0 for template
2018-09-25 21:49:55 -07:00
leda 674614720e add v8 optional on macOS (#1515)
* add v8 libs into mac project

* update xcode simulator project config

* add v8 header into template

* add SCRIPT_ENGINE_V8 optional on macOS
2018-09-26 09:21:18 +08:00
吴智明 d5fc36aff5 reset instant config to gradle.properties (#1512)
* reset instant config to gradle.properties

* add project.properties to instant template

* add context getter for appActivity

* revert code
2018-09-19 13:40:17 +08:00
Jare Guo bf7a01bdd5 Merge pull request #1508 from cocos-creator/v2.0-release
sync branch
2018-09-12 14:50:13 +08:00
wuzhiming a0bb86a861 add instant template for google play instant 2018-09-11 14:18:44 +08:00
CocosRobot eeed4931a5 [AUTO][ci skip]: updating cocos2dx_files.json (#1503) 2018-09-10 10:23:52 +08:00