Merge pull request #1 from Unity-Technologies/matt_work

Bringing up to date to MLAPI public

Author: mattwalsh-unity

.github/CONTRIBUTING.md

@@ -1,16 +1,12 @@
 # How to contribute
-
 I'm really glad you're reading this, because we need volunteer developers to help this project evolve.
 
 If you haven't already, come find us on [Discord](http://discord.mlapi.network).
-
 ## Submitting changes
-
 Please send a [GitHub Pull Request to MLAPI](https://github.com/midlevel/MLAPI/pull/new/master) with a clear list of what you've done (read more about [pull requests](http://help.github.com/pull-requests/)).
 Please follow our commit message conventions (below) and make sure all of your commits are atomic (one feature per commit).
 
 ## Commit Message Guidelines
-
 We have very precise rules over how our git commit messages can be formatted.  This leads to **more
 readable messages** that are easy to follow when looking through the **project history**.  But also,
 we use the git commit messages to **generate the MLAPI change log**. We follow angular's message format.

MLAPI/Configuration/MLAPIConstants.cs

@@ -5,7 +5,7 @@ namespace MLAPI.Configuration
     /// </summary>
     internal static class MLAPIConstants
     {
-        internal const string MLAPI_PROTOCOL_VERSION = "10.7.0";
+        internal const string MLAPI_PROTOCOL_VERSION = "12.0.0";
 
         internal const byte MLAPI_CERTIFICATE_HAIL = 0;
         internal const byte MLAPI_CERTIFICATE_HAIL_RESPONSE = 1;
@@ -31,6 +31,7 @@ internal static class MLAPIConstants
         internal const byte MLAPI_DESTROY_OBJECTS = 21;
         internal const byte MLAPI_NAMED_MESSAGE = 22;
         internal const byte MLAPI_SYNCED_VAR = 23;
+        internal const byte MLAPI_SERVER_LOG = 24;
         internal const byte INVALID = 32;
 
         internal static readonly string[] MESSAGE_NAMES = {
@@ -58,7 +59,7 @@ internal static class MLAPIConstants
             "MLAPI_DESTROY_OBJECTS",
             "MLAPI_NAMED_MESSAGE",
             "MLAPI_SYNCED_VAR",
-            "",
+            "MLAPI_SERVER_LOG",
             "",
             "",
             "",

MLAPI/Configuration/NetworkConfig.cs

@@ -176,6 +176,10 @@ public class NetworkConfig
         [Tooltip("The amount of time a message should be buffered for without being consumed. If it is not consumed within this time, it will be dropped")]
         public float MessageBufferTimeout = 20f;
         /// <summary>
+        /// Whether or not to enable network logs.
+        /// </summary>
+        public bool EnableNetworkLogs = true;
+        /// <summary>
         /// Whether or not to enable the ECDHE key exchange to allow for encryption and authentication of messages
         /// </summary>
         [Tooltip("Whether or not to enable the ECDHE key exchange to allow for encryption and authentication of messages")]
@@ -257,14 +261,15 @@ public string ToBase64()
                     writer.WriteInt32Packed(config.LoadSceneTimeOut);
                     writer.WriteBool(config.EnableTimeResync);
                     writer.WriteBool(config.EnsureNetworkedVarLengthSafety);
-                    writer.WriteBits((byte)config.RpcHashSize, 3);
+                    writer.WriteBits((byte)config.RpcHashSize, 2);
                     writer.WriteBool(ForceSamePrefabs);
                     writer.WriteBool(UsePrefabSync);
                     writer.WriteBool(EnableSceneManagement);
                     writer.WriteBool(RecycleNetworkIds);
                     writer.WriteSinglePacked(NetworkIdRecycleDelay);
                     writer.WriteBool(EnableNetworkedVar);
                     writer.WriteBool(AllowRuntimeSceneChanges);
+                    writer.WriteBool(EnableNetworkLogs);
                     stream.PadStream();
 
                     return Convert.ToBase64String(stream.ToArray());
@@ -305,14 +310,15 @@ public void FromBase64(string base64)
                     config.LoadSceneTimeOut = reader.ReadInt32Packed();
                     config.EnableTimeResync = reader.ReadBool();
                     config.EnsureNetworkedVarLengthSafety = reader.ReadBool();
-                    config.RpcHashSize = (HashSize)reader.ReadBits(3);
+                    config.RpcHashSize = (HashSize)reader.ReadBits(2);
                     config.ForceSamePrefabs = reader.ReadBool();
                     config.UsePrefabSync = reader.ReadBool();
                     config.EnableSceneManagement = reader.ReadBool();
                     config.RecycleNetworkIds = reader.ReadBool();
                     config.NetworkIdRecycleDelay = reader.ReadSinglePacked();
                     config.EnableNetworkedVar = reader.ReadBool();
                     config.AllowRuntimeSceneChanges = reader.ReadBool();
+                    config.EnableNetworkLogs = reader.ReadBool();
                 }
             }
         }
@@ -338,7 +344,7 @@ public ulong GetConfig(bool cache = true)
                     writer.WriteUInt16Packed(ProtocolVersion);
                     writer.WriteString(MLAPIConstants.MLAPI_PROTOCOL_VERSION);
 
-                    if (!AllowRuntimeSceneChanges)
+                    if (EnableSceneManagement && !AllowRuntimeSceneChanges)
                     {
                         for (int i = 0; i < RegisteredScenes.Count; i++)
                         {
@@ -362,7 +368,7 @@ public ulong GetConfig(bool cache = true)
                     writer.WriteBool(EnsureNetworkedVarLengthSafety);
                     writer.WriteBool(EnableEncryption);
                     writer.WriteBool(SignKeyExchange);
-                    writer.WriteBits((byte)RpcHashSize, 3);
+                    writer.WriteBits((byte)RpcHashSize, 2);
                     stream.PadStream();
 
                     if (cache)

MLAPI/Configuration/NetworkedPrefab.cs

@@ -16,12 +16,12 @@ internal ulong Hash
             {
                 if (Prefab == null)
                 {
-                    if (LogHelper.CurrentLogLevel <= LogLevel.Normal) LogHelper.LogWarning("NetworkedPrefab is not assigned");
+                    if (NetworkLog.CurrentLogLevel <= LogLevel.Normal) NetworkLog.LogWarning("NetworkedPrefab is not assigned");
                     return 0;
                 }
                 else if (Prefab.GetComponent<NetworkedObject>() == null)
                 {
-                    if (LogHelper.CurrentLogLevel <= LogLevel.Normal) LogHelper.LogWarning("The NetworkedPrefab " + Prefab.name + " does not have a NetworkedObject");
+                    if (NetworkLog.CurrentLogLevel <= LogLevel.Normal) NetworkLog.LogWarning("The NetworkedPrefab " + Prefab.name + " does not have a NetworkedObject");
                     return 0;
                 }
                 else return Prefab.GetComponent<NetworkedObject>().PrefabHash;