Commit Graph

1154 Commits

Author SHA1 Message Date
jk20012001 1cbe27b400 fix reflection probe affected by sky rotation (#15857) 2023-08-04 11:37:12 +08:00
dogeFu 31324e5c65 cancel restore prefab undo record (#15808)
* fix : prefab undo problems

removed/apply components undo;
revert-prefab undo;

* 还原部分不需要的undo

* fix : node._instantiate has different behavior in native scene

* Revert "fix : node._instantiate has different behavior in native scene"

This reverts commit a896450198ff466cf32c8a72888b082ce40818fa.

* remove reset prefab undo record
2023-08-04 10:49:17 +08:00
dogeFu c7195e8cf6 fix 2d particle and tiledMap prefab position problem (#15836) 2023-08-04 10:48:43 +08:00
Leslie Leigh (李的序) 5eddce91f1 PoseGraph: support editor decorators on node inputs (#15819)
* PoseGraph: support editor decorators on node inputs

* Fix lint error
2023-08-01 14:50:45 +08:00
jk20012001 45926d262c fix shader lighting flow (#15833)
* fix shader lighting flow

* code
2023-07-31 14:12:30 +08:00
黄森斌 cd90419f2e fix editing fbx animation events interface bug (#15718)
* fix the bug of changing select fbx, the preview interface did not update

* fix editing fbx animation events interface bug
2023-07-26 18:00:51 +08:00
黄森斌 a9ffcad7ea [Bug] when editor change language,update fbx editing interface (#15762)
* when editor change language,update fbx editing interface

* update
2023-07-26 17:26:01 +08:00
黄森斌 0d4e5497e2 [Bug] fix widget undo bug (#15741)
* fix widget undo bug

* next tick snapshot
2023-07-26 17:25:33 +08:00
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
yinkaile e8e704cf18 fixed fsr/fxaa alpha (#15800) 2023-07-26 11:13:14 +08:00
jk20012001 b9c259eb2a add shader functions (#15814) 2023-07-26 11:11:41 +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
徐兵 d97d3c655a add global post settings (#15558) 2023-07-25 15:40:55 +08:00
jk20012001 069557388a sky effect support blend and fog (#15801) 2023-07-25 10:01:24 +08:00
李吉林 72db3322bd add light probe group help (#15797) 2023-07-21 15:19:24 +08:00
Leslie Leigh (李的序) 3ca7d08db3 Animation components localization (#15701)
Fix
2023-07-21 14:32:12 +08:00
Leslie Leigh (李的序) 775b794aa9 Fix clip visiting in animation controller; fix typo (#15791) 2023-07-21 11:54:54 +08:00
徐兵 aacc0d7261 add help for reflection probe and rename Fxaa (#15790) 2023-07-21 11:48:57 +08:00
jk20012001 9cffcaa84c add multi-layers lighting model and fix direct specular (#15778) 2023-07-20 19:08:32 +08:00
minggo e5802a5e9c Merge branch 'v3.8.0' into v3.8.1-merge-v3.8.0
Conflicts:
	cocos/spine/lib/spine-define.ts
	cocos/spine/skeleton-cache.ts
	cocos/spine/skeleton.ts
:	native/external-config.json
2023-07-18 11:53:54 +08:00
黄森斌 0a65b82a80 mountAllAnimationsOnPrefab default value true (#15721) 2023-07-14 10:08:57 +08:00
troublemaker52025 fc3a6a5ec3 add skin component help (#15702) 2023-07-13 18:55:51 +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
黄森斌 3c963bb94f optimize inspector interface when edit node (#15679)
* optimize inspector interface

* move up or down component, keep its expand state
2023-07-12 09:15:51 +08:00
Knox 09f83b4d03 Optimization of user warnings when checking "Use Baked Animation. (#15612)
* 勾选use baked animation时的用户警告优化

* 更新 i18n
2023-07-11 16:16:36 +08:00
jk20012001 9169f73ba3 fix shader compilation error (#15646) 2023-07-07 12:45:14 +08:00
jk20012001 14c1237a3d fix leaf scattering code (#15645) 2023-07-07 12:22:32 +08:00
ChiaNing 8d235204de add renderRoot2d help (#15644) 2023-07-07 12:01:58 +08:00
changhua 7b5bec1241 optimize the text when fbx do not exist lod (#15643) 2023-07-07 10:29:13 +08:00
徐兵 38906003bf fix crash on color grading with GLES (#15634) 2023-07-06 18:28:32 +08:00
Ling Zhan 08d9a34457 character controller api tweaks (#15621)
* character controller api tweaks

* tweak
2023-07-05 15:28:18 +08:00
jk20012001 798e340352 optimize shader code size for include (#15614) 2023-07-05 10:01:12 +08:00
Leslie Leigh (李的序) e035b2398c Animation controller component help (#15609) 2023-07-04 11:48:40 +08:00
jk20012001 ba0d1319b0 fix skin diffuse with forward lighting (#15605) 2023-07-03 18:10:06 +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
even 3347d1bd3c fix inspector document link address (#15521) 2023-06-30 10:23:08 +08:00
黄森斌 6acdd0ae95 inspector interface: reserve tab style of group; support new section style; (#15586)
* reserve tab style of group; support new section style;

* add mesh-renderer section group style
2023-06-30 09:20:00 +08:00
jk20012001 b104d25922 add tooltips for bloom hbao and lut (#15579) 2023-06-29 15:12:21 +08:00
AFeiYA b43f08679d update migrated meta files (#15581) 2023-06-29 15:11:18 +08:00
黄森斌 eaab2cae0b optimize ui-prop group interface in inspector (#15542) 2023-06-29 11:00:21 +08:00
黄森斌 e7095340a4 fix edit material cache editing data bug in inspector (#15550)
* optimize edit material in inspector

* update

* optimize multiple selections warning label style
2023-06-29 10:59:55 +08:00
yinkaile 66dca2415e refine post process and add tips (#15566) 2023-06-29 10:17:33 +08:00
黄森斌 2ea7043f71 fix unlink prefab bug in inspector (#15518)
* fix unlink prefab button visible bug in inspector

* fix multiple unlink prefab nodes,record undo is incorrect

* unlink prefab undo has recorded in scene process

* optimize code
2023-06-29 09:59:32 +08:00
changhua 2485e4c473 update the screen size of multiple LODs may result in an error (#15543) 2023-06-28 09:34:26 +08:00
黄森斌 38815e3d54 optimize interface component header margin right (#15512) 2023-06-21 16:36:37 +08:00
Gin a05ba98377 fix: require path before push module path (#15509) 2023-06-21 14:47:55 +08:00
Gin 30db989d36 fix: cannot find 'lodash' in production build (#15501) 2023-06-21 13:53:45 +08:00
黄森斌 2aadb31b90 optimize inspector interface (#15503)
* fix sprite-frame edit button visible bug

* optimize particle-system interface indent

* optimize fbx animation tab header color

* revert

* optimize align

* add debug log error
2023-06-21 13:48:24 +08:00