pandamicro
|
6661292382
|
Merge pull request #15818 from pandamicro/v3.8.1
Merge v3.8.0 to v3.8.1
|
2023-07-26 14:27:54 +08:00 |
|
pandamicro
|
41a16d7322
|
Fix ci
|
2023-07-26 12:07:22 +08:00 |
|
yinkaile
|
2e2b7ec032
|
fixed fsr input/output size (#15798)
|
2023-07-26 11:12:42 +08:00 |
|
pandamicro
|
381505cc28
|
Merge remote-tracking branch 'cocos-for-editor/v3.8.0' into v3.8.1
# Conflicts:
# cocos/3d/framework/mesh-renderer.ts
# cocos/rendering/custom/executor.ts
# cocos/rendering/post-process/passes/fxaa-pass.ts
# cocos/spine/skeleton.ts
|
2023-07-25 22:16:11 +08:00 |
|
徐兵
|
aacc0d7261
|
add help for reflection probe and rename Fxaa (#15790)
|
2023-07-21 11:48:57 +08:00 |
|
minggo
|
802a1f0959
|
Merge branch 'v3.8.0' into v3.8.1-merge-v3.8.0
Conflicts:
cocos/core/utils/x-deprecated.ts
cocos/physics/bullet/instantiated.ts
cocos/physics/framework/components/character-controllers/character-controller.ts
cocos/render-scene/scene/shadows.ts
cocos/rendering/render-shadow-map-batched-queue.ts
cocos/spine/lib/instantiated.ts
cocos/spine/lib/spine-define.ts
cocos/spine/skeleton.ts
native/cocos/editor-support/spine-wasm/AtlasAttachmentLoaderExtension.cpp
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/cocos/editor-support/spine-wasm/spine-wasm.cpp
native/external-config.json
|
2023-07-12 16:02:10 +08:00 |
|
徐兵
|
38906003bf
|
fix crash on color grading with GLES (#15634)
|
2023-07-06 18:28:32 +08:00 |
|
yinkaile
|
937f80abfe
|
fix shadow issue for camera use post process with custom pipeline (#15620)
|
2023-07-05 14:33:31 +08:00 |
|
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 |
|
yinkaile
|
cf843a1102
|
support taa mask (#15592)
support taa mask
|
2023-07-03 10:18:40 +08:00 |
|
jk20012001
|
a585edc8b5
|
add help for post-process components (#15589)
|
2023-06-30 12:47:25 +08:00 |
|
jk20012001
|
b104d25922
|
add tooltips for bloom hbao and lut (#15579)
|
2023-06-29 15:12:21 +08:00 |
|
hyde zhou
|
3b9855069a
|
fix dependency on camera component (#15577)
* fix dependency on camera component
* fix problem caused by removed deprecation
|
2023-06-29 14:03:58 +08:00 |
|
yinkaile
|
66dca2415e
|
refine post process and add tips (#15566)
|
2023-06-29 10:17:33 +08:00 |
|
minggo
|
f148e66fab
|
fix compiling error
|
2023-06-27 14:21:01 +08:00 |
|
minggo
|
e7c5b34e18
|
Merge branch 'v3.8.0' into v3.8.1-merge-v3.8.0
Conflicts:
cocos/2d/assembler/label/text-processing.ts
cocos/physics/bullet/instantiated.ts
cocos/profiler/profiler.ts
cocos/rendering/custom/executor.ts
cocos/rendering/custom/index.ts
cocos/rendering/custom/web-pipeline.ts
cocos/rendering/pipeline-scene-data.ts
cocos/root.ts
cocos/spine/assembler/simple.ts
cocos/spine/lib/instantiated.ts
cocos/spine/lib/spine-define.ts
cocos/spine/skeleton.ts
|
2023-06-27 13:35:35 +08:00 |
|
troublemaker52025
|
34e6f8900a
|
fix csm ubo data in custom pipeline (#15502)
|
2023-06-21 11:46:20 +08:00 |
|
徐兵
|
3bb0abd274
|
support arbitary LUT for Nx1 blocks or 8x8 blocks automatically (#15504)
|
2023-06-21 11:31:13 +08:00 |
|
hyde zhou
|
a12777abc3
|
V3.8.0 pipeline (#15487)
|
2023-06-20 13:02:21 +08:00 |
|
hyde zhou
|
69668e5f0b
|
'Custom' and 'Forward' pipeline is defaulted to PostProcessBuilder (#15466)
|
2023-06-20 10:56:09 +08:00 |
|
minggo
|
06f136f5c4
|
Merge branch 'v3.8.0' into merge-3.8.0
|
2023-06-19 15:26:26 +08:00 |
|
troublemaker52025
|
98d9bf87d9
|
add skin JSB binding (#15464)
|
2023-06-19 15:16:50 +08:00 |
|
hyde zhou
|
e06bb6cdb4
|
[V3.8.0 pipeline] add deferred pipeline (#15452)
|
2023-06-16 17:35:18 +08:00 |
|
hyde zhou
|
820826939d
|
V3.8.0 pipeline (#15428)
|
2023-06-16 09:56:57 +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 |
|
troublemaker52025
|
aedc32acf6
|
Adding project macro definitions to the native engine (#15399)
|
2023-06-09 16:41:52 +08:00 |
|
jk20012001
|
b3f8838e68
|
performance optimization for tone mapping pass and rename function (#15395)
|
2023-06-09 12:25:37 +08:00 |
|
hyde zhou
|
119d787796
|
V3.8.0 pipeline (#15383)
|
2023-06-08 18:47:41 +08:00 |
|
Jiujiang Liu
|
fbc9f0bf17
|
Update the type returned by get worldBounds (#15378)
|
2023-06-08 18:38:38 +08:00 |
|
yinkaile
|
eeea51b634
|
fixed editor cameras (#15365)
|
2023-06-08 11:22:23 +08:00 |
|
徐兵
|
0d6deb2c86
|
fix terrain error in custom pipeline (#15339)
|
2023-06-06 18:28:26 +08:00 |
|
troublemaker52025
|
6ace673c1e
|
Fix skin with post-process pipeline (#15327)
|
2023-06-06 11:22:01 +08:00 |
|
troublemaker52025
|
28d675e58f
|
The globalStandardSkin setting is placed on the meshRenderer component (#15274)
|
2023-06-02 22:13:00 +08:00 |
|
yinkaile
|
1b7a33a2cb
|
fixed fsr input size (#15304)
|
2023-06-02 17:58:28 +08:00 |
|
yinkaile
|
836d2a02ba
|
fixed fsr param not saved (#15301)
|
2023-06-02 16:54:19 +08:00 |
|
troublemaker52025
|
07f3dedad9
|
Optimize skin with post-process pipeline (#15189)
|
2023-06-01 18:44:48 +08:00 |
|
jk20012001
|
2bbaebf30f
|
fix post processing shader flip Y (#15205)
|
2023-05-26 18:00:31 +08:00 |
|
yinkaile
|
df1d7ee221
|
fixed depth slot name with custom pipeline (#15204)
|
2023-05-26 16:28:12 +08:00 |
|
jk20012001
|
09661c137a
|
disable custom pipeline shadow map pass with native engine (#15186)
|
2023-05-25 16:28:12 +08:00 |
|
troublemaker52025
|
66204e8b5e
|
fix hbao textures and rt format (#15184)
|
2023-05-25 14:48:41 +08:00 |
|
jk20012001
|
4910bea1ce
|
use post-process pipeline instead of custom pipeline (#15168)
|
2023-05-24 17:39:19 +08:00 |
|
troublemaker52025
|
c21e560644
|
add 4s skin to post-process pipeline (#15135)
|
2023-05-23 22:57:51 +08:00 |
|
yinkaile
|
1913ee9edf
|
fixed transparency pass with post process pipeline (#15139)
|
2023-05-23 15:45:01 +08:00 |
|
徐兵
|
4fcb25c669
|
support reflection probe for postprocess pipeline (#15138)
|
2023-05-22 18:18:54 +08:00 |
|
troublemaker52025
|
8b6711c02f
|
add forward transparency pass for post-process pipeline (#15124)
|
2023-05-20 02:17:42 +08:00 |
|
troublemaker52025
|
998869fbb4
|
add tone mapping for post-process pipeline (#15122)
|
2023-05-19 18:10:48 +08:00 |
|
jk20012001
|
3277c3d5ef
|
fix light component UI slider range (#15100)
|
2023-05-18 22:22:32 +08:00 |
|
徐兵
|
7be5ca8012
|
calculate scene scale for hbao (#15098)
|
2023-05-18 14:31:59 +08:00 |
|
hyde zhou
|
34a5022096
|
develop pipeline interface change (#15083)
|
2023-05-18 13:00:23 +08:00 |
|
troublemaker52025
|
92bf626ea6
|
fix hbao in post process pipeline (#15077)
|
2023-05-17 16:15:57 +08:00 |
|