Commit Graph

19 Commits

Author SHA1 Message Date
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
timlyeee f8282bf1ff [bug fix]Use macro to set XXTEAKEY (#10607)
* [bug fix]Use macro to set XXTEAKEY
2022-03-31 17:27:56 +08:00
qiuguohua 051e034f3f Put main.cpp in the template (#10543)
* Put main.cpp in the template
2022-03-28 18:03:51 +08:00
江战 437e50692c V3.5 simplify native templates (#10479) 2022-03-25 11:25:07 +08:00
江战 b455e7fc86 V3.5 rename assets (#10443)
* add resources

* fix order

* ignore _external
2022-03-22 18:07:50 +08:00
timlyeee 7d7f32e24e rename windows process name (#10422)
* remove file description in game.rc, the process name  will keep the same as project name
* add macro definition GAME_NAME for creating window, as no other way to read it.
2022-03-22 10:29:25 +08:00
Yun Hsiao Wu 5524b5c5d4 nx adaptation framework (#4050) 2021-12-14 15:04:57 +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
timlyeee c84e51fbb3 Use large address for memory alloc in big scene (#4063)
* Use large address for memory alloc in big scene

* Divide win32 and win64
2021-11-24 15:24:27 +08:00
timlyeee 810f90f854 Fix restart issue (#4008) 2021-11-15 14:03:25 +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
江战 e4e019561d remove if constexpr (#3921) 2021-09-27 09:09:52 +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
mmyduckx f049a58ae2 update icon for all platforms and Appsimulator (#3853) 2021-08-31 19:46:25 +08:00
mmyduckx 7686705eeb remove jsb_module-register.cpp from native (#3776) 2021-08-05 16:14:53 +08:00
江战 2253ac3a48 3.3 windows template merge (#3718) 2021-07-16 11:17:17 +08:00