From 2e93d454877b35096a9c0a04289ffb39fae439e9 Mon Sep 17 00:00:00 2001 From: NoelStephensUnity Date: Fri, 17 Jan 2025 13:15:27 -0600 Subject: [PATCH 1/7] update incrementing to v1.12.1 --- com.unity.netcode.gameobjects/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/com.unity.netcode.gameobjects/package.json b/com.unity.netcode.gameobjects/package.json index 19b5f82611..27ab90b05a 100644 --- a/com.unity.netcode.gameobjects/package.json +++ b/com.unity.netcode.gameobjects/package.json @@ -2,7 +2,7 @@ "name": "com.unity.netcode.gameobjects", "displayName": "Netcode for GameObjects", "description": "Netcode for GameObjects is a high-level netcode SDK that provides networking capabilities to GameObject/MonoBehaviour workflows within Unity and sits on top of underlying transport layer.", - "version": "1.12.0", + "version": "1.12.1", "unity": "2021.3", "dependencies": { "com.unity.nuget.mono-cecil": "1.10.1", From b66c6e9d3c5fee1a951050b8b82524b3b050a5e8 Mon Sep 17 00:00:00 2001 From: NoelStephensUnity Date: Fri, 17 Jan 2025 13:16:13 -0600 Subject: [PATCH 2/7] update Setting changelog unreleased entries section to patch v1.12.1. --- com.unity.netcode.gameobjects/CHANGELOG.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/com.unity.netcode.gameobjects/CHANGELOG.md b/com.unity.netcode.gameobjects/CHANGELOG.md index f05ecff6a7..f03547b772 100644 --- a/com.unity.netcode.gameobjects/CHANGELOG.md +++ b/com.unity.netcode.gameobjects/CHANGELOG.md @@ -6,9 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) Additional documentation and release notes are available at [Multiplayer Documentation](https://docs-multiplayer.unity3d.com). -## [Unreleased] - -### Added +## [1.12.1] - 2025-01-17 ### Fixed @@ -16,7 +14,6 @@ Additional documentation and release notes are available at [Multiplayer Documen - Fixed issue where `NetworkRigidBody2D` was still using the deprecated `isKinematic` property in Unity versions 2022.3 and newer. (#3199) - Fixed issue where an exception was thrown when calling `NetworkManager.Shutdown` after calling `UnityTransport.Shutdown`. (#3118) -### Changed ## [1.12.0] - 2024-11-19 From 123ff3d62b5aee04aff24682cd8cefdbb46ab32e Mon Sep 17 00:00:00 2001 From: NoelStephensUnity Date: Wed, 22 Jan 2025 10:25:11 -0600 Subject: [PATCH 3/7] update adding unreleased section to changelog. --- com.unity.netcode.gameobjects/CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/com.unity.netcode.gameobjects/CHANGELOG.md b/com.unity.netcode.gameobjects/CHANGELOG.md index f03547b772..da9c52a3fa 100644 --- a/com.unity.netcode.gameobjects/CHANGELOG.md +++ b/com.unity.netcode.gameobjects/CHANGELOG.md @@ -6,6 +6,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) Additional documentation and release notes are available at [Multiplayer Documentation](https://docs-multiplayer.unity3d.com). +## [Unreleased] + +### Added + +### Fixed + +### Changed + + ## [1.12.1] - 2025-01-17 ### Fixed From a7412d2f68823770b629238011498ce5fabdfa5d Mon Sep 17 00:00:00 2001 From: NoelStephensUnity Date: Thu, 23 Jan 2025 12:17:00 -0600 Subject: [PATCH 4/7] update Replace the two places where Debug.Assert is used in UnityTransport to be DEBUG wrapped checks that log warnings as opposed to throwing asserts in order to avoid being considered a failed test run even if all tests have passed. --- .../Runtime/Transports/UTP/UnityTransport.cs | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs b/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs index 034aa56eff..39802a7ac8 100644 --- a/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs +++ b/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs @@ -1167,7 +1167,13 @@ public override void DisconnectLocalClient() /// The client to disconnect public override void DisconnectRemoteClient(ulong clientId) { - Debug.Assert(m_State == State.Listening, "DisconnectRemoteClient should be called on a listening server"); +#if DEBUG + if (m_State != State.Listening) + { + Debug.LogWarning("DisconnectRemoteClient should be called on a listening server!"); + return; + } +#endif if (m_State == State.Listening) { @@ -1239,7 +1245,13 @@ public NetworkEndpoint GetEndpoint(ulong clientId) /// The NetworkManager that initialized and owns the transport public override void Initialize(NetworkManager networkManager = null) { - Debug.Assert(sizeof(ulong) == UnsafeUtility.SizeOf(), "Netcode connection id size does not match UTP connection id size"); +#if DEBUG + if (sizeof(ulong) != UnsafeUtility.SizeOf()) + { + Debug.LogWarning($"Netcode connection id size {sizeof(ulong)} does not match UTP connection id size {UnsafeUtility.SizeOf()}!"); + return; + } +#endif NetworkManager = networkManager; From 5de9c10d6ceed2f7070bbb16b50670b2f70e758b Mon Sep 17 00:00:00 2001 From: NoelStephensUnity Date: Thu, 23 Jan 2025 12:27:09 -0600 Subject: [PATCH 5/7] style Cleaning up message a bit. --- .../Runtime/Transports/UTP/UnityTransport.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs b/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs index 39802a7ac8..2a9e00d64d 100644 --- a/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs +++ b/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs @@ -1170,7 +1170,7 @@ public override void DisconnectRemoteClient(ulong clientId) #if DEBUG if (m_State != State.Listening) { - Debug.LogWarning("DisconnectRemoteClient should be called on a listening server!"); + Debug.LogWarning($"{nameof(DisconnectRemoteClient)} should only be called on a listening server!"); return; } #endif From 7bf15bb9cc7cb2e06e265635b3ece6f7c5bc971c Mon Sep 17 00:00:00 2001 From: Noel Stephens Date: Fri, 24 Jan 2025 09:35:11 -0600 Subject: [PATCH 6/7] chore: validate 1.12.2 (#3215) * update Updating package and changelog. * test Changing what log message type we are expecting. * test Forgot to update message. --- com.unity.netcode.gameobjects/CHANGELOG.md | 11 +---------- .../Tests/Runtime/Transports/UnityTransportTests.cs | 2 +- com.unity.netcode.gameobjects/package.json | 2 +- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/com.unity.netcode.gameobjects/CHANGELOG.md b/com.unity.netcode.gameobjects/CHANGELOG.md index da9c52a3fa..ebe44fc57d 100644 --- a/com.unity.netcode.gameobjects/CHANGELOG.md +++ b/com.unity.netcode.gameobjects/CHANGELOG.md @@ -6,16 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) Additional documentation and release notes are available at [Multiplayer Documentation](https://docs-multiplayer.unity3d.com). -## [Unreleased] - -### Added - -### Fixed - -### Changed - - -## [1.12.1] - 2025-01-17 +## [1.12.2] - 2025-01-17 ### Fixed diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Transports/UnityTransportTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/Transports/UnityTransportTests.cs index 5cbd338355..7d5b5c30f5 100644 --- a/com.unity.netcode.gameobjects/Tests/Runtime/Transports/UnityTransportTests.cs +++ b/com.unity.netcode.gameobjects/Tests/Runtime/Transports/UnityTransportTests.cs @@ -547,7 +547,7 @@ public IEnumerator DoesNotActAfterShutdown([Values] AfterShutdownAction afterShu { m_Server.DisconnectRemoteClient(m_Client1.ServerClientId); - LogAssert.Expect(LogType.Assert, "DisconnectRemoteClient should be called on a listening server"); + LogAssert.Expect(LogType.Warning, $"{nameof(UnityTransport.DisconnectRemoteClient)} should only be called on a listening server!"); } else if (afterShutdownAction == AfterShutdownAction.DisconnectLocalClient) { diff --git a/com.unity.netcode.gameobjects/package.json b/com.unity.netcode.gameobjects/package.json index 27ab90b05a..0306a317f9 100644 --- a/com.unity.netcode.gameobjects/package.json +++ b/com.unity.netcode.gameobjects/package.json @@ -2,7 +2,7 @@ "name": "com.unity.netcode.gameobjects", "displayName": "Netcode for GameObjects", "description": "Netcode for GameObjects is a high-level netcode SDK that provides networking capabilities to GameObject/MonoBehaviour workflows within Unity and sits on top of underlying transport layer.", - "version": "1.12.1", + "version": "1.12.2", "unity": "2021.3", "dependencies": { "com.unity.nuget.mono-cecil": "1.10.1", From 9f943003f5628b6fc03ce522b8da4a21b3995ab4 Mon Sep 17 00:00:00 2001 From: Noel Stephens Date: Wed, 5 Feb 2025 07:44:31 -0600 Subject: [PATCH 7/7] Update CHANGELOG.md Adding unreleased entry --- com.unity.netcode.gameobjects/CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/com.unity.netcode.gameobjects/CHANGELOG.md b/com.unity.netcode.gameobjects/CHANGELOG.md index a8882a18f3..ee8ba331c5 100644 --- a/com.unity.netcode.gameobjects/CHANGELOG.md +++ b/com.unity.netcode.gameobjects/CHANGELOG.md @@ -6,6 +6,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) Additional documentation and release notes are available at [Multiplayer Documentation](https://docs-multiplayer.unity3d.com). +## [Unreleased] + +### Added + +### Fixed + +### Changed + + ## [1.12.2] - 2025-01-17 ### Fixed