15 Commits

Author SHA1 Message Date
qiuguohua
e68506916c Develop branch adapts to openharmony (#14582) 2023-03-20 14:18:52 +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
江战
046a2b1378 Re-impl CC_ASSERT & CC_ASSERTF (#13588) 2022-12-05 17:12:30 +08:00
minggo
3e818c45c9 Change macro name (#11528)
* CC_PLATFORM_MAC_IOS -> CC_PLATFORM_IOS

* CC_PLATFORM_MAC_OSX -> CC_PLATFORM_MACOS

* add codes to keep compatible
2022-06-16 14:05:16 +08:00
minggo
f07d3f3bda Merge branch 'v3.5.1-ds' into v3.6.0_merge_v3.5.1-ds 2022-06-07 15:02:34 +08:00
yangchao
d87262dead V3.5.1 ds servermode (#11207) 2022-05-25 09:39:16 +08:00
pandamicro
baafb1f4d3 Revert "V3.5.1 no window (#11016)" (#11071)
This reverts commit bd1c1e0088.
2022-05-14 10:20:44 +08:00
yangchao
bd1c1e0088 V3.5.1 no window (#11016) 2022-05-12 09:43:46 +08:00
minggo
84c27e7f71 Merge branch 'v3.5.0' into v3.6.0_merge_v3.5 2022-04-24 13:41:27 +08:00
qiuguohua
4450700cc5 Design flaw, conflicts between initializing the default platform and … (#10711)
* Design flaw, conflicts between initializing the default platform and creating a custom platform

* Fix the error of clang-tidy

Co-authored-by: qiuguohua <862332094@qq.com>
2022-04-11 13:56:07 +08:00
Cocos Robot
c3f2f4a1cb [ci skip][AUTO]: Automated clang-format update: 3b49861e5f (#10261) (#10267)
Co-authored-by: cocos-robot <cocos-robot@cocos.com>
2022-03-09 13:38:22 +08:00
yangchao
e9e47b9dba do not create window in server mode (#10161)
* add no window impl
* add empty win impl file
2022-02-24 14:41:04 +08:00
Yun Hsiao Wu
14a17c9d22 license upgrade (#4210) 2022-01-24 17:18:47 +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