Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

V3.8.1 merge v3.7.4 #15849

Closed
wants to merge 11 commits into from
Closed

V3.8.1 merge v3.7.4 #15849

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7f7a55d
fix: restore downloader limited value (#15107) (#15214)
dogeFu May 29, 2023
55f7ee6
adapt xmlhttprequest for taobao (#15199) (#15238)
bofeng-song May 31, 2023
19600db
Release the listener when destroyed. (#15036) (#15235)
qiuguohua May 31, 2023
4021e4a
sync:fix mac screen change view not resize bug (#15247)
mmyduckx May 31, 2023
3585e02
optimize the code about spine setting UITransform (#15240)
zhakesi May 31, 2023
590b3ac
[ci skip][AUTO]: Automated code generating update: 2adaa636b03fdf8b41…
cocos-robot May 31, 2023
9d6527b
[fix] physics-2d contact disable not working #15149 (#15158) (#15224)
lealzhan May 31, 2023
cba7a64
[ci skip][AUTO]: Automated code generating update: 7c6ec18fc1bb9cbf2c…
cocos-robot Jun 1, 2023
77afe23
fix : prefab's string array type don't have type info (#15243) (#15256)
dogeFu Jun 1, 2023
0673680
update version of sprite meta (#15219)
yanOO1497 Jun 1, 2023
e13a24c
Merge branch 'v3.7.4' into v3.8.1-merge-v3.7.4
minggo Aug 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cocos/physics-2d/spec/i-physics-contact.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,17 +204,17 @@ export interface IPhysics2DContact {
/**
* @en
* If set disabled to true, the contact will be ignored until contact end.
* If you just want to disabled contact for current time step or sub-step, please use disabledOnce.
* @zh
* 如果 disabled 被设置为 true，那么直到接触结束此接触都将被忽略。
* 如果只是希望在当前时间步或子步中忽略此接触，请使用 disabledOnce 。
*/
disabled: boolean;

/**
* @en
* Disabled contact for current time step or sub-step.
* @zh
* 在当前时间步或子步中忽略此接触。
* @deprecated Since v3.7.4, disabledOnce is no longer supported.
*/
disabledOnce: boolean;

Expand Down
Loading