Commit Graph

5 Commits

Author SHA1 Message Date
Yun Hsiao Wu 14a17c9d22 license upgrade (#4210) 2022-01-24 17:18:47 +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 c489a8a254 Remove origin code for twice call to java method. (#4114)
* remove use of cc::Device::getDeviceOrientation(), which will call java method again rather than jint rotation.
* Use switch and change it to cc::Device::Orientation, because ROTATION only defined on Android and OHOS.
2021-12-20 15:01:18 +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
江战 a652715f5a Harmony OS support - dont merge (#3528) 2021-05-21 10:43:22 +08:00