Skip to content

chore: Up-port from develop-2.0.0 from week 31 - #4116

Merged
michalChrobot merged 7 commits into
develop-3.x.xfrom
up-port-develop-3-x-03-08
Aug 3, 2026
Merged

chore: Up-port from develop-2.0.0 from week 31#4116
michalChrobot merged 7 commits into
develop-3.x.xfrom
up-port-develop-3-x-03-08

Conversation

@michalChrobot

@michalChrobot michalChrobot commented Aug 3, 2026

Copy link
Copy Markdown
Member

Purpose of this PR

PR that up-ports PRs that landed last week or otherwise since we did the last up-port (until 2.13.1 release). Note that I won't "squash and merge" and I will rather merge them separately as then in the future it will be easier to reason about PRs history

image

Jira ticket

N/A, chore work

Changelog

N/A, all changelog entries from previous PRs are included

Documentation

N/A

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

Green CI pass

Up-port

N/A, this is an up-port

Backports

N/A

michalChrobot and others added 7 commits August 3, 2026 10:24
* ci: Split code coverage into Package Test and Project Test jobs

Convert the existing coverage job to [Code Coverage] Package Test - NGO [ubuntu, trunk] and add [Code Coverage] Project Test - NGO testproject [ubuntu, trunk]. Wire Package Test into PR/nightly triggers and Project Test into the weekly run.

* ci: Run both coverage jobs on PR and nightly

* ci: Use pinnedTrunk for PR coverage and drop package-test job
* chore: Point CMB resources at new monorepo
…ed authority topology fails to sync NetworkVariable (#4107)

* fix

This resolves the issue where in a distributed authority session changing a NetworkVariable prior to changing ownership in the same call-stack would result in the NetworkVariable not being synchronized.

* fix - update

Removing the additional authority check as it is not needed.
Fixing a very edge case scenario that shouldn't happen but in the event it does when finding objects by type within a specific scene, if the scene is invalid then use an empty array for the found objects.
…4093)

* fix

- Issue where disabled in-scene placed NetworkObjects could not be spawned after starting a session.
- Issue where users are allowed to spawn a NetworkObject with a GlobalObjectIdHash value of 0 (zero).

* update

NetworkAnimator not pointing to an animator within awake now just logs a warning as opposed to an error.

* test

Updating tests based on the fixes applied to this branch.
A large portion is related to some integration tests trying to spawn NetworkObjects with a GlobalObjectIdHash value of zero(0).

* update

Style and providing internal write access to the prefabs list.

* test

Potentially last iteration on fixing/updating integration tests.

* test - fix

Using the fixed version of NetworkPrefabHandlerSpawnAndSynchronizeTests.
Fixing some issues with prefab and handler creation.

* style

Fixing formatting issues.

* style

Fixing some standards formatting related issues.

* style

removing trailing spaces.

* style

Super weird one... but using ? as opposed to an if null check.

* style

Removing commented out code that is no longer needed/used.

* update

Committing suggested changes.

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

* update

Applying changes based on review discussion.

* update

Making adjustments based on review discussion.

* style

Removing field that is no longer valid.
Moving Awake higher in NetworkObject as it has become wedged in the middle of the code.

* update

Adding change log entries.

* update

Inverting logic (oops)

* doc

Updating NetworkObject documentation and in-scene placed documentation.

* Update documentation for the two types of NetworkObjects

Clarified the categories of NetworkObjects and their requirements. Added details for dynamically instantiated and in-scene placed NetworkObjects.

* style

White spaces!

* Apply suggestions from code review

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

---------

Co-authored-by: Emma <emma.mcmillan@unity3d.com>
Co-authored-by: Amy Reeve <amy.reeve@unity3d.com>
* Docs-wide link fixes and xref update

* Typo in API docs
@codecov-github-com

codecov-github-com Bot commented Aug 3, 2026

Copy link
Copy Markdown

Codecov Report

Attention: Patch coverage is 80.61224% with 19 lines in your changes missing coverage. Please review.

Files with missing lines Patch % Lines
...ameobjects/Runtime/Configuration/NetworkPrefabs.cs 84.74% 9 Missing ⚠️
...ameobjects/Runtime/Spawning/NetworkSpawnManager.cs 68.42% 6 Missing ⚠️
....netcode.gameobjects/Runtime/Core/NetworkObject.cs 78.94% 4 Missing ⚠️
@@                Coverage Diff                @@
##           develop-3.x.x    #4116      +/-   ##
=================================================
+ Coverage          70.52%   78.00%   +7.48%     
=================================================
  Files                146      153       +7     
  Lines              23286    26254    +2968     
=================================================
+ Hits               16422    20480    +4058     
+ Misses              6864     5774    -1090     
Flag Coverage Δ
NGOv2_project_testproject_ubuntu_pinnedTrunk 77.71% <80.61%> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines Coverage Δ
....gameobjects/Runtime/Components/NetworkAnimator.cs 76.02% <ø> (ø)
...ty.netcode.gameobjects/Runtime/Core/FindObjects.cs 84.31% <100.00%> (ø)
...eobjects/Runtime/Messaging/RpcTargets/RpcTarget.cs 100.00% <ø> (ø)
....netcode.gameobjects/Runtime/Core/NetworkObject.cs 75.29% <78.94%> (+11.25%) ⬆️
...ameobjects/Runtime/Spawning/NetworkSpawnManager.cs 73.24% <68.42%> (+6.72%) ⬆️
...ameobjects/Runtime/Configuration/NetworkPrefabs.cs 81.64% <84.74%> (+4.48%) ⬆️

... and 50 files with indirect coverage changes

Components Coverage Δ
com.unity.netcode.gameobjects 78.00% <80.61%> (+7.48%) ⬆️

ℹ️ Need help interpreting these results?

@michalChrobot
michalChrobot merged commit 57fdfb6 into develop-3.x.x Aug 3, 2026
28 checks passed
@michalChrobot
michalChrobot deleted the up-port-develop-3-x-03-08 branch August 3, 2026 13:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants