Commit Graph

20198 Commits

Author SHA1 Message Date
minggo 4c2cb1d42e Merge pull request #14900 from minggo/merge_v3.7.3
Merge v3.7.3
2023-04-24 16:25:27 +08:00
minggo fbafcaace4 fix compiling error 2023-04-24 15:32:23 +08:00
PP e08d21f9ad fix compile native ts (#159) 2023-04-24 13:46:55 +08:00
jk20012001 448cbfc72c resolve conflict 2023-04-24 12:02:23 +08:00
minggo a22d16bbe6 Merge branch 'v3.7.3' into merge_v3.7.3 2023-04-24 11:26:58 +08:00
媛媛 2519d864c9 [Update] update directory meta (#14897) 2023-04-24 10:01:26 +08:00
jk20012001 be9af44774 fix light type used in ubo and shader (#14891) 2023-04-23 17:34:13 +08:00
oahc09 26d6d555b8 fix:webxr camera node's position is wrong (#14889) 2023-04-23 10:18:16 +08:00
oahc09 63bdc9ff4a feat:xr interface support async load asset image (#14876) 2023-04-23 09:27:55 +08:00
PP 380ba84f79 fix: can't import 'cc' engine with physics module on OH platform (#14887) 2023-04-21 16:32:35 +08:00
Knox 1712a0a01d handle the case where the event detail parameter in listeners in openKit is null (#14884) 2023-04-21 15:51:23 +08:00
jk20012001 b72c6d2215 fix iphone wechat toon surface shader NaN data (#14878) 2023-04-21 15:51:14 +08:00
mmyduckx 74acc482ac fix webxr raf do not run bug (#14885) 2023-04-21 15:32:18 +08:00
shaoqiangcai f8a2e38134 Test Case Branch Problem (#14881)
Adjusting the test case branch to match the engine version
2023-04-21 14:20:29 +08:00
黄森斌 a34b73af93 [Bug] fix can not find module lodash (#14879) 2023-04-21 11:44:57 +08:00
shaoqiangcai 14bbc30a0b Automation Test Run Status (#14877)
Add test case version automatic acquisition, add automated test status
2023-04-21 10:44:19 +08:00
江战 2fec57faf0 set default xcode target (#14853) 2023-04-21 10:28:33 +08:00
fqamic 36b69d4fd7 engine support to webxr (#14861)
* feat: input support to webxr
1.new webxr gamepad event
2.new webxr handle pose event
3.support webxr hmd pose event

* feat: split the frameMove function to support xr readability

* feat:Add webxrFrameMove for webxr

* improve:xr stands for globalThis.globalXR

* improve(xr):format code

* fix: webxr gamepad update cache error

* fix: webxr gamepad update cache error

* fix: code naming error

* fix: update cache right gamepad data error

* improve: any is enough for any | undefined

* improve: modify interface PoseInfo and IGamepadCacheInfo

* improve: declare IGamepadCacheInfo

* fix: globalThis.__globalXR is undefined

---------

Co-authored-by: linyuanyi <1111>
2023-04-20 23:23:15 +08:00
May2nd eda23bcba3 - fix memory leak in builtin-physics (#14774)
* - fix memory leak in builtin-physics

* - update eslint

---------

Co-authored-by: Viet <>
2023-04-20 18:54:32 +08:00
mmyduckx 097c3cead0 keyboard input support for wechat program (#14836)
* add keyboard input adapter for wechat program

* refine

* refine
2023-04-20 18:53:56 +08:00
bofeng-song 73412caf59 Fix the issue of button response offset caused by listening to incorrect objects (#14864) 2023-04-20 17:29:12 +08:00
jk20012001 9097898569 fix parsed info for vscode plugin (#14873) 2023-04-20 16:53:59 +08:00
江战 81c4e12322 revert change for genbindings.js (#14871) 2023-04-20 16:53:14 +08:00
Cocos Robot 4f0849a302 [ci skip][AUTO]: Automated code generating update: 63651aa149b69b34d382910dcbbdc85f3f850e92 (#14847) (#14870)
Co-authored-by: cocos-robot <cocos-robot@cocos.com>
2023-04-20 14:56:13 +08:00
Cocos Robot a00336d508 [ci skip][AUTO]: Automated code generating update: 0997e32c6a7fe1b582b4943271af8bb9bf66edc0 (#14807) (#14811)
Co-authored-by: cocos-robot <cocos-robot@cocos.com>
2023-04-20 14:55:43 +08:00
shaoqiangcai b146264070 Report errors in adjusting PR test (#14869)
Report errors in adjusting PR test
2023-04-20 14:51:13 +08:00
qiuguohua 125f8c8978 [OpenHarmony] Fix the problem of compilation failure on mac due to incorrect case (#14847) 2023-04-20 14:42:42 +08:00
Yiwen 3713957624 collider constraint (#14068)
* collider constraint

* rm uncessary function import

* bullet doesn't prevent dynamic rigid body using simplex collider

* convex mesh with dynamic rigid body is allowed

* clear useless imports
2023-04-20 14:32:48 +08:00
zhakesi 5694bdb9b8 fix frame id is -1 after switching animation clip. (#14851) 2023-04-20 14:31:12 +08:00
jk20012001 9bb895ef28 update comment for vscode plugins (#14867) 2023-04-20 11:46:01 +08:00
bofeng-song 81198b3942 taobao supports for separating engine versions independent of engine versions (#14849)
* taobao supports for separating engine versions independent of engine versions

* refine
2023-04-20 11:05:04 +08:00
江战 f835202a80 bugfix: node.jsb.ts addComponent _requireComponents can be an Array (#14850) 2023-04-20 11:02:30 +08:00
hyde zhou d1369d2ab4 V3.7.3 pipeline (#14772) 2023-04-19 23:23:43 +08:00
Zach Lee bf971a7260 fix dereferencing null pointers when passing through multiple submodels, where the preceding submodels do not include forwardadd+ pass. (#14840) 2023-04-19 21:52:53 +08:00
黄森斌 a67270b67c [optimize] prefab buttons click events in inspector (#14862) 2023-04-19 21:28:12 +08:00
黄森斌 b51f904089 lock update interface when multi-change nodes (#14765)
* lock update interface when multi-change nodes

* 修复批量修改节点时更新数据和快照的问题

* add snapshot condition

* asset.js  set readyToUpdate
2023-04-19 21:11:17 +08:00
Zach Lee 32f04095e4 fix overload compile issue. (#14843) 2023-04-19 21:05:19 +08:00
黄森斌 c2323e2160 update layers bitmask and enum (#14573)
* update layers bitmask and enum

* Layers.BitMask update

* modify testClass name
2023-04-19 20:40:12 +08:00
徐兵 9b1ab8c691 ignore transparent object with capturing reflection probe (#14786) 2023-04-19 19:14:27 +08:00
徐兵 4b22f8b3c9 fix unnormalized N lead to dark terrain (#14860) 2023-04-19 19:09:53 +08:00
shaoqiangcai 7bf2ec33bf Adjusting automation testing service errors (#14856)
Error adjusting automatic test service directory, syntax error, etc
2023-04-19 17:34:00 +08:00
jk20012001 a2143ee67d add support for effect vscode plugins and fix unnormalized TN (#14813) 2023-04-19 16:06:48 +08:00
shaoqiangcai 77c08a73de Adjusting win script errors in pr test (#14845)
Win-RunTestCases errors
2023-04-19 15:34:42 +08:00
江战 dd423882f2 Update external-config.json (#14838) 2023-04-19 15:29:37 +08:00
zxx43 35975e1aae add deprecate api (#14844)
* add deprecate api

* modify suggest
2023-04-19 12:34:03 +08:00
zxx43 fbbdab53a4 use getSharedMaterial to replace getMaterial (#14814)
* use getSharedMaterial to replace getMaterial

* call getSharedMaterial directly

* modify note
2023-04-19 11:07:46 +08:00
shaoqiangcai 3428660954 PR_ Test renew (#14842)
PR_ Test
2023-04-19 10:55:55 +08:00
zxx43 aad941159e Fix gradient sample value when ratio is one (#14538)
* fix gradient value issue https://github.com/cocos/cocos-engine/issues/14534

* use last color when last time

* add EPSILON when repeat

* use epsilon to check last frame

* use approx

* modify input parameters
2023-04-19 10:37:25 +08:00
Zach Lee 790f9339e7 feature: support save shader cache incremental. (#14822) 2023-04-19 10:09:55 +08:00
shaoqiangcai 0ff00e61d1 Adjusting pr test to a new architecture (#14834)
Adjusting pr test to a new architecture
2023-04-18 21:49:01 +08:00