Commit Graph

3569 Commits

Author SHA1 Message Date
yinkaile dfa4e85cea Revert "use jsc on iOS" (#1856)
This reverts commit 7fbe83c3ee.
2019-09-26 11:40:23 +08:00
Cocos Robot 5f31b1b8ec Sync branch v2.1.4-release to v2.2.0-release 2019-09-23 16:42:07 +08:00
owen de023324c7 fix simulator compile error (#1855) 2019-09-23 16:30:40 +08:00
Arnold 68d18e3b51 [bugfix] win32 openal state assert failure (#1852)
* openal: protect play2d from incorrect state

stop playing in incorrect state

* Update cocos/audio/win32/AudioPlayer.cpp
2019-09-23 10:42:57 +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
yinkaile 30b8ab3268 fixed check opengl extension (#1850) 2019-09-19 13:37:50 +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
minggo d76a2cfdb8 adjust editbox size to adapter safe arear insets (#1848) 2019-09-18 10:07:52 +08:00
Cocos Robot f77a993d89 Sync branch v2.2.0-release to v2.2.0 2019-09-17 19:52:45 +08:00
Cocos Robot 682a8ed3d7 Sync branch v2.1.3-release to v2.2.0-release 2019-09-17 19:52:38 +08:00
minggo 6c0ca0b16f ios support GLES 3 (#1847) 2019-09-17 15:55:26 +08:00
Knox c53a28c957 Fixed that video could not play when stopped (#1846)
* Fixed that video could not play when stopped

* refine code
2019-09-16 18:34:41 +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 084bcf4443 fix some issues of VideoPlayer on iOS (#1843)
1. fix the issue that the screen will be black for a while when switch url
2. release AVPlayerController in setting url because the destructor is not invoked sometime, i do not know why
Now just show the AVPlayerController when the video is ready to play.
2019-09-12 18:08:26 +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 5e0d8127dc Merge v2.2.0 into v2.2.0-release
# Conflicts:
#	templates/cocos2dx_files.json
2019-09-10 14:16:01 +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
CocosRobot caa84d29c9 [AUTO][ci skip]: updating cocos2dx_files.json (#1835) 2019-09-06 09:24:25 +08:00
minggo 788171bc9a use AVPlayerController again (#1831) 2019-09-05 18:05:24 +08:00
Zty ad3fb0d8fc assertNotSelfChild should check start from this, not this->getParent() (#1824) 2019-09-05 16:00:25 +08:00
yinkaile 3b34990d87 separate color alpha flag (#1825) 2019-09-05 15:59:53 +08:00
owen 7aab600fe6 Fix iOS debug spine crash bug (#1827) 2019-09-05 15:59:36 +08:00
Arnold 5dddbcf4d0 fix travis push failed (#1834)
* add scripts

* --no-recurse-submodules
2019-09-05 15:58:30 +08:00
yinkaile 26a1ef4b2b update cocos2dx_files.json (#1829) 2019-09-04 15:54:47 +08:00
Jare Guo dcf8ca4199 Merge remote-tracking branch 'fireball/v2.1.3' into v2.2.0-release
# Conflicts:
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_spine_auto.cpp
2019-09-04 13:44:23 +08:00
yinkaile a7fb56d989 fixed logic of checking native GL extension (#1826) 2019-09-04 11:14:39 +08:00
owen 2c31d09fa5 Fix 213 spine auto file generate error (#1828) 2019-09-04 11:11:27 +08:00
Jare Guo 87922985ad gulp: always clean vs project 2019-08-30 22:26:26 +08:00
Jare Guo 52550a28ed Merge pull request #1823 from jareguo/v2.2.0-release
sync branch
2019-08-30 20:08:35 +08:00
Jare Guo 84b3f6baea Merge v2.1.3 into v2.2.0-release
# Conflicts:
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_spine_auto.cpp
2019-08-30 20:07:05 +08:00
Jare Guo 2fe69db75c Merge v2.1.3 into v2.2.0-release 2019-08-30 20:05:02 +08:00
CocosRobot a0aea3e81b [ci skip][AUTO]: updating jsbinding automatically (#1822) 2019-08-30 19:43:04 +08:00
Arnold 1914ef6d17 update binding generator (#1819) 2019-08-30 18:42:51 +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
Arnold e29a43baff fix travis (#1818) 2019-08-30 18:07:24 +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
CocosRobot 5ea8953d66 [ci skip][AUTO]: updating jsbinding automatically (#1815) 2019-08-30 11:24:27 +08:00
minggo f21dbcba3c Video player android (#1811)
* fix some video issues on Android

* revert some error commit
2019-08-29 11:34:48 +08:00
Arnold 079a0587d6 fix travis (#1810)
* add liclang libraries & update script

* update submodule bindings-generator
2019-08-29 10:52:37 +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 e6f5c146dc fix video player issue that missing controlling items in fullscreen mode on iOS (#1800) 2019-08-23 11:24:02 +08:00
minggo e3dd5e8458 fix instant template compiling error on android (#1799) 2019-08-23 09:43:40 +08:00