Skip to content

chore: 6000.3.0a6 updates #3600

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

Merged
merged 4 commits into from
Aug 14, 2025
Merged

chore: 6000.3.0a6 updates #3600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
be13f8e
update
NoelStephensUnity Aug 14, 2025
caa2f8a
fix
NoelStephensUnity Aug 14, 2025
7f429b1
update
NoelStephensUnity Aug 14, 2025
b720328
update
NoelStephensUnity Aug 14, 2025
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
5 changes: 5 additions & 0 deletions com.unity.netcode.gameobjects/Runtime/Components/RigidbodyContactEventManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,8 +374,13 @@ public void Execute(int index)

var result = new JobResultStruct()
{
#if UNITY_6000_3_0A6_OR_HIGHER
ThisInstanceID = PairedHeaders[index].bodyEntityId,
OtherInstanceID = PairedHeaders[index].otherBodyEntityId,
#else
ThisInstanceID = PairedHeaders[index].bodyInstanceID,
OtherInstanceID = PairedHeaders[index].otherBodyInstanceID,
#endif
AverageNormal = averageNormal,
HasCollisionStay = collisionStaycount != 0,
AverageCollisionStayNormal = averageCollisionStay,
Expand Down
5 changes: 5 additions & 0 deletions com.unity.netcode.gameobjects/Runtime/Unity.Netcode.Runtime.asmdef
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,11 @@
"name": "Unity",
"expression": "6000.1.0a1",
"define": "HOSTNAME_RESOLUTION_AVAILABLE"
},
{
"name": "Unity",
"expression": "6000.3.0a6",
"define": "UNITY_6000_3_0A6_OR_HIGHER"
}
],
"noEngineReferences": false
Expand Down