Commit Graph

220 Commits

Author SHA1 Message Date
minggo
dda8760df0 remove unneed codes (#2176)
* remove unneed codes

* remove unneed codes
2020-02-25 11:04:50 +08:00
minggo
e693d0a237 get audio output sample rate and output frame count in C++ (#2175) 2020-02-24 18:14:00 +08:00
minggo
bd68b01b4d Android native dpi (#2173)
* fix compiling error

* android get dpi in C++
2020-02-24 16:09:13 +08:00
minggo
20edb6a63e implement sensor events in C++ (#2171) 2020-02-24 15:42:58 +08:00
minggo
adb387ada5 remove unneeded codes and fix jni implementation (#2154) 2020-02-20 12:03:14 +08:00
Yun Hsiao Wu
5c797d64c1 fix text positioning (#2031)
* fix android text positioning

* fix windows text positioning

* fix Mac/iOS text positioning
2019-12-30 17:48:09 +08:00
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
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
7f68a97cda improve getCurrentLanguage to android 2019-07-26 16:45:31 +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
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
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
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
Arnold
a64bfd39ac fix 2018-10-17 19:49:21 +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
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
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
wdzhangchukong
687a798b20 fix: can not use italic font in canvas (#1520) 2018-09-26 02:37:27 -07:00
wuzhiming
87cf38b530 add some support for instant games 2018-09-11 14:17:04 +08:00
Jare Guo
63d7ba61e8 bump to 2.1 and merge commit v2.0-release into develop 2018-09-06 15:33:43 +08:00