Skip to content

feat: upgrade project to NGO v1.6.0 [MTT-6875] #865

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 6 commits into from
Aug 30, 2023
Merged

feat: upgrade project to NGO v1.6.0 [MTT-6875] #865

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4f5f28c
upgrade project to NGO v1.6.0
fernando-cortez Aug 25, 2023
16f77e6
creating version define for NGO versions of range 1.5.2 to 1.6.0 & ex…
fernando-cortez Aug 28, 2023
765fe1e
code standards pass
fernando-cortez Aug 28, 2023
116c1c0
changelog addition
fernando-cortez Aug 28, 2023
b93d3bc
adding more context
fernando-cortez Aug 30, 2023
ddfd13c
more context
fernando-cortez Aug 30, 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
7 changes: 5 additions & 2 deletions Assets/Tests/Runtime/ConnectionManagementTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ public override void LoadScene(string sceneName, bool useNetworkSceneManager, Lo
ConnectionManager[] m_ClientConnectionManagers;
ConnectionManager m_ServerConnectionManager;


protected override bool CanStartServerAndClients()
{
return false;
Expand Down Expand Up @@ -154,6 +153,7 @@ protected override IEnumerator OnTearDown()
{
GameObject.DestroyImmediate(sceneGameObject);
}

yield return base.OnTearDown();
}

Expand Down Expand Up @@ -285,6 +285,7 @@ public IEnumerator AttemptingToConnectWithSamePlayerId_ClientsDisconnectedWithRe

// The first client should be able to connect
Assert.IsTrue(m_ClientNetworkManagers[0].IsConnectedClient, "The first client is not connected.");

// Every other client should get their connection denied
for (var i = 1; i < NumberOfClients; i++)
{
Expand Down Expand Up @@ -356,6 +357,7 @@ public IEnumerator UnexpectedClientDisconnect_ClientReconnectingSuccessfully()
subscriptions.Dispose();
}

#if !NETCODEFORGAMEOBJECTS_1_5_2_OR_1_6_0
[UnityTest]
public IEnumerator UnexpectedServerShutdown_ClientsFailToReconnect()
{
Expand Down Expand Up @@ -435,6 +437,7 @@ public IEnumerator UnexpectedServerShutdown_ClientsFailToReconnect()
Assert.AreEqual(NumberOfClients, nbGenericDisconnectMsgReceived, "Not all clients received a GenericDisconnect message.");
subscriptions.Dispose();
}
#endif

[UnityTest]
public IEnumerator ClientAndHostChangingRolesBetweenSessions_Success()
Expand Down Expand Up @@ -508,6 +511,7 @@ public IEnumerator ClientCancellingWhileConnectingToNonExistingServer_NoConnecti
{
m_ClientConnectionManagers[i].StartClientIp($"client{i}", "127.0.0.1", 9998);
}

m_ClientConnectionManagers[0].RequestShutdown();

for (var i = 1; i < NumberOfClients; i++)
Expand All @@ -523,6 +527,5 @@ public IEnumerator ClientCancellingWhileConnectingToNonExistingServer_NoConnecti
Assert.IsFalse(m_ClientNetworkManagers[i].IsConnectedClient, $"Client{i} is connected while no server is running.");
}
}

}
}
10 changes: 8 additions & 2 deletions Assets/Tests/Runtime/Unity.BossRoom.Tests.Runtime.asmdef
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,12 @@
"defineConstraints": [
"UNITY_INCLUDE_TESTS"
],
"versionDefines": [],
"versionDefines": [
{
"name": "com.unity.netcode.gameobjects",
"expression": "[1.5.2,1.6.0]",
"define": "NETCODEFORGAMEOBJECTS_1_5_2_OR_1_6_0"
}
],
"noEngineReferences": false
}
}
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ Additional documentation and release notes are available at [Multiplayer Documen
* Upgraded editor version to 2022.3.7f1 (#855)
* Upgraded Authentication Service package to v2.7.1
* Upgraded Wire Service package to v1.2.0
* Upgraded Boss Room to Netcode for GameObjects v1.6.0 (#865)
* A package Version Define has been created for Netcode for GameObjects v.1.5.2 - v1.6.0. Recent refactorings to NetworkManager's shutdown have prevented the ability to invoke CustomMessages when OnClientDisconnected callbacks are invoked during a shutdown as host. This regression has caused one of our runtime tests, namely Unity.BossRoom.Tests.Runtime.ConnectionManagementTests.UnexpectedServerShutdown_ClientsFailToReconnect, to fail and it does not impact gameplay. This is a known issue and will be addressed in a future NGO version.

### Fixed
* Fixed colliders on diagonal walls to not have negative scale (#854).
Expand Down
2 changes: 1 addition & 1 deletion Packages/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"com.unity.learn.iet-framework": "3.1.3",
"com.unity.memoryprofiler": "1.0.0",
"com.unity.multiplayer.tools": "2.0.0-pre.3",
"com.unity.netcode.gameobjects": "1.4.0",
"com.unity.netcode.gameobjects": "1.6.0",
"com.unity.performance.profile-analyzer": "1.2.2",
"com.unity.postprocessing": "3.2.2",
"com.unity.render-pipelines.universal": "14.0.8",
Expand Down
4 changes: 2 additions & 2 deletions Packages/packages-lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,12 +143,12 @@
"url": "https://packages.unity.com"
},
"com.unity.netcode.gameobjects": {
"version": "1.4.0",
"version": "1.6.0",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.nuget.mono-cecil": "1.10.1",
"com.unity.transport": "1.3.3"
"com.unity.transport": "1.3.4"
},
"url": "https://packages.unity.com"
},
Expand Down