Merge remote-tracking branch 'upstream/master'

MLAPI/Data/NetworkedPrefab.cs

@@ -3,10 +3,19 @@ using UnityEngine;
 
 namespace MLAPI.Data
 {
+    /// <summary>
+    /// A class that represents a NetworkedPrefab
+    /// </summary>
     [Serializable]
     public class NetworkedPrefab
     {
+        /// <summary>
+        /// The name of the networked prefab
+        /// </summary>
         public string name;
+        /// <summary>
+        /// The gameobject of the prefab
+        /// </summary>
         public GameObject prefab;
     }
 }

MLAPI/MLAPI.csproj

@@ -36,13 +36,13 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Development|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\..\MLAPI-Examples\Assets\</OutputPath>
+    <OutputPath>..\..\MLAPI-Examples\Assets\MLAPI\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
+    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
     <RunCodeAnalysis>false</RunCodeAnalysis>
     <DocumentationFile>
     </DocumentationFile>

MLAPI/MonoBehaviours/Core/NetworkingManager.cs

@@ -153,15 +153,20 @@ namespace MLAPI.MonoBehaviours.Core
 
         private void OnValidate()
         {
+            if (NetworkConfig == null)
+                return; //May occur when the component is added
+             
             if(NetworkConfig.EnableSceneSwitching && !NetworkConfig.RegisteredScenes.Contains(SceneManager.GetActiveScene().name))
             {
                 Debug.LogWarning("MLAPI: The active scene is not registered as a networked scene. The MLAPI has added it");
                 NetworkConfig.RegisteredScenes.Add(SceneManager.GetActiveScene().name);
             }
+
             if(!NetworkConfig.EnableSceneSwitching && NetworkConfig.HandleObjectSpawning)
             {
                 Debug.LogWarning("MLAPI: Please be aware that Scene objects are NOT supported if SceneManagement is turned on, even if HandleObjectSpawning is turned on");
             }
+
             if(NetworkConfig.HandleObjectSpawning)
             {
                 for (int i = 0; i < NetworkConfig.NetworkedPrefabs.Count; i++)
@@ -173,6 +178,7 @@ namespace MLAPI.MonoBehaviours.Core
                     }
                 }
             }
+
             if (NetworkConfig.HandleObjectSpawning)
             {
                 if(!string.IsNullOrEmpty(NetworkConfig.PlayerPrefabName))
@@ -198,7 +204,9 @@ namespace MLAPI.MonoBehaviours.Core
             }
 
             if (!NetworkConfig.EnableEncryption)
+            {
                 RegenerateRSAKeys = false;
+            }
             else
             {
                 if(RegenerateRSAKeys)