Commit Graph

241 Commits

Author SHA1 Message Date
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 f21dbcba3c Video player android (#1811)
* fix some video issues on Android

* revert some error commit
2019-08-29 11:34:48 +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
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
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 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
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
Arnold a64bfd39ac fix 2018-10-17 19:49:21 +08:00
Jare Guo 35d0a0b19f Merge 2.0.2 into gpi 2018-10-17 18:47:09 +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 ef4b74ee1e support parse font size with float value (#1543) 2018-10-12 11:49:07 +08:00
Arnold 9a1f054471 change field Application::_scheduler to static (#1536)
* make Applicatino::_scheduler static

* fix mac projfile

* keep scheduler permanent

* remove commented code
2018-10-11 11:22:08 +08:00
leda c8e145dadb Re-added WebView on iOS & Android for Creator 2.1 (#1535)
* init add webview files form creator 1.10

* refine header & namespace to compile works

* add webview auto bindings, need check manually

* update webview auto bind

* add setFrame interface to support set View Rect

* uniform file name with other ui modules

* adapt to iOS
2018-10-10 16:03:23 +08:00
wuzhiming 7cbee1528b add some support for instant games 2018-10-10 09:18:46 +08:00
yongminghuang f30a886cd3 Fixed font size not recognized after setting Chinese font (#1534) 2018-10-09 15:50:44 +08:00
leda c17130862c Re-added VideoPlayer on iOS & Android for Creator 2.1 (#1531)
* add video player source for ios and android.

* revert un-clearly changes

* add iOS files into project config files

* remove useless declare property on 2d-x-lite
2018-10-08 15:28:19 +08:00
wen xing liao f27e8f6761 fix null pointer exception (#1530) 2018-09-30 22:25:37 +08:00
yongminghuang 32cf40a710 improve EditBox on show style and keyboard hide logic for android platform (#1522)
* [bug] when too much text is input, the button blocks the text

* [adjust] button is  displayed on a single line

* [adjust] judge the keyboard to pop up a quarter of the screen
2018-09-27 19:06:00 -07:00
Jare Guo 41e6cb4ea6 Merge pull request #1519 from cocos-creator/develop
sync branch request: from develop to 2.1 release
2018-09-27 11:47:57 +08:00
wdzhangchukong 687a798b20 fix: can not use italic font in canvas (#1520) 2018-09-26 02:37:27 -07:00