Merge branch 'main' into develop

# Conflicts:
#	Packages/com.unity.multiplayer.samples.coop/CHANGELOG.md
#	Packages/com.unity.multiplayer.samples.coop/package.json
#	Packages/manifest.json
#	Packages/packages-lock.json

Author: SamuelBellomo

Packages/com.unity.multiplayer.samples.coop/CHANGELOG.md

@@ -11,6 +11,11 @@
 ### Fixed
 *
 
+## [1.3.1-pre] - 2022-09-13
+
+### Fixed
+* Updating ClientNetworkTransform for latest NGO 1.0.1+ (#726) This fixes the new behaviour where both RPCs and netvars were sending the same data. Now CNT is netvar based only, making it send on tick just like NetworkTransform and other network variables would.
+
 ## [1.3.0-pre] - 2022-06-23
 
 ### Added

Packages/com.unity.multiplayer.samples.coop/Utilities/Net/ClientAuthority/ClientNetworkTransform.cs

@@ -1,11 +1,8 @@
 using Unity.Netcode.Components;
-using Unity.Netcode;
 using UnityEngine;
 
 namespace Unity.Multiplayer.Samples.Utilities.ClientAuthority
 {
-    // TODO inherit from `NetworkBehaviour` instead of `NetworkTransform` to cut direct relationship between two
-    // TODO change to owner netvar instead of RPC based
     /// <summary>
     /// Used for syncing a transform with client side changes. This includes host. Pure server as owner isn't supported by this. Please use NetworkTransform
     /// for transforms that'll always be owned by the server.
@@ -15,31 +12,8 @@ public class ClientNetworkTransform : NetworkTransform
     {
         /// <summary>
         /// Used to determine who can write to this transform. Owner client only.
-        /// Changing this value alone will not allow you to create a NetworkTransform which can be written to by clients.
-        /// We're using RPCs to send updated values from client to server. Netcode doesn't support client side network variable writing.
         /// This imposes state to the server. This is putting trust on your clients. Make sure no security-sensitive features use this transform.
         /// </summary>
-        // This is public to make sure that users don't depend on this IsClient && IsOwner check in their code. If this logic changes in the future, we can make it invisible here
-
-        public override void OnNetworkSpawn()
-        {
-            base.OnNetworkSpawn();
-            CanCommitToTransform = IsOwner;
-        }
-
-        protected override void Update()
-        {
-            CanCommitToTransform = IsOwner;
-            base.Update();
-            if (NetworkManager.Singleton != null && (NetworkManager.Singleton.IsConnectedClient || NetworkManager.Singleton.IsListening))
-            {
-                if (CanCommitToTransform)
-                {
-                    TryCommitTransformToServer(transform, NetworkManager.LocalTime.Time);
-                }
-            }
-        }
-
         protected override bool OnIsServerAuthoritative()
         {
             return false;

Packages/com.unity.multiplayer.samples.coop/package.json

@@ -1,15 +1,15 @@
 {
   "name": "com.unity.multiplayer.samples.coop",
   "displayName": "Multiplayer Samples Utilities",
-  "version": "1.3.0-pre",
+  "version": "1.3.1",
   "type": "template",
   "host": "hub",
   "unity": "2020.3",
   "description": "Utilities package built on top of Netcode for GameObjects, providing useful scripts and tools.",
   "dependencies": {
     "com.unity.learn.iet-framework": "1.2.1",
     "com.unity.multiplayer.tools": "1.0.0",
-    "com.unity.netcode.gameobjects": "1.0.1",
+    "com.unity.netcode.gameobjects": "1.0.2",
     "com.unity.services.relay": "1.0.3"
   }
 }

Packages/manifest.json

@@ -10,7 +10,7 @@
     "com.unity.learn.iet-framework": "2.2.1",
     "com.unity.memoryprofiler": "0.5.0-preview.1",
     "com.unity.multiplayer.tools": "1.0.0",
-    "com.unity.netcode.gameobjects": "1.0.1",
+    "com.unity.netcode.gameobjects": "1.0.2",
     "com.unity.performance.profile-analyzer": "1.1.1",
     "com.unity.postprocessing": "3.2.1",
     "com.unity.render-pipelines.universal": "12.1.6",

Packages/packages-lock.json

@@ -122,7 +122,7 @@
       "dependencies": {
         "com.unity.learn.iet-framework": "1.2.1",
         "com.unity.multiplayer.tools": "1.0.0",
-        "com.unity.netcode.gameobjects": "1.0.1",
+        "com.unity.netcode.gameobjects": "1.0.2",
         "com.unity.services.relay": "1.0.3"
       }
     },
@@ -140,7 +140,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.netcode.gameobjects": {
-      "version": "1.0.1",
+      "version": "1.0.2",
       "depth": 0,
       "source": "registry",
       "dependencies": {

README.md

@@ -1,5 +1,5 @@
 ![Banner](Documentation/Images/Banner.png)
-# Boss Room - Co-op multiplayer RPG built with Unity Netcode for GameObjects
+# Boss Room - Co-op multiplayer RPG and utilities built with Unity Netcode for GameObjects
 
 | Solutions architects are available on [Discord](https://discord.gg/mNgM2XRDpb) and [forums](https://forum.unity.com/forums/multiplayer.26/) to help you work through issues you may encounter when using Boss Room. |
 | -- |
@@ -8,6 +8,11 @@ Boss Room is a fully functional co-op multiplayer RPG made with Unity Netcode. I
 
 You can use everything in this project as a starting point or as bits and pieces in your own Unity games. The project is licensed under the Unity Companion License. See [LICENSE.md](LICENSE.md) for more legal information.
 
+This repo also contains a [Utilities](Packages/com.unity.multiplayer.samples.coop) package, containing sample scripts reusable in your own projects. You can install it using the following manifest file entry:
+
+`"com.unity.multiplayer.samples.coop": "https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop.git?path=/Packages/com.unity.multiplayer.samples.coop",
+`
+
 See [ART_NOTES.md](Documentation/ART_NOTES.md) for more information on the art of Boss Room.
 
 > __IMPORTANT__:
@@ -91,7 +96,7 @@ For an overview of the project's architecture please check out our [ARCHITECTURE
 
 ---------------
 
-For a deep dive in Unity Netcode and Boss Room, visit our [doc](https://docs-multiplayer.unity3d.com/) and [Unity Multiplayer Resources](https://docs-multiplayer.unity3d.com/netcode/current/learn/introduction) sections.
+For a deep dive in Unity Netcode and Boss Room, visit our [docs site](https://docs-multiplayer.unity3d.com/).
 
 ## Bite-size Samples
 This repository contains a collection of bitesize sample projects and games that showcase different sub-features of NGO. You can review these samples with documentation to understand APIs and features better.