Commit Graph

688 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
江战
c7664a7a40 allow user update var (#11011) 2022-05-10 11:06:37 +08:00
qiuguohua
11c14e70e5 Delete qnx related redundant files (#10741)
Co-authored-by: qiuguohua <862332094@qq.com>
2022-04-13 09:48:30 +08:00
江战
4efa771d35 3.5 add cmake hooks support for cocos-service (#10691) 2022-04-08 13:44:57 +08:00
timlyeee
748178c0c0 exclude arm64 arch and specify x86_64 for iosimulator by default (#10679) 2022-04-07 15:55:09 +08:00
Zeqiang Li
214bd51b34 add [keep] attribute to java class in project cfg (#10641)
* add [keep] attribute to java class in project cfg
2022-04-02 14:15:28 +08:00
Cocos Robot
f28c81eb82 [ci skip][AUTO]: Automated clang-format update: 86ccb8bca5 (#10607) (#10614)
Co-authored-by: cocos-robot <cocos-robot@cocos.com>
2022-03-31 18:16:19 +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
mmyduckx
8747790eda fix ios enter forground crash by useless appDelegateBridge (#10580) 2022-03-30 08:33:52 +08:00
qiuguohua
9a5f43d80c Modify the application interface name and remove the js keyword (#10556)
* Modify the application interface name and remove the js keyword
2022-03-29 15:08:49 +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
qiuguohua
893643d278 V3.5.0 appdelegate (#10509)
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

* Move appdelegate into template

* Optimize the main function of IOS

* Move view.mm into template

* Modify file copyright information

* Modify the addition location of view.mm

* Engine remove dependency SDKWrapper
2022-03-26 19:35:47 +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
mmyduckx
14653478a5 fix ios icon res lost (#10336) 2022-03-14 16:51:15 +08:00
yangchao
87f795d572 fix : linux build use static link. need add sndio lib (#10186)
* fix : linux build use static link

* update config.json
2022-02-25 17:54:44 +08:00
江战
b950739cb7 sync #4261 (#10152)
https://github.com/cocos-creator/engine-native/pull/4216
2022-02-23 10:44:42 +08:00
yangchao
2b50252397 V3.5.0 (#10133)
* add linux cmake template
2022-02-21 09:57:25 +08:00
Yun Hsiao Wu
5524b5c5d4 nx adaptation framework (#4050) 2021-12-14 15:04:57 +08:00
minggo
0db30a6523 merge develop 2021-12-07 15:26:33 +08:00
timlyeee
1d0d0443ec Remove task detect code, use singleTask only for android4.4+ (#4073)
* No need to use task detect code anymore, singleTask property can fit it.
* Export game activity, so that the game can be opened outside. It also force required in Android Api 31 (Android 13)
2021-12-02 15:08:20 +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
oahcy
5379e6ef35 引擎适配linux平台 (#4035) 2021-11-29 17:17:15 +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
江战
eefa8d3de8 skip Xcode update (#4058) 2021-11-22 10:53:57 +08:00
timlyeee
810f90f854 Fix restart issue (#4008) 2021-11-15 14:03:25 +08:00
Zeqiang Li
9e215bd39b mac memless compile issue (#4037) 2021-11-09 09:59:50 +08:00
timlyeee
9471249a02 Add ENABLE_SANDBOX option (#4029)
Add option for compile step
2021-11-02 19:25:46 +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
江战
88e708af51 fix OHOS compile error https://github.com/cocos-creator/3d-tasks/issues/9600 (#4006) 2021-10-27 09:53:18 +08:00
mmyduckx
56f1226a3a update LanunScreenBackgroudLandsacpe pic (#3959) 2021-10-09 11:52:53 +08:00
mmyduckx
ddcf673d8d add ios launchscreen switch according to edit cfg (#3946) 2021-09-30 15:43:50 +08:00
江战
e4e019561d remove if constexpr (#3921) 2021-09-27 09:09:52 +08:00
江战
5074a5a826 V3.4.0 usec++14 (#3898)
This reverts commit fff4cc8fc94fb9b1a8424a2b89e9966184c6c4ce.
2021-09-18 13:53:58 +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
minggo
d261e62ecc merge v3.3.0 and fix conflict 2021-08-13 22:28:13 +08:00
江战
d4ba1fed97 Revert cc_app_name (#3826) 2021-08-13 16:03:48 +08:00
江战
4412d9d408 revert android dbg pkg name (#3816) 2021-08-11 08:42:47 +08:00
mmyduckx
7686705eeb remove jsb_module-register.cpp from native (#3776) 2021-08-05 16:14:53 +08:00
江战
5f5a65797e 3.3 android appname (#3793)
* update android appname

* change build dir

* update template
2021-08-03 13:57:39 +08:00
江战
2253ac3a48 3.3 windows template merge (#3718) 2021-07-16 11:17:17 +08:00
timlyeee
41b274d52d Add App Sandbox for Mac OSX application (#3685)
https://github.com/cocos-creator/3d-tasks/issues/7352 Use Cmake to enable app sandbox configuration
2021-07-06 09:57:46 +08:00
timlyeee
d7f1d3cc87 V3.3.0 x64 adaptation (#3673) 2021-07-01 17:40:20 +08:00
江战
e06c890444 V3.3 ohos patch gles2 (#3657) 2021-06-25 20:57:04 +08:00
minggo
2e364edd24 merge v3.2 to v3.3 2021-06-22 17:38:07 +08:00