Commit Graph

17466 Commits

Author SHA1 Message Date
Knox 7ca12d9154 fix video isPlaying error for 3d-tasks/issues/6545 (#8354) 2021-03-12 19:44:56 +08:00
dependabot[bot] ce237c9aa8 Bump http-proxy from 1.18.0 to 1.18.1 (#8178)
Bumps [http-proxy](https://github.com/http-party/node-http-proxy) from 1.18.0 to 1.18.1.
- [Release notes](https://github.com/http-party/node-http-proxy/releases)
- [Changelog](https://github.com/http-party/node-http-proxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/http-party/node-http-proxy/compare/1.18.0...1.18.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-03-12 18:03:07 +08:00
dependabot[bot] b456ce6c6e Bump handlebars from 4.2.1 to 4.7.6 (#8180)
Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.2.1 to 4.7.6.
- [Release notes](https://github.com/wycats/handlebars.js/releases)
- [Changelog](https://github.com/handlebars-lang/handlebars.js/blob/master/release-notes.md)
- [Commits](https://github.com/wycats/handlebars.js/compare/v4.2.1...v4.7.6)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-03-12 17:30:45 +08:00
Cocos Robot b999ddbf54 [ci skip][AUTO]: updating jsbinding automatically: acbd39ff (#3316)
Co-authored-by: cocos-robot <engine-deploy@cocos.com>
2021-03-12 11:44:28 +08:00
Yun Hsiao Wu acbd39ff55 move minimal jsb init into a separate header (#3314) 2021-03-12 09:56:04 +08:00
ChiaNing 24e9e573f0 fix richText maxWidth bug (#8345)
* fix richText maxWidth bug

* add notice
2021-03-11 19:12:47 +08:00
ChiaNing 06bcba44ad Change the alignment timing of widget in once mode (#8347) 2021-03-11 18:54:14 +08:00
Yun Hsiao Wu 85edbc94e7 enable device thread by default (#3311) 2021-03-11 11:50:28 +08:00
Cocos Robot 56bf2c6488 [ci skip][AUTO]: updating jsbinding automatically: 6b197934 (#3312)
Co-authored-by: cocos-robot <engine-deploy@cocos.com>
2021-03-11 11:25:01 +08:00
Yun Hsiao Wu 6b197934ff basic framegraph (#3303) 2021-03-11 11:15:09 +08:00
mmyduckx 19bae97854 fix native dragonbones bug (#8343) 2021-03-10 17:31:00 +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
Cocos Robot 343768fbe7 [ci skip][AUTO]: updating jsbinding automatically: fce19d28 (#3310)
Co-authored-by: cocos-robot <engine-deploy@cocos.com>
2021-03-10 15:16:23 +08:00
minggo d03540a472 fix compile warning (#3309) 2021-03-10 15:15:20 +08:00
cary fce19d28d9 fix jsb binding error (#3307) 2021-03-10 14:50:26 +08:00
江战 59ae88d448 Update generate-pr.sh (#3306) 2021-03-10 14:03:41 +08:00
ChiaNing f219fd20a0 fix mask un-do bug (#8338) 2021-03-10 14:01:48 +08:00
江战 f835e7dec8 [CI] Update generate-pr.sh (#3305) 2021-03-10 13:50:02 +08:00
Yun Hsiao Wu ab32b3083e vk: update barrier manager ref on destroy (#3304)
* vk: update barrier manager ref on destroy
2021-03-09 15:55:50 +08:00
ChiaNing 58cb4a217c fix widget bug when widget disabled (#8337) 2021-03-09 15:29:58 +08:00
troublemaker52025 daeaeb31be Fix shadows instancingMaterial error for v3.0.1 (#8336) 2021-03-09 11:00:09 +08:00
Santy-Wang 3189e9080e change engine version (#8333) 2021-03-08 11:45:59 +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
GengineJS 38ebf299a5 [Fix] _buffer undefine (#3301) 2021-03-06 08:31:19 +08:00
yongminghuang 7d2db6770c [adjsut] rename jsb to ral (#8327)
* [adjsut] rename jsb to ral ,add ovh  jsb.js

* [adjust] adjust

* [adjust] adjust  adapter

* [adjust] update adapter

* [adjust] updata adapter

* [bug] fix cannot run in cocos play

* [bug] fix vivo cannot run

* [adjust]rename jsb.js to ral.js
2021-03-05 19:57:07 +08:00
Myway 421ea2b4f8 Fix missing textures referenced by Terrain (#8331)
* Terrain asset use texture object instead uuid, fix export texture for building

* fix terrain asset export missing

Co-authored-by: Myway3D1 <404793124@qq.com>
2021-03-05 19:28:44 +08:00
cary 0aea3d2bdb Fix the error when deactive node in onLoad. (#8326) 2021-03-05 19:01:56 +08:00
cary 73ffe4916e Fix the setter error in mesh deserialization. (#8329) 2021-03-05 18:57:32 +08:00
ChiaNing 31d7c6ae24 Event bug fix when set node active false on touchStart (#8330)
* 修复单点触摸下,点击的节点被销毁后,后续点击全部失效

* 修复layout的节点onDisable后_usefulLayoutObj被清空没有初始化

* 修复单点触摸下,点击的节点设置active为false,后续点击全部失效

(cherry picked from commit 8dbcc264e51d29f18748813c3c387d232bc94eff)

* 移除监听器时判断是否是当前触摸点的监听器

* 取消预编译

* useless remove

* fix format

* update

Co-authored-by: DESKTOP-I10K06A\章 <772055549@qq.com>
2021-03-05 17:34:16 +08:00
jiaxin.lai 44777deb5c support ccd events in ammo physics (#8325) 2021-03-05 17:33:25 +08:00
troublemaker52025 cb4c35bdd9 Remove unused shadow attributes (#8328) 2021-03-05 15:38:32 +08:00
troublemaker52025 86a4d426bd Fix planar shadow instanced error v3.0.1 (#8322)
* fix planar shadow instanced error for v3.0.1

* update
2021-03-05 13:48:33 +08:00
PP e9963878ed fix editBox end editing by pressing return on Win32 / MacOS (#3295) 2021-03-05 11:17:34 +08:00
troublemaker52025 67c8075642 Fix planar shadow has not update ubo at lights for v3.0.1 (#3293) 2021-03-05 09:29:05 +08:00
mmyduckx 5df2f13fe5 Fix native node active (#8323)
* fix native node active bug

* comment remove
2021-03-04 17:27:47 +08:00
troublemaker52025 e5f454b579 fix planar shadow instanced error for v3.0.1 (#3299) 2021-03-04 17:12:48 +08:00
jiaxin.lai 30d27a6d6d fix tween custom easing property (#8321) 2021-03-04 15:21:55 +08:00
PP e9a7bea806 update README for custom engine (#8310) 2021-03-04 15:12:26 +08:00
ChiaNing cfa42f5b4c fix static ui bug on iOS 14 (#8320) 2021-03-04 11:12:04 +08:00
cary 3385ffbdd8 Fix shader compile error. (#3298) 2021-03-04 10:20:46 +08:00
PP a14f36321f optimize Label black border on bytedance platform (#8319) 2021-03-04 10:09:53 +08:00
zhefeng.zhang 29bc42e0ba sync pr 7501 & 7914 (#7915)
* sync pr 7501 & 7914

* fixed when use two tiled sprite

* 解决冲突

* Revert "解决冲突"

This reverts commit 8cd4cd9c2d4de17910ae34c98d8b309e0a3c1763.

* refine code

* refine cod

* 资源下载任务创建统一使用create接口 (#8266)

* upload

* upload

* correction code

* Revert "correction code"

This reverts commit b794b5a54f73b92e79bd97c8ec3f3ba98784f62b.

* refine code

Co-authored-by: QinSheng <1053128593@qq.com>
2021-03-03 15:00:34 +08:00
troublemaker52025 6d38fb53f3 Resolve uninitialized uniform (#8303) 2021-03-03 09:56:45 +08:00
troublemaker52025 69067cbc1f Resolve uninitialized uniform (#3292) 2021-03-03 09:56:09 +08:00
PP 6e17f5e326 support gen-simulator-release (#3297) 2021-03-03 09:47:11 +08:00
cary f38fd57c0f Fix phase error of gbuffer stage. (#8318) 2021-03-03 08:50:56 +08:00
cary e5fe94e743 Fix the material and resources of the deferred pipeline. (#3294) 2021-03-03 08:46:00 +08:00
Santy-Wang 2f3975f39b hack: check cached file (#8317) 2021-03-02 19:16:48 +08:00
ChiaNing 2a5778b55d update assembler RenderData when label updateRenderData force (#8316) 2021-03-02 19:11:37 +08:00