Commit Graph

149 Commits

Author SHA1 Message Date
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
W-MTZing b46209b4e7 adjust c++ call java function rename (#1498) 2018-09-05 13:43:28 +08:00
Jare Guo caee68b1ff Merge pull request #1490 from cocos-creator/v2.0-release
sync branch
2018-08-30 15:09:48 +08:00
leda d92f07a5be beauty the "done" confirm button of EditBox on iOS & Android (#1464)
* chose a better color match for editbox button

* show editbox confirm button name depend on system language

* correct wrong order

* not magic number for this special color

* another empty line for strings.xml

* adapt color for iOS EditBox

* add editbox i18 strings for iOS mac

* use i18n strings

* simplfy string key, move i18n string location

* simplify get i18 string logic

* add i18n strings to link template

* same changes on default-template

* short i18 key on android
2018-08-21 14:18:05 +08:00
Jare Guo 548ae4380d Merge branch 'v2.0-release' into next 2018-08-16 14:05:09 +08:00
Jare Guo 5701671310 Merge branch 'develop' into v2.0-release
# Conflicts:
#	README.md
#	cocos/2d/CCLabelTextFormatter.cpp
#	cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxEditBox.java
#	cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxEditBoxHelper.java
#	gulpfile.js
#	package.json
#	templates/js-template-binary/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
2018-08-14 10:30:57 +08:00
leda 19ab61b252 refine TODO & FIXME flag (#1450)
* change TODO to REFINE

* change REFINE:cjh to REFINE

* change FIXME to IDEA

* improve format
2018-08-10 12:52:00 +08:00
W-MTZing 7efc9f0e3e fix localstorage get key on rowid asc (#1449)
* fix localstorage get key on rowid asc

* fix localstorage get key on rowid asc
2018-08-09 10:02:13 +08:00
yongminghuang 3c98d6eaad [bug] Without using beginPath() in advance, calling stroke() directly will cause the problem to crash. (#1447)
调用canvas接口画一条线段:如果不实现事先调用beginPath()方法,依次调用moveTo,lineTo和stroke(),运行在浏览器上正常绘制;而在手机上会出现mLinePath空指针异常
2018-08-08 17:07:06 +08:00
drelaptop f6cfd5cef1 fix setDataSource parameters error for video player 2018-08-02 10:57:15 +08:00
minggo b3122ea9e5 add a function to terminate application (#1434) 2018-08-02 10:46:35 +08:00
leda 09a85f1698 correct wrong mTargetState in video player start() method (#1431) 2018-08-01 10:03:39 +08:00
Arnold dfedd27fbb disable url encode (#1408) 2018-07-24 09:40:11 +08:00
Jare Guo 52905dbc80 Merge pull request #1407 from cocos-creator/v1.9-release
sync branch
2018-07-23 14:41:06 +08:00
knox c6e1d13118 fix EditBox updateDomTextCases bug for fireball/issues/7919 2018-07-19 10:28:16 +08:00
leda fd29a5c395 fix android text render crash issue (#1379)
* prevent invalid canvas width and height set

* make restoreContext more stable

* improve canvas init for android
2018-07-10 18:14:06 +08:00
W-MTZing daab4eab46 fix locadlstorage api getlength (#1377) 2018-07-06 17:03:56 +08:00
W-MTZing 12d91c2f2d [feature] localStorage add api getKey and length (#1371) 2018-07-06 09:22:38 +08:00
Jare Guo 9ca8585eca Merge pull request #1368 from cocos-creator/v1.9-release
sync branch
2018-07-04 23:03:30 +08:00
Knox 2a93a220d5 import java.util.regex.Matcher and Pattern package to Cocos2dxEditBox.java (#1361) 2018-07-04 15:59:57 +08:00
Knox d3d6e8865c fix fireball/issues/7726 (#1339)
* fix fireball/issues/7726

* refine code
2018-07-02 15:23:51 +08:00
minggo 3d51994bc8 readd jar files (#1350) 2018-06-29 15:47:06 +08:00