Merge branch 'master' of https://github.com/MidLevel/MLAPI

Author: TwoTenPvP

MLAPI/Core/NetworkingManager.cs

@@ -41,7 +41,6 @@ public class NetworkingManager : MonoBehaviour
         public float NetworkTime => Time.unscaledTime + currentNetworkTimeOffset;
         private float networkTimeOffset;
         private float currentNetworkTimeOffset;
-        private bool networkTimeInitialized;
         /// <summary>
         /// Gets or sets if the NetworkingManager should be marked as DontDestroyOnLoad
         /// </summary>
@@ -336,7 +335,6 @@ private void Init(bool server)
             LocalClientId = 0;
             networkTimeOffset = 0f;
             currentNetworkTimeOffset = 0f;
-            networkTimeInitialized = false;
             lastEventTickTime = 0f;
             lastReceiveTickTime = 0f;
             eventOvershootCounter = 0f;
@@ -734,17 +732,14 @@ private void Update()
             }
         }
 
-        internal void UpdateNetworkTime(ulong clientId, float netTime, float receiveTime, bool onlyIfNotInitialized = false)
+        internal void UpdateNetworkTime(ulong clientId, float netTime, float receiveTime, bool warp = false)
         {
-            if (onlyIfNotInitialized && networkTimeInitialized)
-                return;
             float rtt = NetworkConfig.NetworkTransport.GetCurrentRtt(clientId) / 1000f;
             networkTimeOffset = netTime - receiveTime + rtt / 2f;
-            if (!networkTimeInitialized) {
+            if (warp) {
                 currentNetworkTimeOffset = networkTimeOffset;
-                networkTimeInitialized = true;
             }
-            if (LogHelper.CurrentLogLevel <= LogLevel.Developer) LogHelper.LogInfo($"Received network time {netTime}, RTT to server is {rtt}, setting offset to {networkTimeOffset} (delta {networkTimeOffset - currentNetworkTimeOffset})");
+            if (LogHelper.CurrentLogLevel <= LogLevel.Developer) LogHelper.LogInfo($"Received network time {netTime}, RTT to server is {rtt}, {(warp ? "setting" : "smearing")} offset to {networkTimeOffset} (delta {networkTimeOffset - currentNetworkTimeOffset})");
         }
 
         internal void SendConnectionRequest()

MLAPI/LagCompensation/LagCompensationManager.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using MLAPI.Exceptions;
@@ -28,22 +28,33 @@ public static class LagCompensationManager
         /// <param name="secondsAgo">The amount of seconds</param>
         /// <param name="action">The action to invoke when time is turned back</param>
         public static void Simulate(float secondsAgo, Action action)
+        {
+            Simulate(secondsAgo, SimulationObjects, action);
+        }
+
+        /// <summary>
+        /// Turns time back a given amount of second on the given objects, invokes an action and turns it back
+        /// </summary>
+        /// <param name="secondsAgo">The amount of seconds</param>
+        /// <param name="simulatedObjects">The object to simulate back in time</param>
+        /// <param name="action">The action to invoke when time is turned back</param>
+        public static void Simulate(float secondsAgo, IList<TrackedObject> simulatedObjects, Action action)
         {
             if (!NetworkingManager.Singleton.IsServer)
             {
                 throw new NotServerException("Only the server can perform lag compensation");
             }
-            
-            for (int i = 0; i < SimulationObjects.Count; i++)
+
+            for (int i = 0; i < simulatedObjects.Count; i++)
             {
-                SimulationObjects[i].ReverseTransform(secondsAgo);
+                simulatedObjects[i].ReverseTransform(secondsAgo);
             }
 
             action.Invoke();
 
-            for (int i = 0; i < SimulationObjects.Count; i++)
+            for (int i = 0; i < simulatedObjects.Count; i++)
             {
-                SimulationObjects[i].ResetStateTransform();
+                simulatedObjects[i].ResetStateTransform();
             }
         }
 

docs/_docs/advanced-topics/bitwriter-bitreader-bitstream.md

@@ -45,7 +45,7 @@ MyEnum value = (Myenum)reader.ReadBits(3);
 ```
 
 #### Performance concideration
-When the stream is not aligned, (BitAlgiend == false, this occurs when writing bits that does fill the whole byte, or when writing bools as they are written as bits), performance is decreased for each write and read. This is only a big concern if you are about to write a large amount of data after not being aligned. To solve this, the BitWriter allows you to "WritePadBits" and the BitReader then lets you skip those bits with "SkipPadBits" to align the stream to the nearest byte.
+When the stream is not aligned, (BitAligned == false, this occurs when writing bits that does fill the whole byte, or when writing bools as they are written as bits), performance is decreased for each write and read. This is only a big concern if you are about to write a large amount of data after not being aligned. To solve this, the BitWriter allows you to "WritePadBits" and the BitReader then lets you skip those bits with "SkipPadBits" to align the stream to the nearest byte.
 
 ```csharp
 writer.WriteBool(true); //Now the stream is no longer aligned. Every byte has to be offset by 1 bit.
@@ -71,4 +71,4 @@ using (PooledBitWriter writer = PooledBitWriter.Get(myStreamToWriteTo))
 {
     // Write here
 }
-```
+```

docs/_docs/the-basics/networkedvar.md

@@ -15,7 +15,7 @@ Since the NetworkedVar container is a wrapper container around the value, the va
         <h3 class="panel-title">Disclaimer</h3>
     </div>
     <div class="panel-body">
-        The NetworkedVar, NetworkedList and NetworkedDictionary implementations are <b>primarly</b> designed as samples showing to do create INetworkedVar structures. The NetworkedVar container is however concidered production ready for simple types.
+        The NetworkedVar, NetworkedList and NetworkedDictionary implementations are <b>primarily</b> designed as samples showing how to create INetworkedVar structures. The NetworkedVar container is however concidered production ready for simple types.
     </div>
 </div>
 
@@ -38,4 +38,4 @@ If you want values to be synced only once (at spawn), the built-in containers se
 ### Serialization
 Since the NetworkedVar class is a generic, editor serialization is NOT supported, it's only avalible through editor scripts for viewing the values. To get proper serialization. A clone of the NetworkedVar implementation has to be done for each type you wish to use. Ex: NetworkedVarInt where you replace all the usages of T with int.
 
-The MLAPI provides a few default serializable implementations of the NetworkedVar, they are called NetworkedVar<TYPE> where "<TYPE>" is the type.
+The MLAPI provides a few default serializable implementations of the NetworkedVar, they are called NetworkedVar<TYPE> where "<TYPE>" is the type.

docs/_docs/the-basics/object-ownership.md

@@ -3,7 +3,7 @@ title: Object Ownership
 permalink: /wiki/object-ownership/
 ---
 
-Each NetworkedObject is be owned by a specific client. This can be any client or the server.
+Each NetworkedObject is owned by a specific client. This can be any client or the server.
 
 Giving ownership of an object can be done like this
 ```csharp
@@ -15,10 +15,10 @@ The default behavior is that an object is owned by the server. To give ownership
 GetComponent<NetworkedObject>().RemoveOwnership();
 ```
 
-When you are owner of an object. You can check for ``IsOwner`` in any NetworkedBehaviour, similar to how player objects can do ``IsLocalPlayer``
+When you are owner of an object, you can check for ``IsOwner`` in any NetworkedBehaviour, similar to how player objects can do ``IsLocalPlayer``
 
 ## Object destruction
-When a client disconnects. All objects owned by that client will be destroyed. If you don't want that. (Ex. if you want the objects to be dropped), you can remove ownership just before they are destroyed.
+When a client disconnects, all objects owned by that client will be destroyed. If you don't want that (Ex. if you want the objects to be dropped), you can remove ownership just before they are destroyed.
 
 
-Simply remove the ownership in the OnDestroy method on the player object that owns the object and remove ownership there. That will be handled before the owned object is destroyed.
+Simply remove the ownership in the OnDestroy method on the player object that owns the object and remove ownership there. That will be handled before the owned object is destroyed.

docs/_docs/the-basics/object-visibility.md

@@ -4,7 +4,7 @@ permalink: /wiki/object-visibility/
 ---
 
 Starting with MLAPI version 6.0.0, clients have no explicit knowledge of all objects or clients that are connected to the server.
-This allows you to only show a subset of objects to any client and any given time. To allow this, a visibility API was introduced
+This allows you to only show a subset of objects to any client at any given time. To allow this, a visibility API was introduced
 to the NetworkedObject component and consists of 4 parts.
 
 
@@ -41,4 +41,4 @@ and
 ```csharp
 NetworkedObject netObject = GetComponent<NetworkedObject>();
 netObject.NetworkHide(clientIdToHideFrom);
-```
+```

docs/_docs/the-basics/scene-management.md

@@ -3,7 +3,7 @@ title: Scene Management
 permalink: /wiki/scene-management/
 ---
 
-The MLAPI can manage synchronized scene management for you. To use this, it first has to be enabled in NetworkingConfiguration. EnableSceneSwitching has to be set to true and all scenes that are going to be used during Networking has to be registered. The NetworkingConfiguration.RegisteredScenes list has to be populated with all scene names, this a simple security measure to ensure rouge servers don't request client's to switch to sensitive scenes.
+The MLAPI can manage synchronized scene management for you. To use this, it first has to be enabled in NetworkingConfiguration. EnableSceneSwitching has to be set to true and all scenes that are going to be used during Networking have to be registered. The NetworkingConfiguration.RegisteredScenes list has to be populated with all scene names, this a simple security measure to ensure rogue servers don't request client's to switch to sensitive scenes.
 
 Note:
 _The scene that is active when the Server is started has to be registered_
@@ -12,4 +12,4 @@ _The scene that is active when the Server is started has to be registered_
 ```csharp
 //This can only be called on the server
 NetworkSceneManager.SwitchScene(mySceneName);
-```
+```