minggo
|
7ef995b655
|
Merge branch 'v3.8.0' into v3.8.1-merge-v3.8.0
Conflicts:
cocos/3d/lights/spot-light-component.ts
cocos/animation/event/event-emitter.ts
cocos/physics-2d/box2d/physics-contact.ts
cocos/physics-2d/box2d/physics-world.ts
cocos/physics-2d/box2d/platform/physics-contact-listener.ts
cocos/physics-2d/builtin/builtin-world.ts
cocos/physics/framework/components/constraints/configurable-constraint.ts
cocos/spine/assembler/simple.ts
cocos/spine/skeleton.ts
native/cocos/editor-support/spine-wasm/spine-model.cpp
native/cocos/editor-support/spine-wasm/spine-model.h
native/cocos/editor-support/spine-wasm/spine-skeleton-instance.cpp
native/cocos/editor-support/spine-wasm/spine-skeleton-instance.h
native/cocos/editor-support/spine-wasm/spine-type-export.cpp
native/external-config.json
|
2023-07-03 15:25:13 +08:00 |
|
jk20012001
|
a585edc8b5
|
add help for post-process components (#15589)
|
2023-06-30 12:47:25 +08:00 |
|
yinkaile
|
66dca2415e
|
refine post process and add tips (#15566)
|
2023-06-29 10:17:33 +08:00 |
|
PP
|
509d73b27d
|
merge branch v3.8.0-aot (#15421)
* PR1: add explicit function return type (#15311)
* PR4: add explicit function return type (#15314)
* [ci skip][AUTO]: Automated code generating update: 8843bfe54cd3f8e6f84432948716c8d130ecb233 (#15314) (#15357)
Co-authored-by: cocos-robot <cocos-robot@cocos.com>
* add function return type
* fix version checking
* fix return type
---------
Co-authored-by: Cocos Robot <48829427+cocos-robot@users.noreply.github.com>
Co-authored-by: cocos-robot <cocos-robot@cocos.com>
|
2023-06-13 18:08:45 +08:00 |
|
yinkaile
|
ed038be6ac
|
add shadow pass & add usePostProcess (#15027)
|
2023-05-12 11:21:17 +08:00 |
|
jk20012001
|
d110e48a88
|
add post process manager and component (#14916)
|
2023-05-04 18:38:13 +08:00 |
|