Commit Graph

16 Commits

Author SHA1 Message Date
江战 cdfd194c4c Add HPE Feature Detetion and JNI Method Refactoring (#14633) 2023-03-26 16:26:45 +08:00
pandamicro afd22296b4 MIT license update and to new year 2023 (#13927)
* Cpp MIT license update and to date
* TS MIT license update and to date
2022-12-28 11:25:12 +08:00
OnlyKoei e0cd2932b7 Update Android KeepScreenOn handling (#13746) 2022-12-08 17:47:42 +08:00
timlyeee b43de1af07 V3.6.0 exit (#11856) 2022-07-07 14:07:47 +08:00
James Chen d8761f60a8 Fix the linking error if audio module is disabled in project configuration. (#10940) 2022-05-05 17:58:34 +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
Cocos Robot a2df4e4dbd [ci skip][AUTO]: Automated clang-format update: 771de57fc2c1edbaaf3ae94e77f9801b0379cc6c (#10469) (#10472)
Co-authored-by: cocos-robot <cocos-robot@cocos.com>
2022-03-24 13:50:39 +08:00
minggo 7f4cb9e3b1 Remove string (#10469)
* replace std::string with ccstd::string
2022-03-24 11:53:10 +08:00
bofeng-song 4b92dfd675 support audiofocuschange for android (#10246)
* support audiofocuschange for android
2022-03-08 10:20:46 +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
minggo 5410a48a58 Implement more logic in native (#4131)
Co-authored-by: bofeng.song <bofeng.song@chukong-inc.com>
Co-authored-by: dumganhar <dumganhar@gmail.com>
Co-authored-by: mmyduckx <308303735@qq.com>
Co-authored-by: Patrice Jiang <397136899@qq.com>
Co-authored-by: 江战 <40414978+PatriceJiang@users.noreply.github.com>
2022-01-07 18:39:40 +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