Commit Graph

17466 Commits

Author SHA1 Message Date
cary 8b4c2f7f5e Fix the material and resources of the deferred pipeline. (#8289) 2021-03-02 18:19:29 +08:00
minggo b69aeb5976 fix default depth/stencil texture size (#3296) 2021-03-02 18:12:08 +08:00
jiaxin.lai 6678663a8f fix runtime setMesh in ammo physics (#8315)
* fix setMesh in ammo physics

* re-add if only if isEnabled
2021-03-02 15:37:57 +08:00
minggo 74b1ee6d32 Update config.json 2021-03-02 14:53:19 +08:00
ChiaNing 034e380b50 mask event through bug (#8313)
* mask event through bug

* update
2021-03-02 13:51:19 +08:00
jiaxin.lai 6bf8785ce2 execute tween system in update (#8305) 2021-03-02 11:08:32 +08:00
jiaxin.lai 4bdc6919bc fix initialize rigidbody with enable state (#8307) 2021-03-02 10:10:30 +08:00
Santy-Wang 1b3d7c7506 avoid using persistNodeList directly, persist node can be changed dur… (#8302)
* avoid using persistNodeList directly, persist node can be changed during destruction

* refine code format

* use map instead
2021-03-01 19:31:43 +08:00
ChiaNing d7f8389956 fix widget always mode bug (#8304) 2021-03-01 14:18:51 +08:00
Yun Hsiao Wu ea88ba33c6 codebase structure update (#3289)
* structure

* fix jsb auto binding license issue
2021-03-01 12:00:10 +08:00
PP 5d5a8fc245 adapt runtime 2.0 (#8287)
* add cocos runtime

update

update

* support link-sure

* update  jsb

* support oppo

* move fs-utils && AudioPlayer to common

update

* fix loadSubPackage

* support qtt

* add huawei & vivo

* remove qgame-adapter.js

* optimize accelerometer

* add back copyright
2021-03-01 11:10:20 +08:00
Knox 0981eb7cbd improve video player seekTo in android (#3291)
* improve video player seekTo in android
2021-03-01 09:41:59 +08:00
Zeqiang Li 14d7126a46 Fix issue of uint index data type. (#3290) 2021-02-26 18:28:31 +08:00
ChiaNing 48559076ba fix layout align bug (#8301) 2021-02-26 18:04:52 +08:00
Yun Hsiao Wu 1bed3365fb fix precompile combinations (#8298) 2021-02-26 15:29:43 +08:00
QinSheng 634ad0fb5e 资源下载任务创建统一使用create接口 (#8266) 2021-02-26 14:59:34 +08:00
ChiaNing 648ae6e3e4 remove UV coordinates hack for better rendering effect (#8296)
* remove UV coordinates hack for better rendering effect

* useless remove

* eslint fix
2021-02-26 14:52:41 +08:00
JoneLau ca043177a9 fix layout component not performing alignment again after inactivation (#8281)
* fix layout component not performing alignment again after inactivation

* fix the fixed number of rows/columns calculation error
2021-02-26 14:33:45 +08:00
ChiaNing 15a4041aa5 fix mask event through bug (#8293) 2021-02-26 14:31:00 +08:00
mmyduckx 0ae529eb0e fix inconsistent declaration in 3.0 and 2.4 (#8292) 2021-02-26 14:12:49 +08:00
yinkaile d40748e4a7 fixed builtinin 2d physics collider test (#8294)
* fixed builtinin 2d physics collider test

* fixed typo
2021-02-26 14:11:55 +08:00
zheng han a526e499e4 reorganize prefab related files (#8291)
* reorganize prefab related files

* fix CI of component
2021-02-26 13:42:08 +08:00
ChiaNing 90d94fead6 api module change (#8272)
(cherry picked from commit 314ede133cd6b1873b6f71876f16947733de2c46)
2021-02-25 17:31:08 +08:00
黄森斌 f01f065f8c v3.0.1 Remove redundant display attributes of ParticleComponent show in Editor (#8284)
* Remove redundant display attributes in Editor

* revert one change

* revert change
2021-02-25 15:28:25 +08:00
Leslie Leigh (李的序) 5fd06ad3f9 Optimize cpu computing morph (#8280) 2021-02-25 15:27:30 +08:00
zhefeng.zhang 9581d0c6b5 sync-2.4.5-pr-8254 (#8256)
* sync-2.4.5-pr-8254

* correction code

* Revert "correction code"

This reverts commit 0ba7eb1a15ad82dc033846f6ae00a5ef690135e5.
2021-02-25 15:26:45 +08:00
Santy-Wang d036656877 avoid persist node's uuid collision (#8285) 2021-02-23 19:54:28 +08:00
mmyduckx 0513d8bf2a fix native spine/dragonbones node move bug & node active bug (#8265)
* Revert "Fix node move (#8177)" and Fix node move bug

* refine jsb

* fix node active bug
2021-02-23 19:53:11 +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
minggo 71ac6faff3 Merge pull request #3287 from minggo/merge_3.0_to_dev
Merge 3.0 to dev
2021-02-19 15:39:17 +08:00
minggo f3ebcad81f Merge branch 'v3.0.0' into merge_3.0_to_dev 2021-02-19 10:51:11 +08:00
Zeqiang Li 16e72fff9d revert logic of loadop (#3276) 2021-02-19 10:50:23 +08:00
mmyduckx 28838ba43d update LaunchScreenBackground.png from cocos 2dx to cocos creator (#3273) 2021-02-19 10:50:23 +08:00
Zeqiang Li 2f9525d4e5 fix rendering issue caused by depthattachment's StoreAction (#3272) 2021-02-19 10:50:23 +08:00
minggo b837593afa Merge pull request #3279 from YunHsiao/device-proof
latest device layer
2021-02-09 19:23:10 +08:00
pandamicro 31e3642301 refactor presentCompleted to onPresentCompleted 2021-02-08 19:51:26 +08:00
pandamicro f1b27da2ef Fix compilation issues on iOS & mac 2021-02-08 19:48:28 +08:00
pandamicro 51ac6fbaae Merge pull request #8270 from pandamicro/develop
Merge V3.0.0 to develop
2021-02-08 13:25:10 +08:00
pandamicro 9d9da055cc Merge remote-tracking branch 'origin/v3.0.0' into develop 2021-02-08 13:04:53 +08:00
pandamicro eae4d1b82d Add GPU GC Pool clear while present completed 2021-02-08 12:40:56 +08:00
pandamicro 6ec439ba9f Fix merge issue 2021-02-08 11:14:02 +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
mmyduckx c80cd84bbd fix dragonbones resource import crash bug (#3286) 2021-02-07 11:15:03 +08:00
Yun Hsiao Wu a674efe2dc fix conflicts 2021-02-07 10:57:40 +08:00
Yun Hsiao Wu 0245a79df6 Merge remote-tracking branch 'mine/device-proof' into device-proof 2021-02-07 10:34:24 +08:00
Yun Hsiao Wu defdc8d5b0 Merge branch 'v3.1' of https://github.com/cocos-creator/engine-native into device-proof 2021-02-07 10:33:25 +08:00
Yun Hsiao Wu e381babfbe fix format 2021-02-05 20:21:52 +08:00
minggo 359589862b Merge pull request #3282 from minggo/merge_v3.0
Merge v3.0
2021-02-05 19:01:25 +08:00