Commit Graph

255 Commits

Author SHA1 Message Date
Cocos Robot 682a8ed3d7 Sync branch v2.1.3-release to v2.2.0-release 2019-09-17 19:52:38 +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
Jare Guo 2fe69db75c Merge v2.1.3 into v2.2.0-release 2019-08-30 20:05:02 +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
minggo f21dbcba3c Video player android (#1811)
* fix some video issues on Android

* revert some error commit
2019-08-29 11:34:48 +08:00
Cocos Robot 99bec00fd5 Sync branch v2.2.0 to develop 2019-08-02 18:17:55 +08:00
unace ca5c7fd25b [Android] fix an audio bug (#1788)
*  fix external player muting. add audio focus flag

Add ability to not stop sound & music on game start in android
This comes from https://github.com/cocos2d/cocos2d-x/pull/18640.

* [Android] fix an audio bug

fix an audio bug that audios are not paused when locking screen while notification drawer is showing.
2019-08-02 09:25:11 +08:00
unace 919d036a95 fix external player muting. add audio focus flag (#1785)
Add ability to not stop sound & music on game start in android
This comes from https://github.com/cocos2d/cocos2d-x/pull/18640.
2019-07-31 15:06:11 +08:00
PP 575c15bbed set default text color for editText (#1778) 2019-07-31 15:05:37 +08:00
knox 48250287ee refine code 2019-07-29 09:20:11 +08:00
knox 7f68a97cda improve getCurrentLanguage to android 2019-07-26 16:45:31 +08:00
Jare Guo 602804cd61 Merge pull request #1782 from minggo/v2.1.3
升级 v8
2019-07-26 13:39:16 +08:00
minggo 57fd102dd5 fix compling error on android x86 2019-07-26 11:34:57 +08:00
Jare Guo b3f4c1e979 Revert "Update v8 to 7.5.288.22 (#1772)" (#1779)
This reverts commit 144bb78337.
2019-07-25 10:20:55 +08:00
minggo 144bb78337 Update v8 to 7.5.288.22 (#1772)
* ios use v8

* make v8 work on iOS

* fix compiling error

* can build and run on android, but will crash

* use jsc for non arm64 devices and some other fix

* make macro more clear

* fix errors on windows
2019-07-20 14:59:04 +08:00
Cocos Robot 673e7621ad Sync branch v2.3.0 to develop 2019-07-17 14:31:06 +08:00
minggo 2801316866 fix accuracy of RGB value (#1773)
* fix accuracy of RGB value

* don't have to check less than 0
2019-07-16 17:45:41 +08:00
minggo fbc69aebeb can build and run on android, but will crash 2019-07-12 10:36:21 +08:00
Cocos Robot 25b7911e92 Sync branch v2.3.0 to develop 2019-07-05 14:44:31 +08:00
minggo 875acde984 native returns unpremultiplied data (#1765)
* unpremultiply alpha on ios/mac

* unpremultiply alpha on Android and windows
2019-07-02 15:00:15 +08:00
Jare Guo 9eb2af918f improve convert draw y point calculate for 2d-tasks/issues/1378 (#1739) (#1764)
* improve convert draw y point calculate for 2d-tasks/issues/1378

* update comment

* improve convert draw y point calculate for android

* improve convert draw y point calculate for win32
2019-07-01 15:11:44 +08:00
Arnold 5502000bc6 prevent downloader callbacks when app exits (#1763) 2019-06-04 02:21:04 -07:00
Arnold e0a6e1e7ab prevent downloader callbacks when app exits (#1751) 2019-06-04 01:28:58 -07:00
Arnold 029a94612d add okio-1.15.0.jar (#1750) 2019-05-28 01:42:43 -07:00
Arnold 7e6d0598e1 fix bad suggestion (#1747) 2019-05-27 01:59:20 -07:00
Wenhai Lin 7e2031296a Replace Android HttpClient with OkHttp (#1731)
* Remove the code of http client

* Replace Android HttpClient with OkHttp
2019-05-21 18:49:39 -07:00
Cocos Robot 7afbeed3ac Sync branch v2.3.0 to develop 2019-05-15 22:10:37 +08:00
Yehsam23 06310ca1a8 WebView add background transparent (#1727)
* WebView add background transparent

* Android WebView remove reflection
2019-05-15 15:17:55 +08:00
Knox 871476343c improve convert draw y point calculate for 2d-tasks/issues/1378 (#1739)
* improve convert draw y point calculate for 2d-tasks/issues/1378

* update comment

* improve convert draw y point calculate for android

* improve convert draw y point calculate for win32
2019-05-13 16:53:42 +08:00
Arnold fba583b058 ignore touch event if native init is not finished (#1715)
* cache touch event if renderer is not ready

* skip bad files

* ignore events if not ready

* mark mNativeInitCompleted as false before init
2019-04-10 17:30:30 +08:00
Arnold af63971d68 [bugfix] cc.loader IPV6 local network address binding (#1713)
* add source code of cz.msebera.android.httpclient

* remove httpclient-4.4.1.1.jar & use PlainSocketFactory

* add dns callback

* add interface

* add comment

* revert unused change

* remove generated file
2019-04-09 17:33:13 +08:00
PP 68e188c4db support input signed decimal in EditBox (#1695) 2019-03-08 15:45:37 +08:00
Wenhai Lin b8ae263cd2 Copy text to clipboard (#1667) 2019-01-28 10:14:34 +08:00
吴智明 3ba70ea84c fix bug when video is download from server (#1661) 2019-01-14 16:27:04 +08:00
leda ef7bd8a803 simplify video view , fix video view size bug (#1649) 2018-12-29 15:19:29 +08:00
leda 8b9d3da688 standardize pause & resume logic on GLSurfaceView (#1645) 2018-12-27 10:48:59 +08:00
Knox ce0af6d8db add get system full language (#1638) 2018-12-24 14:41:38 +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
Arnold 9073cfe964 ignore server cert verification (#1597) 2018-11-15 21:17:35 +08:00
leda 2a3d5832cf use reflect to call setFontFeatureSettings (#1593) 2018-11-13 16:24: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
bofeng-song 1d642605e1 [features] support oblique(font-style) and smallCaps(font-variant) (#1577)
* [features] support oblique(font-style) and smallCaps(font-variant)

* [refine] add Remarks, change constant value to system default
2018-10-31 20:06:03 +08:00
wen xing liao 5bef70b34d fix java IllegalArgumentException (#1570)
* fix java IllegalArgumentException

* Remove multiple parameter checks
2018-10-30 11:59:31 +08:00
bofeng-song 77e5eb3e56 [feature] support lineCap and lineJoin (#1569)
* [feature] support lineCap and lineJoin

* [refine] move precondition to c++ layer
2018-10-29 20:50:54 +08:00
leda 2a4e5aa498 fix wrong @Override mark when build with API-Level = 16 (#1563) 2018-10-26 14:22:48 +08:00
leda 7c93a11905 runtime require: add context2d fill/rect method for android (#1561)
* add context2d fill & rect method for android

* workaround: draw a hairline to cover the border

* fix clear&fillrect parameter error

* add empty impl on Apple

* add empty Imple in win32

* enable "SUBPIXEL_TEXT_FLAG" flag to make the text more clear on Android

* move putImageData impl to native

* add empty _fillImageData impl on win32 & apple
2018-10-26 13:44:03 +08:00
Jare Guo fbea90a258 Merge branch 'v2.0-release' into v2.1-release 2018-10-22 15:40:45 +08:00
leda 4ddd2aee0d close audio device properly (#1552) 2018-10-19 17:03:06 +08:00
leda dada2eb244 move "cocos2d::experimental::" to "cocos2d::" on Audio (#1549)
* remove “experimental” in audio dir

* update audio bindings

* fix "{" match error

* no need "experimental" for thread pool

* remove both out-of-date js api files
2018-10-18 13:34:12 +08:00