Skip to content

fix: reset static fields for Fast Enter Play Mode#3956

Merged
noellie-velez merged 40 commits into
develop-2.0.0from
chore/fast-enter-playmode
Jun 1, 2026
Merged

fix: reset static fields for Fast Enter Play Mode#3956
noellie-velez merged 40 commits into
develop-2.0.0from
chore/fast-enter-playmode

Conversation

@noellie-velez

@noellie-velez noellie-velez commented Apr 24, 2026 •
edited
Loading

Copy link
Copy Markdown
Collaborator

Purpose of this PR

Ensure com.unity.netcode.gameobjects package supports Fast Enter Play Mode

Jira ticket

MTT-14665

Changelog

  • Fixed: Netcode for Game Objects now supports Fast Enter Play Mode

Documentation

  • No documentation changes or additions were necessary.

Testing & QA (How your changes can be verified during release Playtest)

Functional Testing

Manual testing :

  • Manual testing done

Automated tests:

  • Covered by existing automated tests
  • Covered by new automated tests

Does the change require QA team to:

  • Review automated tests?
  • Execute manual tests?
  • Provide feedback about the PR?

If any boxes above are checked the QA team will be automatically added as a PR reviewer.

Backports

N/A

noellie-velez
noellie-velez commented Apr 24, 2026
View reviewed changes
Comment thread com.unity.netcode.gameobjects/Runtime/SceneManagement/SceneEventData.cs Outdated
noellie-velez
noellie-velez commented Apr 24, 2026
View reviewed changes
Comment thread com.unity.netcode.gameobjects/Runtime/Components/NetworkTransform.cs
noellie-velez
noellie-velez commented Apr 24, 2026
View reviewed changes
Comment thread com.unity.netcode.gameobjects/Runtime/Components/NetworkTransform.cs Outdated
@noellie-velez noellie-velez marked this pull request as ready for review April 24, 2026 15:06
@noellie-velez noellie-velez requested review from a team as code owners April 24, 2026 15:06
simon-lemay-unity
simon-lemay-unity approved these changes Apr 24, 2026
View reviewed changes

@simon-lemay-unity simon-lemay-unity left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes to UnityTransport look good to me.

noellie-velez
noellie-velez commented May 11, 2026
View reviewed changes
Comment thread com.unity.netcode.gameobjects/Runtime/Components/NetworkTransform.cs Outdated
noellie-velez
noellie-velez commented May 11, 2026
View reviewed changes
Comment thread com.unity.netcode.gameobjects/Runtime/Components/QuaternionCompressor.cs Outdated
noellie-velez
noellie-velez commented May 11, 2026
View reviewed changes
Comment thread com.unity.netcode.gameobjects/Runtime/Core/ComponentFactory.cs Outdated
noellie-velez
noellie-velez commented May 11, 2026
View reviewed changes
Comment thread com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs Outdated
noellie-velez
noellie-velez commented May 11, 2026
View reviewed changes
Comment thread com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs
noellie-velez
noellie-velez commented May 11, 2026
View reviewed changes
Comment thread com.unity.netcode.gameobjects/Runtime/Messaging/DeferredMessageManager.cs Outdated
noellie-velez
noellie-velez commented May 11, 2026
View reviewed changes
Comment thread com.unity.netcode.gameobjects/Runtime/Messaging/INetworkMessage.cs Outdated
noellie-velez
noellie-velez commented May 11, 2026
View reviewed changes
Comment thread com.unity.netcode.gameobjects/Runtime/Metrics/NetworkMetrics.cs Outdated
noellie-velez
noellie-velez commented May 11, 2026
View reviewed changes
Comment thread com.unity.netcode.gameobjects/Runtime/Metrics/NetworkMetrics.cs Outdated
EmandM
EmandM reviewed May 25, 2026
View reviewed changes

@EmandM EmandM left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is looking incredible! You've done such good thorough work on this PR. You should be really proud of yourself. :godmode:

