Commit Graph

10506 Commits

Author SHA1 Message Date
Zeqiang Li 8a54533514 Revert "temporarily bypass splash screen (#8486)" (#8490)
This reverts commit e46a3b04d5.
2021-04-20 12:23:50 +08:00
Santy-Wang f5a349655c fix prefab missing (#8491)
* fix prefab missing

* fix lint
2021-04-20 11:26:32 +08:00
黄森斌 ec76218be2 V3.1 optimise inspector edit asset and node (#8492)
* inspector, adjust material preview

* optimise inspector edit
2021-04-20 11:25:36 +08:00
jiaxin.lai 28d62c8393 native physx (#8455)
* Stash

* add plane/capsule shape

* add syncTo/FromNativeTransform

* support trigger/collision events

* set rigid body property on enable

* group distinguish between serialized  and lowlevel

* support trimesh-shape/mass-center

* fix cone/cylinder direction

* support cylinder/cone shape

* tweaks of pmtl

* fix setMesh

* support terrain

* support raycast

* support revolute joint

* support distance joint

* tweaks

* add some API docs

* tweaks

* optimize book and unBook

* tweaks

* tweaks
2021-04-19 20:21:29 +08:00
GengineJS 8b89c3fef2 [Feature] Rt adaptation (#8483)
* [Feature] Rt adaptation

* [Feature] Effect adds CC_HANDLE_GET_CLIP_FLIP function

* update effect

* update effects
2021-04-19 20:05:48 +08:00
Santy-Wang 2b3ab66a47 add asset place holder and remove deferred loading (#8473)
* remove deferred loading and add place holder

* resolve circle referenced

* support most of asset

* refine

* fix bugs

* refine

* should use getClassId

* change name

* change name

* change isPlaceHolder to isDefault
2021-04-19 19:48:27 +08:00
Zeqiang Li e46a3b04d5 temporarily bypass splash screen (#8486)
* temporarily bypass splash screen

* jsb condition
2021-04-19 19:10:41 +08:00
PP 21fdc92c35 fix warn in Editor (#8487) 2021-04-19 18:44:24 +08:00
yinkaile c783762f4b export particle classes (#8448)
* Fix trail error when use nested prefab. (#8390)

* export particle classes

Co-authored-by: cary <39078800+caryliu1999@users.noreply.github.com>
2021-04-19 17:26:03 +08:00
troublemaker52025 0649241938 Add packing && linear depth && self-shadowing && normal bias option for v3.1 (#8397) 2021-04-19 16:56:39 +08:00
PP 6114bc7f89 fix pc wechat brosertype (#8484) 2021-04-19 16:30:26 +08:00
PP 86f20da0f0 support pal/input (#8472)
* support pal/input

update

* update

* fix esLint

* support minigame

* support  pal/input on  minigame

* remove minigame.isSubContext

* support native

update

* deprecate static property on EventMouse

* deprecated static property in  EventTouch

* remove TODO

* remove  x y position in MouseWheel Event

* remove TODO

* remove temp code

* fix esLint

* update AccelerometerIntervalMode

* remove legacy code in JSB

* fix esLint

* optimize AccelerometerInputSource.setInterval

* fix esLint

* optimize code

* add more details for documentation

* update

* don't pass game.canvas to inputManager.registerSystemEvent

* optimize

* Revert "remove  x y position in MouseWheel Event"

This reverts commit b521ec4948d693b420887cdeb2f5f3afc1500066.

# Conflicts:
#	@types/pal/input.d.ts

* update

* fix esLint

* fix esLint
2021-04-19 16:24:42 +08:00
Santy-Wang fdd8bca3b0 Merge pull request #8485 from holycanvas/v3.1-merge-3.0.2
V3.1 merge v3.0.2
2021-04-19 16:07:36 +08:00
yinkaile be4582bd2e fixed action manager (#8476)
* fixed action manager

* fixed lint

* fixed lint

* fixed lint

* fixed lint

* fixed lint

* fixed lint
2021-04-19 16:03:52 +08:00
yeshao2069 06a0b5e589 update 2D UI component interface (#8103)
* Fix ui component ci

Fix ui component ci, fix ci

* update interface

* optimization

optimization

* update

update

* update

Modify according to Panda's amendment

* fix ci check

fix ci check error

* update scrollview

update scrollview

* fix error

* fix error

fix error

* fix: according to panda's advice

* Update scroll-view.ts

* Update scroll-view.ts

Co-authored-by: pandamicro <lphuabin@gmail.com>
2021-04-19 16:00:19 +08:00
cary 0bc3140623 Fix trail error when use nested prefab. (#8390) 2021-04-19 15:59:40 +08:00
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
GengineJS ae0bc106f8 [Feature] Optimize the shadow collect process of shadowMap (#8479) 2021-04-19 15:03:39 +08:00
PP 7ed0e73a84 remove deprecate warning in engine (#8482)
* remove deprecated BrowserType usage

* remove deprecated OS usage

update

* remove deprecated Platform usage

* fix esLint
2021-04-19 14:14:51 +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
ChiaNing b49b50d829 ui priority deprecated (#8477) 2021-04-19 10:30:14 +08:00
pandamicro cf08d9cf29 Optimize the performance of the memory pool. (#8462)
Co-authored-by: caryliu <caryliu1999@gmail.com>
2021-04-19 09:42:01 +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
Zeqiang Li a409acc7e0 native engine msaa (#8470) 2021-04-17 14:05:39 +08:00
pandamicro 57b8992101 Update effects (#8471) 2021-04-16 19:41:56 +08:00
ChiaNing edfaa4ad64 UI opacity Refactoring (#8384)
* UI opacity Refactoring

* add dirty flag

* fix bmfont

* change for update
2021-04-16 19:03:41 +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
zhefeng.zhang 8d4b4590f0 fixed setMaterial incorrect code (#8415)
* fixed setMaterial incorrect code

* Revert "fixed setMaterial incorrect code"

This reverts commit 6c41e3aed27ad2e5b717c79cdfd7ea0cbcfdfd27.

* correction code
2021-04-16 18:37:32 +08:00
lawrence-liuyue f034b1f8c5 modify quad uv coord of deferred pipeline (#8453)
* modify quad uv coord of deferred pipeline

modify quad uv coord when renderArea is different with device size

* coding style

coding style

* fix ESLint errors
2021-04-16 18:37:10 +08:00
PP 49a4eba6ae fix wrong view size on native (#8467) 2021-04-16 17:55:52 +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
Santy-Wang 2f8090ba7f move importBundleEntry to factory (#8339) 2021-04-16 15:39:32 +08:00
Leslie Leigh (李的序) 2cd6091e2b Support reflect property "tab" (#8437) 2021-04-16 15:37:47 +08:00
黄森斌 4c9f83bf5e make animationBakeRate of fbx prop editable (#8457) 2021-04-16 15:27:09 +08:00
pandamicro c4757dec49 Revert "Optimize the performance of the memory pool. (#8456)" (#8461)
This reverts commit 7f64e6409b.
2021-04-16 15:25:35 +08:00
cary bc02d492ec Fix the inversion problem of material preview. (#8443) 2021-04-16 15:24:09 +08:00
cary 7f64e6409b Optimize the performance of the memory pool. (#8456) 2021-04-16 15:23:00 +08:00
ChiaNing c524cdaa21 fix UV bug when value is zero (#8460) 2021-04-16 15:22:00 +08:00
Leslie Leigh (李的序) d65386b2a4 Bump @cocos/build-engine@4.2.5; Optimize memory consumption (#8458) 2021-04-16 15:16:06 +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
ChiaNing b89c07f2ef UITransform priority change (#8435)
* UITransform priority change

* better version

* update

* name change

* name change
2021-04-15 13:38:35 +08:00
SijieWang 2471db77d2 [Feature] Mark delayed pipeline contributors (#8452) 2021-04-15 11:23:17 +08:00
PP 9bb4c4f8ea support pal/system (#8441)
* support pal/app

update

update

* remove 'QQ_PLAY' and 'FB_PLAYABLE_ADS'

* rename system

update

* rename Language

* update

* update

* bind function in Game.ts

* rename system

* support system.getBatteryLevel()

* support pal/system on native

* support pal/system on minigame

* update

* fix esLint

* fix Circular dependency

* fix esLint

* use math/Size
2021-04-15 11:00:54 +08:00
Leslie Leigh (李的序) 02398420bd Bump @cocos/build-engine@4.2.4; Accept gift#19 (#8454) 2021-04-15 10:30:21 +08:00
PP e345039c86 fix audio loading (#8449)
* fix audio loading

* fix  audio loading in minigame
2021-04-14 14:50:41 +08:00