Commit Graph

220 Commits

Author SHA1 Message Date
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
minggo 6c9b3f9b4a fix template compiling error on android (#1345) 2018-06-29 14:56:30 +08:00
minggo ea8a45b14f Merge branch 'next' of github.com:cocos-creator/cocos2d-x-lite into merge-develop 2018-06-28 17:49:31 +08:00
W-MTZing 715ac5ae73 [bug] vibrate api Compatible with the higher version SDK (#1341) 2018-06-28 17:48:41 +08:00
minggo 9705967973 move analytics codes to game activity 2018-06-28 16:05:04 +08:00
minggo 5b8919ccdf merge develop branch 2018-06-27 17:27:04 +08:00
W-MTZing 888e1fb4d6 [adjust]change cocos2dxHelper.java function api vibrate SDK Version judgment (#1316) 2018-06-19 10:42:30 +08:00
Vincent Yang 8f6e9adbe1 [feature] CCDownloader add header and abort support. (#1291)
*  [feature] android implement recieve http header param, handle it in android http request (#2)

* [feature] Recieve http header param, handle it in android http request

* [feature] implement abort and header api

* /2.0 -> /2

* remove task when abort

*  [feature] Implement ios and mac downloader abort api (#3)

* [feature] Implement ios and mac downloader abort api

* use DLLOG to show log

* judge NSURLSessionTask state with NSURLErrorCancelled

* [adjust] Modify downloader from auto bind to manually (#4)

* [adjust] Modify Downloader createDownloadFileTask api from auto bind to manually

* Modify ini file

* [bug] fix Cocos2dxDownloader.java syntax error

* [bug] CCDownloader-android creatCoTask don't deleteLocalRef header str
2018-06-07 22:19:03 +08:00
minggo e356ce9225 fix bug that: (#1283)
touch outside of editbox will not close editbox
glsurface view may not has focus when finish editbox input
2018-06-04 11:06:07 +08:00
James Chen 0b85e67caf Supports text with bold. (#1282) 2018-06-02 18:46:12 +08:00
James Chen cf7f3770b7 Supports drawing path API and refactor CCCanvasRenderingContext2D for macOS. (#1280)
* Uses CGBitmapContextCreate instead of NSImage for macOS, the CCCanvasRenderingContext2D is similiar as which on iOS now.

* Supports drawing line API.

* Supports drawing line API for Android too.
2018-06-01 22:59:07 +08:00
minggo fbeb6dd200 Editbox ios support (#1278) 2018-06-01 14:12:03 +08:00
James Chen da45e32ada Removes unused files and code. (#1277) 2018-05-31 17:58:35 +08:00
James Chen 712173a8de Supports DeviceMotionEvent and removes more unused code. (#1275)
* Binds Device class

* Removes ccFPSImage.c/h

* Updates Android.mk

* Supports DeviceMotionEvent and removes more unused code.

* Uses fprintf to implement SE_LOGD & SE_LOGE .
2018-05-31 14:08:20 +08:00
minggo 4ded383b8a fix crash of editbox on Android (#1273) 2018-05-30 14:51:56 +08:00
minggo 7235644283 Editbox support (#1270)
can work on Android
2018-05-28 17:09:57 +08:00
James Chen 61accc6d11 Fixed the issue that text is probably cut. (#1268) 2018-05-28 11:45:07 +08:00
James Chen 391e6e536e Supports text stroke for macOS, iOS and Android. (#1250)
* Supports stroke for mac.

* Supports text stroke for ios.

* Supports text stroke for android.

* typo fix in CanvasRenderingContext2DImpl.java.
2018-05-21 11:38:05 +08:00
James Chen 07cc734c8c setAnimationInterval -> setPreferredFramesPerSecond and binds setPreferredFramesPerSeconds. (#1244)
* setAnimationInterval -> setPreferredFramesPerSecond.

* Binds setPreferredFramesPerSeconds.

* typo fix in CCApplication-win32.cpp
2018-05-16 18:06:26 +08:00
James Chen 58361e1b2d Avoid to create canvas buffer twice. (#1242)
* Avoid to create canvas buffer twice.

* Remove unused condition code in Cocos2dxActivity.java
2018-05-15 11:00:52 +08:00
James Chen 727a4911d4 [runtime] Adds jsb.openURL, __getOSVersion, __getCurrentLanguage interfaces. (#1238) 2018-05-11 16:03:17 +08:00
James Chen 2e71076053 Display whether GL opt mode is enabled. (#1217) 2018-04-26 16:49:02 +08:00
James Chen ae5c569345 Adds jsb.openDebugView interface, supports to display JSB invocation count. (#1214)
* Adds jsb.openDebugView interface, supports to display JSB invocation count.

* Removes unused log in JniImp.cpp.

* Removes unused log in Cocos2dxRenderer.java
2018-04-26 15:59:20 +08:00
James Chen ad94db2c71 Binds getFramebufferAttachmentParameter and fix memory issues in uniform[1234]v. (#1204)
* Binds getFramebufferAttachmentParameter and fix memory issues in uniform[1234]v.

* FPS uses integer.

* revert.

* Removes unused import package.
2018-04-20 17:25:10 +08:00
James Chen f944be8574 Adds DebugView support. (#1203) 2018-04-20 14:53:16 +08:00
James Chen a1321302b4 Rename __gl to __ccgl to avoid conflict. Memory issue fixes in JSB_glGetProgramInfoLog and JSB_glGetShaderInfoLog (#1201)
* Revert "Removes FPS display code in Cocos2dxRenderer.java."

This reverts commit 71984ef41c.

* Rename __gl to __ccgl to avoid conflict.

* memory issue fixes in JSB_glGetProgramInfoLog and JSB_glGetShaderInfoLog

* Adds FIXME for FPS display in Cocos2dxRenderer.java.
2018-04-20 10:35:33 +08:00
James Chen 71984ef41c Removes FPS display code in Cocos2dxRenderer.java. 2018-04-19 13:55:37 +08:00
James Chen 22c9dd2b5a FPS output., file:// scheme check. glTexSubImage2D binding fix. 2018-04-12 14:57:34 +08:00
Joseph Pan 86607a472e avoid a NullPointerException when domain is null (#1186)
* avoid a NullPointerException when domain is null

* catch NullPointerException for new URI operation
2018-04-08 09:44:29 +08:00
James Chen 73eb73c690 [android] textAlign supports 'middle'. recreate buffer in the constructor of CanvasRenderingContext2D. (#1172)
* [android] textAlign supports 'middle'. recreate buffer in the constructor of CanvasRenderingContext2D.

* bug fix in CanvasRenderingContext2DImpl.java

* java version 1.8
2018-03-29 15:50:38 +08:00