Comment thread com.unity.netcode.gameobjects/Runtime/Core/NetworkObject.cs Outdated
Comment thread com.unity.netcode.gameobjects/Runtime/Messaging/ILPPMessageProvider.cs
Comment thread com.unity.netcode.gameobjects/Runtime/Metrics/NetworkMetrics.cs Outdated
Comment thread com.unity.netcode.gameobjects/Runtime/Configuration/CommandLineOptions.cs
Comment thread com.unity.netcode.gameobjects/Runtime/SceneManagement/SceneEventData.cs
Comment thread com.unity.netcode.gameobjects/Tests/Editor/FastEnterPlayModeTests.cs Outdated
noellie-velez
noellie-velez commented May 29, 2026
View reviewed changes
Comment thread ...ty.netcode.gameobjects/Runtime/NetworkVariable/Serialization/NetworkVariableSerialization.cs Outdated
Comment on lines +12 to +16
#if UNITY_6000_6_OR_NEWER
[Scripting.LifecycleManagement.AutoStaticsCleanup]
#endif
[Serializable]
public static class NetworkVariableSerialization<T>
public static partial class NetworkVariableSerialization<T>

@noellie-velez noellie-velez May 29, 2026 •
edited
Loading

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is breaking the tests on trunk. It seems AutoStaticsCleanup may be cleaning up after ILPP initialization.
@ShadauxCat, can you confirm whether we actually need to reset those statics?

@noellie-velez noellie-velez enabled auto-merge (squash) June 1, 2026 10:16
EmandM
EmandM approved these changes Jun 1, 2026
View reviewed changes

@EmandM EmandM left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's go!

