Merge branch 'develop' into fix/offline-network-variable

Author: NoelStephensUnity

com.unity.netcode.gameobjects/CHANGELOG.md

@@ -12,15 +12,16 @@ Additional documentation and release notes are available at [Multiplayer Documen
 
 ### Fixed
 
+- Fixed the "Generate Default Network Prefabs List" setting not loading correctly and always reverting to being checked. (#2545)
+- Fixed usage of `NetworkList` throwing exception when used without a NetworkManager in scene. (#2539)
+- Fixed the inspector throwing exceptions when attempting to render `NetworkVariable`s of enum types. (#2529)
+- Making a `NetworkVariable` with an `INetworkSerializable` type that doesn't meet the `new()` constraint will now create a compile-time error instead of an editor crash (#2528)
 - Fixed Multiplayer Tools package installation docs page link on the NetworkManager popup. (#2526)
+- Fixed an exception and error logging when two different objects are shown and hidden on the same frame (#2524)
 - Fixed a memory leak in `UnityTransport` that occurred if `StartClient` failed. (#2518)
 - Fixed issue where a client could throw an exception if abruptly disconnected from a network session with one or more spawned `NetworkObject`(s). (#2510)
 - Fixed issue where invalid endpoint addresses were not being detected and returning false from NGO UnityTransport. (#2496)
 - Fixed some errors that could occur if a connection is lost and the loss is detected when attempting to write to the socket. (#2495)
-- Making a `NetworkVariable` with an `INetworkSerializable` type that doesn't meet the `new()` constraint will now create a compile-time error instead of an editor crash (#2528)
-- Fixed the inspector throwing exceptions when attempting to render `NetworkVariable`s of enum types. (#2529)
-- Fixed an exception and error logging when two different objects are shown and hidden on the same frame (#2524)
-- Fixed usage of `NetworkList` throwing exception when used without a NetworkManager in scene. (#2539)
 
 ## Changed
 

com.unity.netcode.gameobjects/Documentation~/index.md

@@ -7,8 +7,8 @@ Netcode for GameObjects is a Unity package that provides networking capabilities
 See guides below to install Unity Netcode for GameObjects, set up your project, and get started with your first networked game:
 
 - [Documentation](https://docs-multiplayer.unity3d.com/netcode/current/about)
-- [Installation](https://docs-multiplayer.unity3d.com/netcode/current/migration/install)
-- [First Steps](https://docs-multiplayer.unity3d.com/netcode/current/tutorials/helloworld/helloworldintro)
+- [Installation](https://docs-multiplayer.unity3d.com/netcode/current/installation)
+- [First Steps](https://docs-multiplayer.unity3d.com/netcode/current/tutorials/get-started-ngo)
 - [API Reference](https://docs-multiplayer.unity3d.com/netcode/current/api/introduction)
 
 # Technical details
@@ -32,4 +32,4 @@ On the following runtime platforms:
 |June 3, 2021|Update document to acknowledge Unity min version change. Matches package version 0.2.0|
 |August 5, 2021|Update product/package name|
 |September 9,2021|Updated the links and name of the file.|
-|April 20, 2022|Updated links|
+|April 20, 2022|Updated links|

com.unity.netcode.gameobjects/Editor/Configuration/NetcodeForGameObjectsSettings.cs

@@ -1,5 +1,6 @@
 using UnityEditor;
 using UnityEngine;
+using UnityEngine.Serialization;
 
 
 namespace Unity.Netcode.Editor.Configuration
@@ -43,7 +44,21 @@ internal static void SetAutoAddNetworkObjectSetting(bool autoAddSetting)
     [FilePath("ProjectSettings/NetcodeForGameObjects.settings", FilePathAttribute.Location.ProjectFolder)]
     internal class NetcodeForGameObjectsProjectSettings : ScriptableSingleton<NetcodeForGameObjectsProjectSettings>
     {
-        [SerializeField] public bool GenerateDefaultNetworkPrefabs = true;
+        [SerializeField]
+        [FormerlySerializedAs("GenerateDefaultNetworkPrefabs")]
+        private byte m_GenerateDefaultNetworkPrefabs;
+
+        public bool GenerateDefaultNetworkPrefabs
+        {
+            get
+            {
+                return m_GenerateDefaultNetworkPrefabs != 0;
+            }
+            set
+            {
+                m_GenerateDefaultNetworkPrefabs = (byte)(value ? 1 : 0);
+            }
+        }
 
         internal void SaveSettings()
         {

com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs

@@ -524,7 +524,7 @@ private bool ClientBindAndConnect()
                 //reflection, but this does not live in the context of a performance-critical loop, it runs once at initial connection time.
                 if (m_RelayServerData.Equals(default(RelayServerData)))
                 {
-                    Debug.LogError("You must call SetRelayServerData() at least once before calling StartRelayServer.");
+                    Debug.LogError("You must call SetRelayServerData() at least once before calling StartClient.");
                     return false;
                 }
 
@@ -710,7 +710,7 @@ private bool StartRelayServer()
             //reflection, but this does not live in the context of a performance-critical loop, it runs once at initial connection time.
             if (m_RelayServerData.Equals(default(RelayServerData)))
             {
-                Debug.LogError("You must call SetRelayServerData() at least once before calling StartRelayServer.");
+                Debug.LogError("You must call SetRelayServerData() at least once before calling StartServer.");
                 return false;
             }
             else