42 Commits

Author SHA1 Message Date
minggo
5663b38e33 Merge branch 'v3.8.2' into develop-merge-v3.8.2
Conflicts:
	cocos/3d/assets/mesh.ts
	editor/inspector/contributions/node.js
	editor/inspector/utils/prop.js
	native/cocos/3d/assets/Mesh.h
	native/cocos/engine/Engine.cpp
	native/cocos/renderer/gfx-gles3/GLES3Commands.cpp
	native/cocos/renderer/pipeline/custom/NativePipeline.cpp
	native/external-config.json
2023-08-31 14:41:18 +08:00
oahc09
56417f35b0 improve:adjust xr begin/end render frame call's position (#16021)
(Calculate the correct delta time)
2023-08-18 15:11:35 +08:00
bofeng-song
acab20f348 fix multi touch cause crash on Android platform (#15796) 2023-07-24 10:21:39 +08:00
江战
5f71d04aac Filp the y-axis value for stick (#15570) 2023-06-28 18:21:29 +08:00
江战
8c41446e96 Add Android GPG keyboard & Mouse support (#15385)
* Add Android GPG keyboard & mouse support
2023-06-08 21:42:45 +08:00
minggo
a22d16bbe6 Merge branch 'v3.7.3' into merge_v3.7.3 2023-04-24 11:26:58 +08:00
bofeng-song
3a9ea052f3 Fix the crash problem of android platform caused by windowId being 0 (#14670) 2023-03-27 16:11:05 +08:00
江战
181bbc6569 Android: Game Activity Supports Controller Integration (#14625)
* Android Game activity support Controller
2023-03-24 13:44:09 +08:00
James Chen
937eb10402 [android] Remove dependence of Activity, prepare for surface-less rendering (#14612)
* Use `context` instead of `activity` as possible.

* Remove unused JniNativeGlue.h include.

* Remove unused import.

* Update JniHelper.h/.cpp, JniHelper::sActivity -> JniHelper::sContext.

* Fix log output name in CocosHelper.java

* Rename the second parameter JniHelper::init from `activity` to `context`.

* Update todo in JniHelper::getActivity()
2023-03-21 11:54:23 +08:00
santy-wang
0a81bf445e Merge branch 'develop' of github.com:cocos-creator/engine into v3.7.2 2023-03-13 16:51:47 +08:00
oahc09
85a400998a feat:xr support adb command controller/activity lifecycle callback (#14334)
* feat:support adb command controller/activity lifecycle callback to native xr

* improve:replace getInterface<IXRInterface>() with CC_GET_XR_INTERFACE()
2023-02-24 16:37:23 +08:00
qiuguohua
ee86fc40bd Native platform modifies exit process (#14141) 2023-02-15 17:11:28 +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
qiuguohua
dac1b5025f 1、Fix the problem of Harmony not running (#13735)
2、Modify setassetmanager to setAssetManager
2022-12-08 13:36:41 +08:00
oahc09
0dd67aee0b fix:android activity jni global reference leak (#13631)
* fix:android activity jni global reference leak

* improve:only release jniObjectActivity,keep classloader
add nullptr check for classloader to avoid new global reference many times
2022-12-07 11:48:03 +08:00
江战
280fd976bc Add EventTarget & EventBus (#13100) 2022-10-28 15:44:33 +08:00
林玮
eab2d646c6 Change windowHandle to windowId when EVENT_DESTROY_WINDOW (#12848)
* Change windowHandle to windowId when EVENT_DESTROY_WINDOW

* fix: resolution issue on iOS
2022-09-22 15:45:56 +08:00
minggo
bd0fcc67c4 move cocos/core/pipeline to cocos/rendering (#12797)
* move cocos/core/pipeline to cocos/rendering
2022-09-16 16:10:26 +08:00
林玮
785fd91511 Add multi-windows support (#12243)
Co-authored-by: bofeng.song <bofeng.song@chukong-inc.com>
2022-09-15 14:55:44 +08:00
bofeng-song
1cb8a2aec7 [bug] Fixed that some key events were not dispatched (#12744) 2022-09-13 17:26:25 +08:00
bofeng-song
526e41bfa8 [bug] fix game thread block by set wrong _loopTimeOut (#12724)
* [bug] fix game thread block by set wrong _loopTimeOut
2022-09-08 18:23:05 +08:00
QingliWang
6a8f53b186 Add features for XR developement. (#12413)
* Change Android mainloop, add global config and template projects for XR.

* Change gfx/gles device's process flow for XR, working with other PRs, waiting.

* Change gfx/Vulkan device's process flow for XR, working with other PRs, waiting.

* Change render process for XR.

* Develop XR input and events.

* Develop 3D feature of UI widgets and raycast effect for XR.

Co-authored-by: fqamic <fqamic@vip.qq.com>
2022-08-22 16:34:45 +08:00
minggo
5778aab354 Merge branch 'v3.6.0' into merge_v3.6 2022-08-08 10:49:46 +08:00
bofeng-song
c8d5ecf248 only dispatch changed touch event to ts (#12285)
* only dispatch changed touch event to ts
2022-08-01 14:16:26 +08:00
minggo
d40b8739bc Merge branch 'v3.6.0' into develop_merge_v3.6 2022-07-18 10:38:14 +08:00
bofeng-song
113fad0259 refine: rename windowHanler to windowHandle, rename onDestory to onDestroy (#11907) 2022-07-09 13:54:18 +08:00
timlyeee
b43de1af07 V3.6.0 exit (#11856) 2022-07-07 14:07:47 +08:00
bofeng-song
f7c129ca1c Fix non-foreground state processing time-consuming tasks, resulting in anr (#11406)
* Fix non-foreground state processing time-consuming tasks, resulting in anr
2022-06-09 16:49:57 +08:00
qiuguohua
6e693451a5 deviceevent related issues (#11308)
* dispatchOrientationChangeEvent is not called
2022-06-01 14:47:18 +08:00
bofeng-song
b3c62b9597 Suspend game thread after it has been running in the background for a… (#11112)
* Suspend game thread after it has been running in the background for a specified amount of time
* Use the macro switch to decide whether to enable thread pause  & remove unneeded code
2022-05-18 15:43:55 +08:00
bofeng-song
4e6a2f1be3 Android: support exit procedure (#10937) 2022-05-11 18:13:53 +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
bofeng-song
ef7d80f8ae integrate game-activity (#10794) 2022-04-22 13:48:43 +08:00
minggo
a6bf766170 Merge branch 'v3.5.0' into v3.6_merge_v3.5 2022-03-29 18:26:40 +08:00
qiuguohua
b6af1ada02 V3.5.0 create window (#10481)
* 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

* Fix empty platform implementation

* Fix empty platform implementation

* Modify mac and ios createwindow interface

* Create a centered window by default

* Mobile platforms do not require window creation
2022-03-25 18:43:17 +08:00
Cocos Robot
da2bb3c5db [ci skip][AUTO]: Automated clang-format update: f9971a5a25 (#10327) (#10478)
Co-authored-by: cocos-robot <cocos-robot@cocos.com>
2022-03-24 18:02:46 +08:00
Zeqiang Li
e64301ad34 3.5.0 swappy (#10327)
* gles2/3 swappy
* vk swappy
* manually fallback in GL

Co-authored-by: Zeqiang Li <zeqiang-li@outlook.com.com>
2022-03-24 15:37:38 +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
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