Commit Graph

14 Commits

Author SHA1 Message Date
qiuguohua 6e693451a5 deviceevent related issues (#11308)
* dispatchOrientationChangeEvent is not called
2022-06-01 14:47:18 +08:00
bofeng-song b3c62b9597 Suspend game thread after it has been running in the background for a… (#11112)
* Suspend game thread after it has been running in the background for a specified amount of time
* Use the macro switch to decide whether to enable thread pause  & remove unneeded code
2022-05-18 15:43:55 +08:00
bofeng-song 4e6a2f1be3 Android: support exit procedure (#10937) 2022-05-11 18:13:53 +08:00
minggo 271cc5cf23 Remove some format rule (#10919)
* remove some rules
* format all codes with new format rule
2022-05-04 13:09:24 +08:00
bofeng-song ef7d80f8ae integrate game-activity (#10794) 2022-04-22 13:48:43 +08:00
minggo a6bf766170 Merge branch 'v3.5.0' into v3.6_merge_v3.5 2022-03-29 18:26:40 +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
minggo 7f24f34b22 Merge branch 'v3.5.0' into v3.6_merge_v3.5.0 2022-01-25 19:52:06 +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
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