Commit Graph

395 Commits

Author SHA1 Message Date
CocosRobot 9a1c937a8c [AUTO][ci skip]: updating cocos2dx_files.json (#1950) 2019-11-27 14:53:43 +08:00
CocosRobot 8674a00e54 [AUTO][ci skip]: updating cocos2dx_files.json (#1943)
* [ci skip][AUTO]: updating jsbinding automatically

* [AUTO][ci skip]: updating cocos2dx_files.json
2019-11-22 17:51:59 +08:00
PP 0ab1197c27 refine pause playing audio when enter background (#1875)
* Revert "Pause music when app enter background (#1849)"

This reverts commit 7a24ee3377.

* refine pause playing audio when enter background
2019-10-12 17:02:50 +08:00
cary 70a2134fb4 Fix the display error of the 3D node in the native platform. (#1868)
* Fix the display error of the 3D node in the native platform.

* Modify the matrix calculation of 3D nodes.
2019-10-12 11:29:48 +08:00
吴智明 7d72c89f09 upgrade vs studio default version to vs2017(v141) (#1873) 2019-10-12 11:09:05 +08:00
owen 7c01a65b7e fix android instant platform throw error (#1867) 2019-10-09 20:46:13 +08:00
owen 0cd71aefb9 V2.2.0 native Spine and DragonBones cache mode (#1844)
* Spine cache

* fix dragonbones yDown bug

* Spine cache mode and fix dragonBones yDown bug

* spine cache mode

* dragonbones cache mode

* dragonbones cache mode

* dragonbones cache mode

* spine dragonbones binding

* dragonbones cache mode

* spine dragonbones binding

* optimize dragonbones event

* update dragonbones binding

* dragonbones remove cache

* dragonbones cache mode

* update dragonbones binding

* dragonbones cache mode

* Fix some cache bug

* fix some cache mode bug

* optimize cache mode

* Fix update list order bug

* Fix indent issue

* revert bindings-generator

* Fix intent issue
2019-09-23 10:19:13 +08:00
CocosRobot 4ee23246ff [AUTO][ci skip]: updating cocos2dx_files.json (#1851) 2019-09-21 08:42:38 +08:00
Arnold 7a24ee3377 Pause music when app enter background (#1849)
invoke AudioEngine::pauseAll when app enter background
2019-09-18 13:52:28 +08:00
Cocos Robot 28df061165 Sync branch v2.1.3-release to v2.2.0-release 2019-09-16 16:26:41 +08:00
CocosRobot 607a535755 [AUTO][ci skip]: updating cocos2dx_files.json (#1845) 2019-09-16 15:10:16 +08:00
cary 34159f3c30 Fix bugs of the model orientation on the native platform. (#1836)
* Fix bugs of the model orientation on the native platform.

* Add camera api export.

* add android change

* modify liensence
2019-09-16 15:02:37 +08:00
minggo 198effdbda fix compiling error on iOS for new project (#1841) 2019-09-11 09:15:53 +08:00
CocosRobot 49fe4b2c83 [AUTO][ci skip]: updating cocos2dx_files.json (#1839) 2019-09-10 18:25:19 +08:00
Jare Guo c4beb67263 Merge v2.1.3-release into v2.2.0-release
# Conflicts:
#	cocos/ui/webview/WebViewImpl-ios.mm
2019-09-10 12:55:59 +08:00
minggo 2820e6384b use WKWebView instead as UIWebView is deleted in iOS 13 (#1837) 2019-09-06 11:28:21 +08:00
yinkaile 26a1ef4b2b update cocos2dx_files.json (#1829) 2019-09-04 15:54:47 +08:00
minggo 89fc67594a update template file (#1821) 2019-08-30 18:37:41 +08:00
minggo fe51980417 update template file (#1820) 2019-08-30 18:26:10 +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 39f4b68302 V8 fix (#1816)
* use ndk's stl

* update external version: update v8
2019-08-30 17:24:54 +08:00
Cocos Robot 6f4399d859 Sync branch v2.1.3 to v2.2.0-release 2019-08-28 15:58:35 +08:00
yinkaile 88d02075a7 fixed build android release (#1802) 2019-08-23 15:14:30 +08:00
minggo e3dd5e8458 fix instant template compiling error on android (#1799) 2019-08-23 09:43:40 +08:00
minggo ced9217248 update template json file (#1793) 2019-08-08 17:41:52 +08:00
minggo 1e37ff1ec4 synchronize v2.1.3 to 2.2 2019-08-02 18:07:50 +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
owen eb83d6758e modity template file 2019-07-09 11:39:53 +08:00
owen 930b14b174 default project 2019-07-02 20:17:20 +08:00
owen 683a811851 Merge commit 'aeda325f76663ad4c1e4d8087109b1897413ac23' into v2.3.0-fix-template-issue 2019-07-02 16:31:11 +08:00
owen ed12e82812 Fix android compile 2019-07-02 16:28:18 +08:00
owen ff1158d0a4 Fix InputAssembler not clear bug 2019-07-02 14:40:41 +08:00
owen d7a88d240e Sync native renderer to v2.3 2019-05-16 19:33:23 +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