minggo fca089c6f3 Merge branch 'v3.8.2' into develop-merge-v3.8.2 ...

Conflicts:
	.gitignore
	cocos/2d/components/deprecated.ts
	cocos/2d/components/label-outline.ts
	cocos/2d/components/label.ts
	cocos/3d/assets/mesh.ts
cocos/3d/misc/mesh-codec.ts
	cocos/core/geometry/geometry-native-ext.ts
cocos/core/settings.ts
	cocos/gfx/webgpu/webgpu-define.ts
	cocos/input/input.ts
	cocos/render-scene/core/pass.ts
	cocos/rendering/custom/compiler.ts
	cocos/rendering/custom/executor.ts
cocos/rendering/custom/pipeline-define.ts
	cocos/rendering/custom/web-pipeline.ts
	cocos/rendering/render-additive-light-queue.ts
	cocos/webgpu/instantiated.ts
	native/cocos/editor-support/spine-wasm/spine-type-export.cpp
	native/cocos/platform/SDLHelper.cpp
	native/cocos/platform/SDLHelper.h
	native/external-config.json
	package-lock.json
	package.json
	pal/env/src/native/env.ts
	pal/screen-adapter/native/screen-adapter.ts
	tests/init.ts

2023-09-21 14:40:57 +08:00

3.9 KiB

Raw Permalink Blame History

View Raw