Commit Graph

1224 Commits

Author SHA1 Message Date
媛媛 99922c3a56 update asset meta (#16582)
* update asset meta

* update
2023-12-08 17:15:40 +08:00
minggo e4da0cbfbf Merge pull request #16568 from cocos/v3.8.2
sync v3.8.2 to v3.8.3
2023-12-08 09:15:40 +08:00
Knox 6eadc13af6 [Optimize] focusing on the scene after entering light probe edit mode (#16563) 2023-12-06 11:15:53 +08:00
媛媛 a022a67a7d sort default file content (#16538)
* move new asset i18n to engine (#16280)

* move new asset i18n to engine

* update

* sort default file content (#16249)

# Conflicts:
#	editor/assets/default_file_content/animation-graph-variant/default.animgraphvari.meta
#	editor/assets/default_file_content/animation-graph/default.animgraph.meta
#	editor/assets/default_file_content/animation-mask/default.animask.meta
#	editor/assets/default_file_content/effect.meta
#	editor/assets/default_file_content/effect/default.effect.meta
#	editor/assets/default_file_content/effect/effect-surface.effect.meta
#	editor/assets/default_file_content/flow.meta
#	editor/assets/default_file_content/js.meta
#	editor/assets/default_file_content/material/default.mtl.meta
#	editor/assets/default_file_content/pac.meta
#	editor/assets/default_file_content/physics-material/default.pmtl.meta
#	editor/assets/default_file_content/prefab.meta
#	editor/assets/default_file_content/render-pipeline/default.rpp.meta
#	editor/assets/default_file_content/render-pipeline/forward-pipeline.rpp.meta
#	editor/assets/default_file_content/rt.meta
#	editor/assets/default_file_content/scene.meta
#	editor/assets/default_file_content/scene/scene-2d.scene.meta
#	editor/assets/default_file_content/scene/scene-quality.scene.meta
#	editor/assets/default_file_content/stg.meta
#	editor/assets/default_file_content/terrain.meta

* Add auto material config (#16333)

* add auto material config

* update

* update default file content
2023-11-30 14:49:49 +08:00
袁炜海 7c1d96ec43 fix: inspector: dump merge (#16534)
* feat: inspector: dump merge

* fix: inspector: dump merge
2023-11-29 18:13:55 +08:00
hyde zhou 674a980c6f fix billboard rendering (#16532) 2023-11-24 17:13:33 +08:00
媛媛 6deb4927a1 fix change texture wrap mode (#16529) 2023-11-23 14:47:58 +08:00
GengineJS f447ffd320 Fixed the issue where bloom does not work when the clear flag of the camera is set to clear color. (#16509) 2023-11-15 21:13:56 +08:00
James Chen 60088d4f65 Update editor meta files (#16501) 2023-11-10 18:15:47 +08:00
媛媛 eb2b40b6b0 fix submetas change after image type (#16446) 2023-10-30 15:16:38 +08:00
黄森斌 77d1385bb2 fix material preview bug (#16328) 2023-10-26 18:05:04 +08:00
徐兵 99b50a5341 add dof (#16426) 2023-10-16 17:17:10 +08:00
troublemaker52025 b0c25b0852 add bias for planar shadow (#16316) 2023-10-16 17:02:11 +08:00
Leslie Leigh (李的序) d75496e187 Physics material inspector localization (#16409)
* Physics material inspector localization
* Document property ranges.
* Revert
* Update editor/i18n/en/modules/physics.js
2023-10-11 17:37:12 +08:00
Leslie Leigh (李的序) 3781d34b34 Label component inspector localization (#16234)
* Label component inspector localization

* Update editor/i18n/zh/modules/ui.js

* Update
2023-10-11 14:47:54 +08:00
黄森斌 2ade35990f enable resize inspector preview area height (#16219)
* stash css style

* use inspector-resize-preview to resize height

* delay broadcast fbx change tab

* change material-header layout
2023-09-22 17:15:13 +08:00
黄森斌 ed14fdda2a optimize record material preview params (#16188) 2023-09-22 17:14:52 +08:00
袁炜海 7e53d99269 feat: add block-input-events tip (#16147)
* feat: add block-input-events tip

* feat: use css var
2023-09-22 17:00:04 +08:00
黄森斌 8485880b00 fix edit texture-cube bug (#16260)
* fix edit texture-cube bug

* recover partial code
2023-09-22 16:44:18 +08:00
黄森斌 fccaa94938 set some assets not need to preview when editing property (#16312) 2023-09-22 16:42:23 +08:00
黄森斌 0f6dbbb318 Inspector: Add asset location icon (#16295) 2023-09-22 15:40:21 +08:00
minggo aa601815c4 Merge branch 'v3.8.1' into v3.8.2-merge-v3.8.1
Conflicts:
	cocos/render-scene/scene/submodel.ts
2023-09-20 15:15:22 +08:00
ChiaNing d2d7623e9d Integration of outline and shadow to label (#16106)
* Integration of outline and shadow to label

* add test

* change getter/setter

* name change & use assert

* test name change

* name change

* fix

* remove old attribute & add visible

* remove assert

* fix: gulp-build-h5-source

* Revert "fix: gulp-build-h5-source"

---------

Co-authored-by: PP_Pro <chinese1236@qq.com>
2023-09-20 11:14:42 +08:00
jk20012001 dae0f55fec fix albedoScaleAndCutOff type mismatch (#16282) 2023-09-19 15:41:49 +08:00
Zeqiang Li 8a6c212c82 update web pipeline for webgpu (#16207) 2023-09-11 17:31:43 +08:00
minggo 554598643a Merge branch 'v3.8.1' into v3.8.2-merge-v3.8.1 2023-09-08 14:34:24 +08:00
Yiwen b46cba6278 Fix/meshopt (#16200)
* fix meshopt trigger

* add missing part

* add fallback for platform that doean't support half vertex attr

* fix tidy

* revert wrong code

* correct missing field

* optimize

* tune, fix bug
2023-09-08 10:52:46 +08:00
jk20012001 4dbd525917 fix sphere 2nd uv (#16210) 2023-09-07 16:32:41 +08:00
jk20012001 fc986c9cec fix webgpu crash with normalize zero vector (#16195) 2023-09-06 14:44:29 +08:00
Ling Zhan dc933d3ca2 add experimental box2d wasm i18n (#16134) 2023-09-05 15:11:45 +08:00
troublemaker52025 eaeab8b62c delete rangeddir / point light custom template form components.js (#16169) 2023-09-01 16:16:24 +08:00
jk20012001 692d3dc354 fix debug view with custom pipeline and revert LDR fog to HDR (#16163) 2023-09-01 16:15:58 +08:00
黄森斌 4d213938e9 fix update widget occur error (#16139)
* fix update widget occur error

* update expression
2023-08-31 16:22:24 +08:00
troublemaker52025 2b275816fc post-final pass keep alpha channel (#16149) 2023-08-31 16:00:36 +08:00
minggo 1e3155bbe9 Merge pull request #16148 from cocos/v3.8.1
V3.8.1
2023-08-31 11:41:03 +08:00
troublemaker52025 77d3f7cde7 fix alpha blend error with custom pipeline and add bloom masks (#16125) 2023-08-30 17:07:28 +08:00
PP 44ca8eaf1a support taobaoMinigamePlugin in render-config.json (#16138) 2023-08-30 15:12:09 +08:00
Yiwen 93ff89c855 fix asmjs subpackage problem on minigame platform, fix gui (#16123)
* fix asmjs subpackage problem on minigame platform, fix gui
2023-08-30 12:00:11 +08:00
PP 8e8951e05f set spine module as separate engine module (#16133) 2023-08-30 10:35:31 +08:00
pandamicro 0cb410d5da Merge pull request #16127 from cocos/v3.8.1
Merge V3.8.1
2023-08-29 17:01:37 +08:00
jk20012001 a6b5b61cc0 fix BlitScreen pass make tranparency with clear color (#16108) 2023-08-25 18:38:53 +08:00
jk20012001 15eec3bc26 sheen lighting model (#16058) (#16102) 2023-08-25 18:31:28 +08:00
jk20012001 d0ca802f0d fix glass material blend with fog (#16104) 2023-08-25 17:30:29 +08:00
jk20012001 24848f4512 Revert "sheen lighting model (#16058)" (#16103) 2023-08-25 16:28:34 +08:00
jk20012001 5071624db8 sheen lighting model (#16058) 2023-08-25 10:47:24 +08:00
troublemaker52025 16d720663a Fix hot update for pipeline effects and Float-output-process flow (#16084) 2023-08-25 10:46:10 +08:00
黄森斌 563e9f780d fix change language would not update help doc link (#16067) 2023-08-23 11:08:57 +08:00
troublemaker52025 5b5c3cf977 fix custom pipeline load float-output-process error (#16071) 2023-08-23 10:53:24 +08:00
Gin f330132aa3 improve: effects list sorting in material panel (#16060)
* improve: effects list ordering in material panel

* fixup: set collator option `numeric` to `true`

* fixup: use `Object.value` & filter

* fixup: filter predicate function
2023-08-22 13:57:03 +08:00
黄森斌 5f61d2a112 fix fbx and widget bug in inspector (#16057)
* optimize widget layout

* fix bug of resizing panel , fbx event point would not update position

* change method name
2023-08-21 19:28:33 +08:00