zheng han
|
b11dff577f
|
add lock to label under button by defautl (#8481)
|
2021-04-19 15:12:34 +08:00 |
|
cary
|
52c090e18a
|
Fix the lighting problem of the deferred rendering material scene. (#8393)
* Fix the lighting problem of the deferred rendering material scene.
* fix terrain effect
* fix terrain scene crash
* fix conflict
* fix conflict
|
2021-04-19 15:10:52 +08:00 |
|
Myway
|
6b13ecc1f9
|
fix terrain lighting map shader compile error (#8480)
Co-authored-by: Myway3D1 <404793124@qq.com>
|
2021-04-19 12:28:43 +08:00 |
|
黄森斌
|
375a6f5a4c
|
V3.1 optimise component edit in inspector (#8463)
* 增加 gltf-material 只读材质的显示
* custom initialization in dump ui-prop rendering
* ui-prop delete extra children
* change zh to en
* reformat eslint style
|
2021-04-18 15:38:33 +08:00 |
|
zhangxin
|
a488b96f13
|
fix error (#8465)
The UI-section will automatically be hidden under the showFlag
|
2021-04-18 15:38:21 +08:00 |
|
媛媛
|
0bc15d36d5
|
Support time and key frame data format switch when show clip info (#8469)
|
2021-04-16 19:00:54 +08:00 |
|
Myway
|
92bed0170e
|
lightmap use rgbe format (#8468)
Co-authored-by: Myway3D1 <404793124@qq.com>
|
2021-04-16 18:55:33 +08:00 |
|
zheng han
|
34a13c9c0b
|
rename color to mainColor (#8466)
|
2021-04-16 17:47:43 +08:00 |
|
zhangxin
|
23ae14d51a
|
replace Chinese with English (#8464)
* replace Chinese with English
* Modify the description
|
2021-04-16 17:45:55 +08:00 |
|
黄森斌
|
4c9f83bf5e
|
make animationBakeRate of fbx prop editable (#8457)
|
2021-04-16 15:27:09 +08:00 |
|
cary
|
d91e2d5bce
|
Fix the effect of gpu particle. (#8444)
|
2021-04-15 20:15:12 +08:00 |
|
SijieWang
|
122e5687c0
|
[Move] Move the Inspector template to the engine (#8300)
* [Feature] 将 inspector 模版移动到引擎
* 支持 material 的渲染
* 增加 assets 的 i18n 文案; 修改 scene 编辑 (#1)
* 添加 i18n 的 assets 配置
* 增加 assets 的 i18n 文案
* 增加只读样式
* 初步添加 image 类型的几个资源编辑
* 初步完成 image 编辑
* image 增加 i18n 文案
* 完成 sprite-frame 属性编辑
* 回退修改
* 完成 sprite-frame 除九宫格编辑外的功能
* 添加 texture 资源编辑
* 调整图片显示
* 调整 ui-image 使用时背景透明的样式
* Add inspector typescript (#2)
* inspector增加typescript
https://github.com/cocos-creator/3d-tasks/issues/6427
* 修复多选的样式
* Update typescript.js
全部设置为英文注释
* Update typescript.js
去掉了多余的替换
* update style
* Add javascript inspector (#4)
* create javascript inspector
* 修复样式,完善代码
* Update javascript.js
分而治之
不再把变量写在全局上
* Update javascript.js
优化代码
- 减少多余的层级
- 在update的时候加了一层判断
- 删掉多余的$
* create javascript inspector
* 修复样式,完善代码
* Update javascript.js
分而治之
不再把变量写在全局上
* Update javascript.js
优化代码
- 减少多余的层级
- 在update的时候加了一层判断
- 删掉多余的$
* update i18n of inspector,update inspector of javascript
- 将代码结构优化了一下
- 将不是公用的方法放在了各自元素的update方法上
- 调用_onPluginStateChanged 的时候将会update所有ui元素
- 将样式优化了一下
- 取消没必要的缩进
* Update javascript.js
* add tooltip
Co-authored-by: SijieWang <itharbors@outlook.com>
* 完成 sprite-editor 九宫格编辑的联调 (#5)
* 增加容错
* 完成 sprite-editor 的编辑联调
* add audio-clip inspector (#6)
Co-authored-by: SijieWang <itharbors@outlook.com>
* create effect-header inspector (#7)
Co-authored-by: SijieWang <itharbors@outlook.com>
* 增加 footer 和 header 功能
* 分离 image 显示 (#16)
* Add json inspector (#3)
* add json inspector
https://github.com/cocos-creator/3d-tasks/issues/6427
* 修复 inspector json多选的样式
* Update json.js
修改注释全部为英文
* Update json.js
去掉了多余的代码
* update style
* add json inspector
https://github.com/cocos-creator/3d-tasks/issues/6427
* 修复 inspector json多选的样式
* Update json.js
修改注释全部为英文
* Update json.js
去掉了多余的代码
* update style
* Add era texture cube inspector (#8)
* create inspector of erp-texture-cube
* Update erp-texture-cube.js
* add i18n ,make code better
* add i18n ,support multi-select
* effect 资源的编辑 (#15)
* 增加容错
* 完成 sprite-editor 的编辑联调
* 初步显示 effect 资源
* 完成 effect 的编辑
Co-authored-by: SijieWang <itharbors@outlook.com>
* add inspector of particle (#10)
* add inspector of particle
It is not clear how to import other inspectors,
for example, here we need to import the texture inspector
* add tooltip
Co-authored-by: SijieWang <itharbors@outlook.com>
* Create prop.js (#18)
* Create prop.js
* Update prop.js
* Update prop.js
* add getCustomPropElements function
* Update prop.js
* Update prop.js
* add description
* add label-atlas inspector (#9)
* add label-atlas inspector
* Update label-atlas.js
去掉了多余的层级,直接使用this.$.xxx
每次更改元素属性的时候都会调用一次update
* add i18n
* Update label-atlas.js
调用update\ready方法前判断方法是否存在
* Update label-atlas.js
增加了对只读状态的判断
* fixed i18n
* update i18n
add i18n to all label
* allow multi select
* Update label-atlas.js
fix getInvalid
* remove useless update
Co-authored-by: SijieWang <itharbors@outlook.com>
* add physics-meterial inspector (#11)
* add physics-meterial inspector
* fixed wrong code
* Update physics-material.js
* hide content when multiselect
* add render-texture inspector (#13)
* add render-texture inspector
* Update tsconfig.json
Co-authored-by: SijieWang <itharbors@outlook.com>
* Add render flow inspector (#12)
* add renderer-flow
* not use requestAnimationFrame
Co-authored-by: SijieWang <itharbors@outlook.com>
* add text inspector (#14)
Co-authored-by: SijieWang <itharbors@outlook.com>
* add video-clip inspector (#17)
Co-authored-by: SijieWang <itharbors@outlook.com>
* Add page view inspector (#25)
* add page view inspector
* add page view inspector
* remove empty line
* add page view inspector
* remove empty line
* 完成 fbx 的编辑 (#20)
* fbx 内部模块拆分
* 调通 model 模块
* 完成预览分离及显示的调试
* 添加 material fbx 模块的编辑
* 材质图片的编辑
* 初步 fbx animation 编辑界面
* 完成了 fbx animation 编辑
* 添加 gltf 编辑
* 更新中文 fbx 文案
* 合并
Co-authored-by: SijieWang <itharbors@outlook.com>
* add video player inspector (#37)
* 检查并调整部分 assets 资源的编辑 (#39)
* audio 支持多选显示
* effect 补充部分元素 readonly 状态
* sprite-frame 增加 九宫格编辑按钮的 disabled 状态
* 图片多选情况下不显示 edit 按钮和预览面板
* 补充 mesh 文件预览
* 补充 2d particle 编辑
* 补充 physics-material 的编辑
* 补充 typescript 编辑
* 修改 javascript 的编辑
* 添加 gltf-skeleton 预览
* 修改 text 文件编辑
* 修改 erp-textrue-cube 编辑;修改 image sub ui-panel 的数据引用
* add texture-cube inspector (#19)
* add texture-cube inspector
目前无法监听width变化
* Update texture-cube.js
update style
* listen confirm event instead of change event
* Update assets.js
Co-authored-by: SijieWang <itharbors@outlook.com>
* add prefab-link inspector ,creat i18n of components 's inspector (#24)
* add prefab-link inspector ,creat i18n of components
* Update prefab-link.js
* format html
* add polygon collider2d inspector (#23)
* add polygon collider2d inspector
* remove useless update
* Update polygon-collider.js
* Update polygon-collider.js
format
* format html
Co-authored-by: SijieWang <itharbors@outlook.com>
* add inspector of rich text (#26)
* add inspector of rich text
* Update rich-text.js
* Update components.js
* dormat html
* Update rich-text.js
Co-authored-by: SijieWang <itharbors@outlook.com>
* add slider inspector (#30)
* add slider inspector
* format html
* Update slider.js
Co-authored-by: SijieWang <itharbors@outlook.com>
* add sphere light inspector (#31)
* add sphere light
* format html
* Update sphere-light.js
Co-authored-by: SijieWang <itharbors@outlook.com>
* add safe-area inspector (#27)
* add safe-area inspector
* format html
* Update safe-area.js
Co-authored-by: SijieWang <itharbors@outlook.com>
* add sprite inspector (#33)
* add sprite inspector
* format html
Co-authored-by: SijieWang <itharbors@outlook.com>
* add terrain inspector (#34)
* add terrain inspector
* update format
* format html
Co-authored-by: SijieWang <itharbors@outlook.com>
* add scroll view inspector (#28)
* add scroll view inspector
* format html
* Update scroll-view.js
Co-authored-by: SijieWang <itharbors@outlook.com>
* add skeletal animation inspector (#29)
Co-authored-by: SijieWang <itharbors@outlook.com>
* add spot light inspector (#32)
* add spot light inspector
* format
* format html
Co-authored-by: SijieWang <itharbors@outlook.com>
* add toggle inspector (#36)
* add toggle inspector
* format html
* format html
Co-authored-by: SijieWang <itharbors@outlook.com>
* add particle-system inspector (#38)
* add particle-system inspector
rotation的xyz修改会出现错误,需要帮助
* format html
Co-authored-by: SijieWang <itharbors@outlook.com>
* Add batched skinning model inspector (#40)
* add batched-skinning-model insepctor
* Update batched-skinning-model.js
* Update components.js
Co-authored-by: SijieWang <itharbors@outlook.com>
* add button inspector (#42)
* add button inspector
* format html
* format and don't change displayname
Co-authored-by: SijieWang <itharbors@outlook.com>
* Add layout inspector (#43)
* Add layout inspector
* format html
Co-authored-by: SijieWang <itharbors@outlook.com>
* Add web view inspector (#44)
* add webview inspector
我不清楚如何在自己修改dump得时候如何通知
* Update webview.js
使用了hack的方法发出了change-dump
* format html
Co-authored-by: SijieWang <itharbors@outlook.com>
* add particle system 2d inspector (#45)
Co-authored-by: SijieWang <itharbors@outlook.com>
* add widget inspector (#47)
Co-authored-by: SijieWang <itharbors@outlook.com>
* 检查了几种资源的编辑 (#46)
* 添加 texture-cube 的编辑
* 修改 video 预览
* 修改 render-texture 编辑
* 增加 render-pipeline 编辑
* 补充 label-atlas 编辑
* 修复节点复用时的事件绑定
* add texture to auto atlas (#49)
* add texture to auto atlas
* 修改带下划线变量名
* 继续部分资源编辑调整 (#48)
* 补充 teture-cube 的赋值
(cherry picked from commit 5a3c9a8ef1d1313922197ae04ba27cff81d4c474)
* 修改 render-pipeline 编辑
(cherry picked from commit e34418074ddd271941663e57c210b98f4d73f7f7)
* 修改 chunk 文件编辑
* 修改代码显示的相关文件
* 调整代码类显示效果
* 调整剩余三个文件中的 _asset 写法,去掉下划线
* 合并 image 编辑的代码
* 回退 json 代码的输出修改
* 调整 node component 编辑 (#50)
* 增加 setReadonly 工具函数
* 注册的组件按字母排序,以便剔除重复注册
* 新的节点组件编辑模式
* 增加 cc.Layout 编辑
* cc.PageView 没有额外交互不需要自定义编辑
* 修改 cc.RichText 编辑
* 修改 cc.ScrollView 编辑
* 取消 cc.Slider 自定义编辑
* 修改 cc.Toggle 编辑
* 增加一个基类,减少重复代码
* 修改 cc.SphereLight 编辑
* 修改 cc.WebView 编辑
* 修改 cc.VideoPlayer 编辑
* 修改 cc.SpotLight 编辑
* 修改 cc.Terrain 编辑
* 检查多选后属性值是否一致
* 修改 cc.SafeArea 编辑
* 修改 cc.PolygonCollider2D 编辑
* 修改 batched-skinning-model 编辑
* 回退一处修改;添加 displayOrder 100 的注释
* 回退一处修改
* Update particle-system.js
修正了显示的内容
* Update particle-system.js
* 修改 cc.ParticleSystem2D 编辑
* Update particle-system.js
* Update particle-system.js
* 修改属性同行的样式;增加 emitterMode 值切换其他属性显示
* 去掉 cc.SkeletalAnimation 编辑模板
Co-authored-by: zhangxin <13622872688@163.com>
Co-authored-by: 黄森斌 <arsen2010@126.com>
Co-authored-by: zhangxin <59186205+chichinohaha@users.noreply.github.com>
Co-authored-by: 媛媛 <yuanyuan1497@foxmail.com>
Co-authored-by: zhangxin <13622872688@163.com>
|
2021-04-15 18:18:56 +08:00 |
|
SijieWang
|
2471db77d2
|
[Feature] Mark delayed pipeline contributors (#8452)
|
2021-04-15 11:23:17 +08:00 |
|
Zeqiang Li
|
6b7a6a1f36
|
fix vulkan animation issue on Xiaomi (#8445)
* fix vulkan animation issue on Xiaomi
* update comment
|
2021-04-14 13:49:22 +08:00 |
|
zheng han
|
a5ab737a34
|
add slider for some props in builtin-standard.effect (#8419)
|
2021-04-14 13:46:45 +08:00 |
|
Yun Hsiao Wu
|
24b1c6695d
|
update CommandBuffer.draw (#8423)
* update CommandBuffer.draw
* effect: runtime constants
|
2021-04-12 09:41:35 +08:00 |
|
troublemaker52025
|
05a72cdee1
|
Delete private node for v3.1 (#8382)
* delete private node
# Conflicts:
# cocos/core/scene-graph/private-node.ts
* update
* Alias of Node
* update
* dont use enum ALL
* fix bug for editor
* update
* update
* update
* Retaining deprecated objects
* update
* update
* update
* using warnID and update EngineErrorMap.md
|
2021-04-08 17:47:05 +08:00 |
|
cary
|
6d57312ffe
|
Fix the render problem of deferred pipeline in editor. (#8373)
* Fix the render problem of deferred pipeline in editor.
* add return
|
2021-03-19 17:35:09 +08:00 |
|
Yun Hsiao Wu
|
a99d078f46
|
adapt native gfx layer changes (#8350)
* fix precompile combinations
* remove memory pool type hacks
* sync gfx defines
|
2021-03-19 16:24:36 +08:00 |
|
pandamicro
|
7d9711daa6
|
Fix merge issue (#8383)
|
2021-03-19 13:32:04 +08:00 |
|
pandamicro
|
5005752386
|
Merge remote-tracking branch 'origin/develop' into v3.1
# Conflicts:
# 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/core/gfx/define-class.ts
# cocos/core/gfx/define.ts
# cocos/core/gfx/webgl/webgl-buffer.ts
# cocos/core/gfx/webgl2/webgl2-buffer.ts
# cocos/core/pipeline/forward/forward-pipeline.ts
# cocos/core/pipeline/planar-shadow-queue.ts
# cocos/core/pipeline/render-additive-light-queue.ts
# cocos/particle/renderer/particle-system-renderer-data.ts
# editor/assets/chunks/cc-shadow-map-fs.chunk
# editor/assets/chunks/shading-standard.chunk
|
2021-03-18 18:33:35 +08:00 |
|
Zeqiang Li
|
0218c98143
|
Particle system tooltop translation (#8358)
* half completed translation
* Tooltip translation
* add renderable2D
* comment CPU-supported-only features
|
2021-03-15 18:49:51 +08:00 |
|
jiaxin.lai
|
47938b21d2
|
add physics i18n (#8334)
* add physics i18n
* ammo.js -> bullet(ammo.js)
* tweaks
|
2021-03-15 16:36:57 +08:00 |
|
cary
|
7cb440d393
|
Fix render error of deferred pipeline on vulkan. (#8356)
|
2021-03-15 11:28:45 +08:00 |
|
ChiaNing
|
2d869577a5
|
UI module support zh/en UItooltip (#8335)
* UI module support zh/en UItooltip
* change sub-context file name
* remove white space
* update
|
2021-03-13 13:04:34 +08:00 |
|
黄森斌
|
78ab003e8a
|
V3.0.1 update terrain prefab data (#8344)
* update terrain prefab
* update image meta files
|
2021-03-10 17:28:05 +08:00 |
|
Myway
|
79baa0ef98
|
Fixed inconsistency between lighting map and dynamic lighting (#8278)
Co-authored-by: Myway3D1 <404793124@qq.com>
|
2021-03-07 16:50:35 +08:00 |
|
mmyduckx
|
eefc5e8b61
|
2d module support zh/en UItooltip (#8332)
|
2021-03-07 16:35:20 +08:00 |
|
cary
|
f38fd57c0f
|
Fix phase error of gbuffer stage. (#8318)
|
2021-03-03 08:50:56 +08:00 |
|
cary
|
8b4c2f7f5e
|
Fix the material and resources of the deferred pipeline. (#8289)
|
2021-03-02 18:19:29 +08:00 |
|
troublemaker52025
|
c99ff25045
|
Remove redundant judgements for 3.0.1 (#8283)
|
2021-02-23 17:20:26 +08:00 |
|
Yun Hsiao Wu
|
6d5cf2112a
|
unify forward/deferred material (#8267)
|
2021-02-22 15:56:30 +08:00 |
|
pandamicro
|
e8860d20c3
|
Fix merge issue
|
2021-02-07 18:55:19 +08:00 |
|
pandamicro
|
c5d4c5c08e
|
Merge remote-tracking branch 'origin/v3.0.0' into device-proof
# Conflicts:
# cocos/3d/assets/morph-rendering.ts
# cocos/core/builtin/builtin-res-mgr.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/core/pipeline/index.jsb.ts
# cocos/core/pipeline/planar-shadow-queue.ts
# cocos/core/pipeline/render-additive-light-queue.ts
# cocos/core/pipeline/shadow/shadow-flow.ts
# cocos/particle/renderer/trail.ts
# cocos/physics/ammo/polyfill-atob.ts
# editor/assets/effects/builtin-spine-two-colored.effect.meta
# jest.config.js
# platforms/native/engine/jsb-pipeline.js
# tests/general/sealed-global-variables.json
|
2021-02-07 18:33:59 +08:00 |
|
Yun Hsiao Wu
|
78f33fe31b
|
fix conflicts
|
2021-02-05 11:45:37 +08:00 |
|
Yun Hsiao Wu
|
bc030766fd
|
gfx: pipeline barriers
|
2021-02-03 17:52:31 +08:00 |
|
lawrence-liuyue
|
2e2cf5752f
|
Hw deferred pipeline (#8078)
|
2021-02-02 22:14:39 +08:00 |
|
ChiaNing
|
e092fb051a
|
add spine customMaterial & set default UI depthTest False (#8205)
* add spine customMaterial & set default UI depthTest False
* update effect
|
2021-01-26 14:19:01 +08:00 |
|
ChiaNing
|
58f094e40a
|
richText layer change bug fix (#8175)
|
2021-01-21 17:58:26 +08:00 |
|
黄森斌
|
ddf614c135
|
some effect files in internal db hide in editor (#8153)
|
2021-01-16 16:55:31 +08:00 |
|
jiaxin.lai
|
6728263167
|
update physics group during runtime (#8148)
* update physics group during runtime
* change default to ammo
* add physx module
* add physics_physx i18n
|
2021-01-16 11:36:28 +08:00 |
|
Leslie Leigh (李的序)
|
9ea17343b9
|
Fix: builtin standard effect should respect to alpha channel of vertex color (#8138)
* Fix: builtin standard effect should respect to alpha channel of vertex color
* Update
|
2021-01-14 15:33:40 +08:00 |
|
ChiaNing
|
a4ba6baf9d
|
builtin prefab layer change (#8129)
* builtin prefab layer change
* particle2D layer change
|
2021-01-12 18:13:05 +08:00 |
|
Knox
|
7f4bf97b06
|
update default prefab meta ver to 1.1.27 and fbx var to 2.0.10 (#8125)
|
2021-01-12 17:12:21 +08:00 |
|
Myway
|
a01445c037
|
Commit terrain image brush image (#8082)
* Commit terrain image brush image
* Effect of removing lighting map on ambient lighting
Co-authored-by: Myway3D1 <404793124@qq.com>
|
2021-01-06 11:22:41 +08:00 |
|
SijieWang
|
7abe72d240
|
Update canvas camera (#8066)
|
2020-12-31 16:24:05 +08:00 |
|
Myway
|
5e99ed70ab
|
fix terrain brush effect compile error (#8054)
* attach terrain block mode to block node
* Add update world bound method
* Update world bound when terrain height updated
* replace for of
* 修改地形画刷effect编译错误
Co-authored-by: Myway3D1 <404793124@qq.com>
|
2020-12-30 21:36:43 +08:00 |
|
Jare Guo
|
5bf129b684
|
Update default typescript asset (#8055)
|
2020-12-30 21:27:43 +08:00 |
|
黄森斌
|
bd21579385
|
update internal-db effect meta file (#8052)
|
2020-12-30 17:39:22 +08:00 |
|
ChiaNing
|
4461eb1d12
|
DynamicAtlas support (#8017)
* DynamicAtlas support
* CI fix
|
2020-12-26 14:28:30 +08:00 |
|