Commit Graph

498 Commits

Author SHA1 Message Date
jk20012001 e78c4c852b Fix #11925 skin instancing vertex attributes binding order for native engine (#10703) 2022-04-09 21:18:24 +08:00
黄森斌 2d0976a530 [Feature] support editing assets can undo redo (#10657)
* 初步添加 assets 编辑 undo 机制

* 支持大部分 meta 型资源;物理材质;材质的 undo

* 测试通过;除 renderpipeline 的编辑需要重构
2022-04-08 10:55:31 +08:00
黄森斌 5d96fb551d [Optimize] reset-property from unknown type (#10687)
* reset-property from unknown type

* 自动渲染的属性根据其他定义的前后来显示位置
2022-04-08 10:55:00 +08:00
袁炜海 6a93460bc4 [Optimize] feat: generate a cononical path (#10680) 2022-04-08 10:40:32 +08:00
王凯鹏 28e35aed03 [Editor] show pipelineStates in inspector (#10586)
(cherry picked from commit f1a2c28cc3c64a3dcb96bf13892c137040cd0cc5)
2022-04-08 10:32:42 +08:00
hyde zhou db0ee6f1c5 disable post-process alpha blend (#10658) 2022-04-06 11:22:52 +08:00
袁炜海 ef8748eca1 feat: inspector sort renders (#10626) 2022-04-01 14:16:55 +08:00
jk20012001 9f83fb1ae9 Add specular intensity for DCC effects (#10613)
* Add specular intensity for DCC effects
effect data migrates for include decode-base and specular intensity

* update compiled shaders
2022-03-31 18:25:03 +08:00
黄森斌 d60a2027f4 update meta files (#10593) 2022-03-31 14:10:22 +08:00
jk20012001 5f75e3a206 add constants for surface shaders (#10590)
* make sure shader include

* add constants
2022-03-30 17:37:13 +08:00
jk20012001 6e93a0e10f Fix #11796 using cc_shadowbias without batching macro (#10587)
* Fix #11796 using cc_shadowbias without batching macro

* code style
2022-03-30 15:01:41 +08:00
黄森斌 a5b4d28fdb update a property value of object from null (#10575) 2022-03-29 20:24:03 +08:00
黄森斌 5866b04333 V3.5.0 optimize ts templates (#10553)
* optimize ts templates

* modify ts template

* recover code, import Node from cc
2022-03-29 20:13:55 +08:00
Leslie Leigh (李的序) 732d75fc3b Marionette feature i18n (#10550)
* Marionette feature i18n

* Update
2022-03-28 19:26:31 +08:00
黄森斌 e529d6c381 optimize assets editing interface (#10531) 2022-03-27 21:12:11 +08:00
黄森斌 f5464fd27c [Optimize] optimize ts template (#10530)
* optimize ts template

* update ts template
2022-03-27 16:39:28 +08:00
黄森斌 ea9dceeb1b V3.5.0 enable readonly material can be edited (#10518)
* 初步增加克隆只读资源界面

* 编辑节点模式下克隆只读资源时节点里的数据同步替换

* add stopPropagation

Co-authored-by: SijieWang <itharbors@outlook.com>
2022-03-27 13:53:31 +08:00
袁炜海 4f91740690 feat: add i18n config (#10517)
* feat: add i18n config

* feat: add inpsector i18n
2022-03-26 22:41:22 +08:00
Santy-Wang 98e52e3f16 output warning info when attached to the node has zero scaling (#10524)
* output warning info when attached to the node has zero scaling

* use approx instead
2022-03-26 22:23:29 +08:00
袁炜海 495016bf01 feat: add markdown render (#9821)
Co-authored-by: SijieWang <itharbors@outlook.com>
2022-03-26 15:12:10 +08:00
袁炜海 35529038e2 fix: There is no need to execute updatePreview in the ready lifecycle (#10466) 2022-03-26 15:11:25 +08:00
媛媛 afddb82033 [Feature] support inspector droppable style (#10440) 2022-03-26 15:11:03 +08:00
黄森斌 380e87c33d [Optimize] edit fbx importer of legacy options (#10471)
* edit fbx legacy importer

* Update editor/inspector/assets/fbx/fbx.js

Co-authored-by: SijieWang <itharbors@outlook.com>
2022-03-26 15:04:35 +08:00
zhangxin 749226eefb [Bug] add fix alpha transparency artifact options and fix bug (#10419)
* add fix alpha transparency artifact options and fix bug

add fix alpha transparency artifact options

fix bug
- Fixed an issue where events were registered more than once

* Non-transparent channels or RGBE channels are not allowed

* Update image.js

* revert set hidden to set style
2022-03-25 19:07:40 +08:00
jk20012001 80ceb1c6eb Fix punctual lights luminance * PI (#10480)
* Fix punctual lights luminance * PI

* code style
2022-03-24 18:13:19 +08:00
jk20012001 d5f172b782 Fix fog accumulated error with multiple local lights (#10445)
* Fix fog accumulated error with multiple local lights

* add standard exposure value for lightmap
2022-03-23 17:43:43 +08:00
黄森斌 a2501a368e [Optimize] optimize material editing using cache prop-value (#10376)
* 调整材质编辑中的数据缓存方式

* useCache
2022-03-23 10:19:57 +08:00
黄森斌 bd5950a43f [Optimize] optimize property name show (#10241) 2022-03-23 10:19:39 +08:00
黄森斌 72eadcc873 [Optimize] optimize fault compatibility (#10439) 2022-03-23 10:18:31 +08:00
Leslie Leigh (李的序) b87c185333 Marionette: layer, mask, auto trigger, pass through state (#10179)
* Marionette/3.5.0 Initial Commit

* Auto trigger default value

* import skeleton 改为选择 fbx 文件

* Rename passthrough -> empty

* Refactor Auto Trigger (#81)

* Refactor auto trigger

* Lint

* Optimize

* Update

* Migrate triggers (#82)

* Fix merge problems

* Optimize

* Optimize

Co-authored-by: arsen2010 <arsen2010@126.com>
2022-03-22 15:05:45 +08:00
Myway 459abdbd72 change lighting map unpack and luminance multiply (#10185) 2022-03-22 12:01:47 +08:00
SijieWang 4cabeed1ee [Feature] imageAsset: add bakeOfflineMipmaps (#10404)
Co-authored-by: Sijie <devhacker520@hotmail.com>
2022-03-22 10:38:41 +08:00
袁炜海 69c46a3a27 feat: sync inspector 3.6 to 3.5 (#10397)
* feat: sync inspector 3.6 to 3.5

* sync inspector edit

Co-authored-by: arsen2010 <arsen2010@126.com>
2022-03-21 15:38:08 +08:00
Zhang mingzhen 8d3c975116 Rich text v align v3.5 #9984 new (#10340)
* add vertical alignment attribute

(cherry picked from commit fc4013e4016203c9ff13c3fb55ab24d8f6afdd82)

* set vertical alignment

(cherry picked from commit 60afa526e215c6e599560683427701baf42595c8)

* distinguish hAlign and vAlign

(cherry picked from commit 010e097b5c862a8373e860f01c1104b6396f81ba)

* use as instead of instanceof

* reorder attributes

Co-authored-by: zhangmingzhen <mingzhen.zhang@cocos.com>
2022-03-15 16:27:30 +08:00
jk20012001 766b7efb2a Fix: #11580 create new light source intensity display type unknown (#10324) 2022-03-15 14:32:14 +08:00
jk20012001 6e4d4a30ac code style for surface shader (#10326) 2022-03-15 14:31:41 +08:00
jk20012001 d6cc1a4094 deferred shading code revert to 3.4.2 (#10339)
* deferred shading code revert to 3.4.2

* code style
2022-03-14 20:11:47 +08:00
jk20012001 48e45ce2d7 fix compiling error with merged code (#10332)
* fix compiling error with merged code

* code style
2022-03-14 17:53:06 +08:00
Leslie Leigh (李的序) 93b856b98e Make animation module optional (#10257) 2022-03-10 11:55:11 +08:00
Yun Hsiao Wu a291000259 update default content (#10273) 2022-03-09 18:23:43 +08:00
santy-wang 10349e567d Merge branch 'v3.4.2' of https://gitlab.cocos.net/publics/engine into v3.5.0 2022-03-08 10:21:39 +08:00
troublemaker52025 273fa0162e Change planar shadow func name v3.5.0 (#10174)
* change planarShadow func name for v3.5.0

* update

* Modify semantics

* delete @range slide
2022-03-03 17:53:00 +08:00
黄森斌 4f05432c23 Displayorder is removed from the edit template and is taken over completely by the decorator (#10165) 2022-03-02 21:14:37 +08:00
jk20012001 e6f156c841 fix unnecessary include for surface shader (#10220) 2022-03-01 18:21:32 +08:00
pandamicro 1446db89e7 Merge branch 'v3.4.2' into v3.5.0
# Conflicts:
#	cocos/2d/components/sprite.ts
#	cocos/2d/framework/ui-transform.ts
#	cocos/2d/renderer/render-uniform-buffer.ts
#	cocos/core/builtin/effects.ts
#	cocos/core/builtin/shader-sources/glsl1.ts
#	cocos/core/builtin/shader-sources/glsl3.ts
#	cocos/core/builtin/shader-sources/glsl4.ts
#	cocos/dragon-bones/ArmatureDisplay.ts
#	cocos/spine/skeleton.ts
#	editor/assets/chunks/cc-sprite-fs-gpu.chunk
#	editor/assets/chunks/cc-sprite-fs-gpu.chunk.meta
#	editor/assets/chunks/cc-sprite-vs-gpu.chunk
#	editor/assets/chunks/cc-sprite-vs-gpu.chunk.meta
#	editor/assets/default_skybox.meta
#	editor/assets/effects/builtin-sprite-gpu.effect.meta
2022-02-28 17:24:02 +08:00
pandamicro 574976bfa1 Update internal assets and meta (#10203) 2022-02-28 16:53:23 +08:00
troublemaker52025 e723e5aa3a Add renderMesh bias for v3.5.0 (#10102)
* Add renderMesh bias for v3.5.0

* fix ci error

* change function name

* fix merge error

* update

* update 2

* update

* update

* update 2
2022-02-24 23:27:09 +08:00
黄森斌 f4291fd035 Properties default to display positions in the order in which they are defined (#10155) 2022-02-22 21:27:32 +08:00
troublemaker52025 bdd36a59da update chunk.mate for v3.5.0 (#10148) 2022-02-22 18:01:25 +08:00
Yun Hsiao Wu 21e4e2e0c8 update effects (#10145) 2022-02-22 16:19:15 +08:00