Commit Graph

3058 Commits

Author SHA1 Message Date
wdzhangchukong 4ecd996868 Declare JSB_WebSocketDelegate in hpp file (#1517) 2018-09-25 17:54:55 +08:00
Jare Guo bf7a01bdd5 Merge pull request #1508 from cocos-creator/v2.0-release
sync branch
2018-09-12 14:50:13 +08:00
CocosRobot eeed4931a5 [AUTO][ci skip]: updating cocos2dx_files.json (#1503) 2018-09-10 10:23:52 +08:00
leda c74745eee4 add "getSafeAreaEdge" interface to get SafeArea edge insets (#1502)
* try to resume iPhone X support

* gen binding code

* only get SafeAreaEdge on native

* add getSafeAreaEdge for others

* update binding-generator
2018-09-10 10:14:23 +08:00
leda 4ca166e109 dispatch show/hide event to js, included "cocos simulator" (#1500)
* add dispatchEnterBackgroundEvent for simulator

* more stable when set canvas size on win32

* add isNan check for float & double

* simplify event dispatch on AppDelegate
2018-09-06 16:39:45 +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
W-MTZing d27e5a798c remove log names about cocos (#1496) 2018-09-05 10:51:42 +08:00
CocosRobot f37a259dd8 [ci skip][AUTO]: updating jsbinding automatically (#1495) 2018-09-04 13:53:50 +08:00
wdzhangchukong 21377fdb74 Remove names about Cocos (#1494) 2018-09-04 13:41:02 +08:00
leda 92b21a2264 add "launchmode" and "taskAffinity" on android (#1493) 2018-09-04 09:53:50 +08:00
leda 0fb1c97e83 support to save render texture data by "saveImageData " (#1492)
* add jsb.savePixelsToFile to support screenshot

* add return value for
 savePixelsToFile

* rename: savePixelsToFile -> saveImageData
2018-09-03 09:38:52 +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 09985f002b adapt to fps in the main loop on mac (#1489) 2018-08-30 12:48:34 +08:00
leda 45fe1feb9e adapt to fps in the main loop on win32 (#1488) 2018-08-30 09:47:31 +08:00
leda dc08f260e2 fix random red text error when draw multi line text on win32 (#1487) 2018-08-29 17:44:18 +08:00
leda 55eeb6f53e update travis work branch to "v2.0-release" (#1486)
* update travis branch

* another space line
2018-08-29 10:22:00 +08:00
minggo f071c753d2 Merge pull request #1485 from cocos-creator/merge-rename
Merge rename
2018-08-28 14:41:26 +08:00
minggo b642e0fcc7 Merge branch 'v2.0-release-rename' of github.com:cocos-creator/cocos2d-x-lite into merge-rename 2018-08-28 14:39:40 +08:00
W-MTZing 4aef0de085 fix C++ call java by macro (#1483) 2018-08-28 09:58:24 +08:00
leda c647a76959 improve text texture RGB value on win32 (#1473)
* fix text texture RGB error on win32

* keep alpha value, no change
2018-08-28 09:47:16 +08:00
CocosRobot 4b4476b008 [AUTO][ci skip]: updating cocos2dx_files.json (#1482) 2018-08-27 18:21:14 +08:00
wdzhangchukong e00113cfd6 Get jsb by __jsbObj (#1481) 2018-08-27 11:48:22 +08:00
CocosRobot 81301ca4b4 [ci skip][AUTO]: updating jsbinding automatically (#1480) 2018-08-24 20:43:09 +08:00
wdzhangchukong b44c2a68dc Change cocos2dx_auto to jsb (#1479) 2018-08-24 20:26:11 +08:00
CocosRobot 80fdcd0e74 [ci skip][AUTO]: updating jsbinding automatically (#1477) 2018-08-24 17:45:25 +08:00
Vincent Yang 3d2a9017bb [bug] loadImage don't call js callback when input path is invalid (#1478) 2018-08-24 17:42:15 +08:00
wdzhangchukong bf27fdd955 Rename cc in JSB (#1476)
* Rename __ccgl to __gl

* Rename __CCPrivateData to __PrivateData

* Change CanvasRenderingContext2D to global

* Change CanvasRenderingContext2D to global

* Change getDeviceMotionValue into Device

* Change FileUtils to global

* Change AudioEngine to global

* Change AudioEngine into Audio

* Remove cc in c++

* Remove __jsc__

* Change auto file template

* Name jsb_cocos2d_global to auto

* Reset jsb_cocos2dx_auto

* Register jsb_cocos2dx_global_auto
2018-08-24 17:03:50 +08:00
W-MTZing 9e28e3420f fix JNI call bug (#1475) 2018-08-24 14:00:48 +08:00
leda 463e37e4d8 fix no sleep in main loop on mac (#1472) 2018-08-23 16:25:10 +08:00
leda 92ecd88786 don't set color for un-covered pixel when drawText on win32 (#1471)
* don't set color for un-covered pixel

* replace tab with space
2018-08-22 18:01:55 +08:00
minggo 139cc8b7ed jni support passing null string to java (#1469) 2018-08-22 17:25:25 +08:00
Vincent Yang 72e0b0ce5f [bug] fix include CCGL-android.h path typo. (#1470) 2018-08-22 15:49:24 +08:00
minggo 21bed61d4d Update .travis.yml 2018-08-22 15:11:20 +08:00
W-MTZing 935a759cf4 rename c++ call java function by macro (#1468) 2018-08-22 14:07:17 +08:00
W-MTZing e284a0efd1 rename jni function by macro (#1467)
* rename jni function by macro

* modify JNI macro name
2018-08-22 09:21:35 +08:00
leda 2943b4ccf8 fix keyboard location calc error (#1466) 2018-08-21 16:01:40 +08:00
CocosRobot addd3ecf60 [AUTO][ci skip]: updating cocos2dx_files.json (#1465) 2018-08-21 14:24:55 +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
leda 3ee2b972ea correct "fastSet" wrong usage in "writeStringToFile" (#1462)
* correct crash due to double free same address

* do Data free only if malloc

* Revert "do Data free only if malloc"

This reverts commit 1586793adea4e4da240e37a5d2237d16bc5eadd4.
2018-08-20 10:36:45 +08:00
leda 9df2e0dcfa fix EditBox input Chinese error on iOS (#1460)
* fix input error when using 9 Key to input chinese

* textFieldDidChange callback works

* correct markedTextRange condition error

* do same adapt on textView
2018-08-17 09:47:33 +08:00
吴智明 5656a04593 remove facebook_id from gradle.properties (#1459) 2018-08-16 15:45:56 +08:00
Jare Guo 548ae4380d Merge branch 'v2.0-release' into next 2018-08-16 14:05:09 +08:00
leda 3873d01bdd fix depend error on application.h (#1458)
* correct event type

* move isDisplayStats Impl from header to source file

* correct header file depend for application-ios

* same header changes on win32
2018-08-16 13:34:36 +08:00
leda a7f266b9e8 resume View Menu for simulator on mac & win32 (#1456)
* start add menu back

* simulator resume works

* readded scale feature, fix exit bug

* free SetupUI, and fix compile only

* adapt to CustomEvent from struct to class

* resume show/hide FPS feature

* Revert "free SetupUI, and fix compile only"

This reverts commit fd8cf5ca0a17ba62ae5dec46fefea3b58c267c9d.

* Revert "Revert "free SetupUI, and fix compile only""

This reverts commit 6e5934a583db286508d00a61a22e11a3325090f1.

* correct EXIT logic

* scale works

* show/hide fps works

* remove unneed menu, replace tab with space

* remove debug output info

* no need _isShowFPS member

* fix NSError init error
2018-08-16 09:34:47 +08:00
Jare Guo a598118378 Merge commit '89a5de781434ecf9acbbee1850ea05687dc4a763' into v2.0-release 2018-08-14 10:31:22 +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
Arnold 89a5de7814 Win32 xmlhttprequest timeout (#1455) 2018-08-14 09:44:13 +08:00
Jare Guo 52c1a75816 update readme (#1457) 2018-08-13 22:42:36 +08:00
Arnold 0f3adb84f7 win32: fix invoke update() multi times with same dt (#1454) 2018-08-13 18:03:12 +08:00