Commit Graph

536 Commits

Author SHA1 Message Date
黄森斌 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
黄森斌 4a9476d3d6 user custom component which extends ccClass to show group style (#10119)
* 初步完成 ccClass 自定义的编辑模板也能显示 group

* 完成测试
2022-02-18 21:06:28 +08:00
pandamicro 50a43e18e4 Shared vb accessor for spine (#10077)
* Robust updateOpacity in batcher & cleanup code

* Support Batcher2D commitIA

* Support customized buffer size for StaticVBAccessor

* Reorganize RenderData logic and prepare spine refactor

* spine realTimeTraverse using dedicated accessor

* Support spine clipping

* Fix updateOpacity in batcher 2d

* Support Spine cache mode

* Fix ci

* Use different accessor for tint spine

* Update effect

* Fix native spine and dagonbones IA range issue

* Fix spine tint accessor registartion

* Revert darkColor default value

* Fix spine accessor switching issue and render data init issue

* Shared vb accessor for dragonbones (#44)

* Shared vb accessor for dragonbones

* fix code style

* add explanation why need resize render data in realTimeTraverse

Co-authored-by: zhakesi <liqiao@cocos.com>
2022-02-18 15:24:59 +08:00
jk20012001 40eb6b20fc Fix default scene camera clear flags is solid not skybox (#10132) 2022-02-18 15:22:45 +08:00
jk20012001 2549157630 Rearrange IA input variables and functions for surface shader (#10123)
* Rearrange IA input variables and functions for surface shader
Fix default_skybox.meta missing

* Update compiled shaders

* Fix code style
2022-02-17 17:16:00 +08:00
Yun Hsiao Wu 198034ec2c refactor access type array to access flags (#10103) 2022-02-16 09:56:46 +08:00
ChiaNing 8f87cbd483 useless UI_GPU code delete (#10048) 2022-01-25 19:14:41 +08:00
jk20012001 8780a311a2 Fix skybox stretch in ortho projection (#10045)
Fix default sphere model
2022-01-25 19:09:46 +08:00
jk20012001 dbc22fe878 fix shader code style (#10039) 2022-01-24 18:18:24 +08:00
santy-wang 995f5b2d41 Merge branch 'v3.4.2' of https://gitlab.cocos.net/publics/engine into v3.5-merge 2022-01-24 15:56:49 +08:00
pandamicro 46f90c85dc Merge branch 'v3.4.1' into v3.4.2 2022-01-21 15:00:15 +08:00
xubing e30c4e4cb6 Skybox optimization (#10004)
* Skybox optimization

* update notes

* remove legacy parameters

* update notes

* changing variable names
2022-01-21 11:39:41 +08:00
jk20012001 cb0ac4e916 Fix planar shadow z-fighting (#10026)
* Fix planar shadow z-fighting

* Fix planar shadow z-fighting
2022-01-20 23:22:34 +08:00