@noellie-velez noellie-velez merged commit c48f54d into develop-2.0.0 Jun 1, 2026
23 checks passed
@noellie-velez noellie-velez deleted the chore/fast-enter-playmode branch June 1, 2026 21:09
NoelStephensUnity added a commit that referenced this pull request Jun 10, 2026
@NoelStephensUnity @jabbacakes
@michalChrobot @EmandM @simon-lemay-unity @svc-netcode-sdk @noellie-velez @mnachury-unity
chore: merge develop 2.0.0 - post unified merge (#4025)
122db34 
* fix: Improved OnValueChanged door example (#3959)

* update

Updating the door example to provide a more recommended way of using OnValueChanged.

* style

removing trailing spaces.

* Update networkvariable.md

Fixes to the example script

* Update networkvariable.md

Did another pass over this script with some improvements.

* style

removing trailing whitespace

* Apply suggestions from code review

Co-authored-by: Amy Reeve <amy.reeve@unity3d.com>

---------

Co-authored-by: Amy Reeve <amy.reeve@unity3d.com>

* ci: Update of CI dependencies and test fixes (#3970)

* corrected Android issue

* Updated dependencies

* Updated XRAY_PROFILE param to account for latest checks

---------

Co-authored-by: Noel Stephens <noel.stephens@unity3d.com>
Co-authored-by: Emma <emma.mcmillan@unity3d.com>

* fix: UniversalRpcTests failing when using IL2CPP backend (#3973)

fix

Fixing the issue with `UniversalRpcTests` failing on IL2CPP release builds using the "Method Name" stack trace information setting.

* feat: Make custom driver construction smoother (#3980)

* feat: Make custom driver construction smoother

* Add PR number to CHANGELOG entries

* Update package version

* chore: Change codeowners for UTP (#3982)

* chore: Add obsolete warnings to unused or invalid methods (#3987)

* chore: Add obsolete warnings to unused or invalid methods

* Update CHANGELOG

* dotnet-fix

* remove duplication of GetRootParentTransform

* Remove unrelated change

* Leave the public modifiers in place

* Update xml doc

* chore: Updated aspects of Netcode package in anticipation of v2.12.0 release (#3998)

* chore: Replace IsSceneObject with InScenePlaced bool (#4000)

* chore: Replace IsSceneObject with InScenePlaced bool

* Add XML doc

* Update small files

* Fix findobjects complaints

* Fix tests

* Turn off logs

* ignore invalid scenes on the scene manager

* fix: Add more detailed logging around RPC messages (#3994)

* fix: Add more detailed logging around RPC messages

* refactor: Logging update (#4002)

Update RigidbodyContactEventManager to use new logging system

* fix: reset static fields for Fast Enter Play Mode (#3956)

* fix: reset static fields for Fast Enter Play Mode support
  - Added ResetStaticsOnLoad where possible
  - Applied [AutoStaticsCleanup] to generic classes when applicable
  - Promoted immutable statics to readonly or const
  - Added OnDisable to deregister event subscriptions
  - chore: disable domain reload and remove treat warnings as errors in test project settings
  - test: add NetworkManager singleton reset test for Fast Enter Play Mode

* fix: add missing message type registrations in MessageDelivery

* chore: cleanup
  - Remove unused m_ParentedChildren field and related loops in NetworkTransform
  - Remove unused m_DespawnedInSceneObjects field in SceneEventData
  - Replace static quaternion scratch buffer in QuaternionCompressor with local variables
  - Consolidate LogSerializationOrder and EnableSerializationLogs into LogConfiguration
  - Update summary comments

* docs: update CHANGELOG

---------

Co-authored-by: Noel Stephens <noel.stephens@unity3d.com>
Co-authored-by: Emma <emma.mcmillan@unity3d.com>

* fix: end TransportConnect profiler marker on early returns in ConnectEventHandler (#4005)

BeginSample was called at the top of ConnectEventHandler but two early
return paths (duplicate server transport ID and duplicate client connect
event) exited without calling EndSample, causing the 'Missing
Profiler.EndSample' error surfaced by the MultipleConnectMessagesNoop
playmode tests.

* refactor: NetworkAnimator cleanup and code quality improvements (#4001)

  refactor: cleanup and code quality improvements in NetworkAnimator
  - Add readonly to fields where applicable
  - Narrow internal fields and methods to private where applicable
  - Fix naming casing (TransitionStateinfo, m_DestinationStateToTransitioninfo, field prefixes)
  - Replace ContainsKey + Add/index lookups with TryAdd/TryGetValue
  - Remove unused variables and dead code
  - Improve XML summaries and comment clarity

---------

Co-authored-by: Emma <emma.mcmillan@unity3d.com>

* chore: replace DEVELOPMENT_BUILD || UNITY_EDITOR with DEBUG (#4006)

* update

Replacing DEVELOPMENT_BUILD || UNITY_EDITOR with DEBUG.
Replacing niche DEVELOPMENT_BUILD uses with DEBUG.

* update

Removing extra files that didn't need to be included in this PR.

* update

Adding changelog entry

* update

Missed the codegen assembly.

* update

Upgrading our CI ubuntu image to: `package-ci/ubuntu-22.04:v4.86.0`.

* Revert "update"

This reverts commit 2b010d8.

* update

bumping ubuntu to use b1.large (segmentation fault was due to running out of memory).

* Revert "update"

This reverts commit bd1f004.

* Reapply "update"

This reverts commit 6a434bf.

* update

Switching PR triggers to use trunk as opposed to the pinned trunk.

* Revert "update"

This reverts commit 5ce1ef4.

* update

Moving pinned trunk up a bit.

* update

Fixing minor merge issues.

* update

Missed one DEVELOPMENT_BUILD || UNITY_EDITOR usage.

---------

Co-authored-by: Amy Reeve <amy.reeve@unity3d.com>
Co-authored-by: Michał Chrobot <124174716+michalChrobot@users.noreply.github.com>
Co-authored-by: Emma <emma.mcmillan@unity3d.com>
Co-authored-by: Simon Lemay <simon.lemay@unity3d.com>
Co-authored-by: Netcode team bot <svc-netcode-sdk@unity3d.com>
Co-authored-by: Noellie Vélez <noellie.velez@unity3d.com>
Co-authored-by: mnachury-unity <120488254+mnachury-unity@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@NoelStephensUnity NoelStephensUnity NoelStephensUnity left review comments

@EmandM EmandM EmandM approved these changes

@simon-lemay-unity simon-lemay-unity simon-lemay-unity approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@noellie-velez @EmandM @NoelStephensUnity @simon-lemay-unity @netcode-ci-service