Commit Graph

382 Commits

Author SHA1 Message Date
bofeng-song a2afcd2cdb disable gametick after enter background(revert to logic to version 3.4.2) (#11095) 2022-05-14 18:33:36 +08:00
bofeng-song 3a3e71632d disable sensor by default, game developer can enable it by set 'acce… (#10770)
* disable sensor by default,  game developer can enable it by set 'accelerometerEnable' to true
2022-04-15 09:49:56 +08:00
bofeng-song 0fc5ff79be fix ndkPath not work (#10627) 2022-04-01 13:39:45 +08:00
江战 909c9df9e9 prevent class CocosWebSocket from obfuscation in release mode (#10511) 2022-03-26 11:00:42 +08:00
qiuguohua b6af1ada02 V3.5.0 create window (#10481)
* 1. Modify the parameters of the creation window
2. Modify the relationship between platform and interface
3. Rename vibrate to vibrator in linux and QNX

* Fix empty platform implementation

* Fix empty platform implementation

* Modify mac and ios createwindow interface

* Create a centered window by default

* Mobile platforms do not require window creation
2022-03-25 18:43:17 +08:00
Cocos Robot da2bb3c5db [ci skip][AUTO]: Automated clang-format update: f9971a5a25b7a78c29f81b633160a7b55ee1cc97 (#10327) (#10478)
Co-authored-by: cocos-robot <cocos-robot@cocos.com>
2022-03-24 18:02:46 +08:00
Zeqiang Li e64301ad34 3.5.0 swappy (#10327)
* gles2/3 swappy
* vk swappy
* manually fallback in GL

Co-authored-by: Zeqiang Li <zeqiang-li@outlook.com.com>
2022-03-24 15:37:38 +08:00
kenshin 93f37f2b82 Optimize android download tasks. (#10274) 2022-03-21 19:53:11 +08:00
qiuguohua 94f42b3c4b Add dynamic library export macro (#10393)
* Add dynamic library export macro
2022-03-21 11:17:11 +08:00
江战 cb0618f0d4 3.5 Android: okhttp impl websockets (#10384) 2022-03-21 09:46:49 +08:00
bofeng-song 65e89c2094 fix translucent problem due to SurfaceView‘s limit (#10228) 2022-03-02 17:47:27 +08:00
bofeng-song 141128f148 refine context2d, reduce call from native to js (#10211)
* reduce c++ callback to js
2022-03-02 09:56:00 +08:00
timlyeee f175150b6c Cherry pick from v3.4.2 (#10182)
* supply a default context when surface destroyed (#4222)

* Fix loop audio would stop for ios system (#4254)

* IOS system has an uncertain state between foreground and background, and our condition sometimes miss the point to load buffers.
* Queue for 3 buffers might be too short to live, use 4 or even more instead.

* Use same mtx for write (#4220)
2022-02-25 13:52:31 +08:00
minggo f08555248f fix conflict 2022-01-24 17:23:03 +08:00
Yun Hsiao Wu 14a17c9d22 license upgrade (#4210) 2022-01-24 17:18:47 +08:00
minggo 1552345596 Merge branch 'v3.4.2' into v3.5.0_merge_v3.4.2
Conflicts:
	cocos/platform/android/jni/JniCocosActivity.cpp
	cocos/platform/apple/JsbBridgeWrapper.mm
	cocos/platform/ohos/jni/JniCocosAbility.cpp
	cocos/renderer/gfx-metal/MTLCommandBuffer.mm
	external/config.json
2022-01-24 15:01:01 +08:00
timlyeee 83ecd19721 Divide foreground tasks and all-time tasks (#4206)
* Add JsbBridgeWrapper for ohos

* Divide Foreground tasks and all-time tasks

* implement a taskQ class

* Add ohos support
2022-01-24 10:25:05 +08:00
江战 8154648490 3.4.1 Android: Java flush game thread tasks (#4193)
* fix run on game thread

* save

* just flush java tasks, do not run gameTick

* reduce timeout to 50
2022-01-19 12:40:20 +08:00
minggo c0bdd3c0d8 Merge branch 'v3.4.1' into merge_v3.4.1
Conflicts:
	cocos/bindings/event/EventDispatcher.cpp
	cocos/platform/android/jni/JniCocosActivity.cpp
	cocos/platform/apple/JsbBridge.mm
	cocos/platform/java/jni/JniCocosOrientationHelper.cpp
	cocos/platform/win32/CanvasRenderingContext2D-win32.cpp
2022-01-07 18:36:14 +08:00
timlyeee b54225e433 Rename JsbBridgeWrapper API (#4130) 2022-01-06 16:58:37 +08:00
timlyeee b5c40837c8 add JsbBridgeWrapper(#4125) 2022-01-04 13:38:23 +08:00
江战 ff533953ab allow tick() in background (#4083) 2021-12-21 15:50:45 +08:00
minggo 6a39170890 Merge pull request #4095 from cocos-creator/v3.4.0
V3.4.0
2021-12-09 13:35:32 +08:00
timlyeee 0a74bcf92d Fix Editbox bug (#4091)
[ Bug ] For android API 18, edit-box's text would be occluded.
2021-12-08 17:39:35 +08:00
minggo ac7418f1c1 fix conflict 2021-11-30 10:48:30 +08:00
qiuguohua 063a79df84 Sync v3.4 to develop (#270)
* [ci] compile ios verbose (#3978)

* [v3.4.0] [ci] compile ios verbose (#3974

* Merge the code of v3.3.1 platform adaptation layer into the development branch (#3958)

* 1、Merge platform adaptation layer code into the development branch
2、It passed the test in windows and ohos system

* 1、Merge platform adaptation layer code into the development branch
2、It passed the test in windows and ohos system

* 1、Fix github compile windows error

* 1、Fix github compile windows error

* 1. Adjust the code format;
2. Fix js automatic generation binding
3. Adjust github CI compilation

* 1. Adjust the code format;
2. Fix js automatic generation binding
3. Adjust github CI compilation

* Solve mac and ios compilation failure

* Fix the problem of compilation of Windows-side simulator

* 1. Adapt the simulator to a new adaptation layer;
2. Fix the compilation warning of ios, and the implicit conversion failed;
3. Fix the mac compilation error, due to the problem of adding the link identification -all_load;

* 1.Add the isDisplayStats and setDisplayStats method to the screen interface

* Fix clang-tidy compilation warning

* Fix clang-tidy compilation warning

* Repair the emulator, compatible with mac and win

* 1、Repair detailed errors, including name modification and calling method modification
2、Delete redundant files in the template directory
3、Change the vibrate interface to vibrator
4、Fix word spelling errors

* Rename interfaces to modules

* Replace CC_ASSERT with CCASSERT

* Replace CC_ASSERT with CCASSERT

Co-authored-by: qiuguohua <>

* Remove all_flag in IOS (#4014)

* gfx: onAcquire callback (#4038)

* Solve the conflict between cocos/platform and template

Co-authored-by: minggo <nudtzxm@gmail.com>
Co-authored-by: 江战 <40414978+PatriceJiang@users.noreply.github.com>
Co-authored-by: Yun Hsiao Wu <yunhsiaow@gmail.com>
2021-11-30 10:13:49 +08:00
oahcy 5379e6ef35 引擎适配linux平台 (#4035) 2021-11-29 17:17:15 +08:00
qiuguohua eeb9d5c689 Merge the code of v3.3.1 platform adaptation layer into the development branch (#3958)
* 1、Merge platform adaptation layer code into the development branch
2、It passed the test in windows and ohos system

* 1、Merge platform adaptation layer code into the development branch
2、It passed the test in windows and ohos system

* 1、Fix github compile windows error

* 1、Fix github compile windows error

* 1. Adjust the code format;
2. Fix js automatic generation binding
3. Adjust github CI compilation

* 1. Adjust the code format;
2. Fix js automatic generation binding
3. Adjust github CI compilation

* Solve mac and ios compilation failure

* Fix the problem of compilation of Windows-side simulator

* 1. Adapt the simulator to a new adaptation layer;
2. Fix the compilation warning of ios, and the implicit conversion failed;
3. Fix the mac compilation error, due to the problem of adding the link identification -all_load;

* 1.Add the isDisplayStats and setDisplayStats method to the screen interface

* Fix clang-tidy compilation warning

* Fix clang-tidy compilation warning

* Repair the emulator, compatible with mac and win

* 1、Repair detailed errors, including name modification and calling method modification
2、Delete redundant files in the template directory
3、Change the vibrate interface to vibrator
4、Fix word spelling errors

* Rename interfaces to modules

* Replace CC_ASSERT with CCASSERT

* Replace CC_ASSERT with CCASSERT

Co-authored-by: qiuguohua <>
2021-10-27 10:51:02 +08:00
江战 adbcee9d4c keep screen on (#4007) 2021-10-27 09:51:48 +08:00
timlyeee 85c52544a5 message channel between Native and JS (#3900)
* Invoke Native Function in JS
* Invoke JS function in Native
Co-authored-by: LX <codingboeuf@jizamaoxuewangdeMacBook-Air.local>
2021-09-29 14:16:30 +08:00
江战 5074a5a826 V3.4.0 usec++14 (#3898)
This reverts commit fff4cc8fc94fb9b1a8424a2b89e9966184c6c4ce.
2021-09-18 13:53:58 +08:00
minggo f3049c0acb merge v3.3.1 to v3.4.0 2021-09-09 11:00:18 +08:00
江战 9675c4fbd0 V3.3.1 fix api 30 crash (#3867) 2021-09-07 09:47:56 +08:00
timlyeee 0a742ad421 Fix issue for android bug (#3852)
* https://forum.cocos.org/t/topic/119306/142
2021-08-26 16:48:46 +08:00
minggo a61b2931dc merge v3.3.0 and fix conflict 2021-08-04 16:43:35 +08:00
江战 5f5a65797e 3.3 android appname (#3793)
* update android appname

* change build dir

* update template
2021-08-03 13:57:39 +08:00
江战 4d2d4d82b5 3.3 some optimization (#3765) 2021-07-27 13:40:02 +08:00
mmyduckx 1fda312b80 fix android hide vitural Button (#3743) 2021-07-20 09:31:26 +08:00
Yun Hsiao Wu 5c88f24b3f misc gfx & fg improvements (#3703) 2021-07-13 14:07:47 +08:00
ref-ptr 34521945db fix vulkan-backend crash on android (#3700) 2021-07-08 16:52:59 +08:00
minggo 785b29bc0d upgrade unzip (#3679) 2021-07-02 13:57:37 +08:00
Lu Ching Wen b11faaf2a2 Fix android App crash issue (#3644) 2021-06-23 17:16:03 +08:00
minggo 2e364edd24 merge v3.2 to v3.3 2021-06-22 17:38:07 +08:00
PP cbab5dd687 fix application lifecycle issue on Android platform (#3478) 2021-06-09 12:01:26 +08:00
Yun Hsiao Wu 448ea846d8 create device in JS (#3598) 2021-06-07 11:10:06 +08:00
江战 a6d3d415a5 3.3 ohos fix compile error (#3586) 2021-06-01 16:56:38 +08:00
江战 b8ae264e5a imporve _fileImageData performance (#3547) 2021-05-25 15:09:26 +08:00
minggo 9354f366e6 fix conflict 2021-05-21 14:59:08 +08:00
mmyduckx 76d15cafa4 send close event to JS (#3527) 2021-05-21 11:37:13 +08:00
江战 a652715f5a Harmony OS support - dont merge (#3528) 2021-05-21 10:43:22 +08:00