Merge conflicts

Author: jabbacakes

docs/basics/object-spawning.md

@@ -113,7 +113,7 @@ As an alternative way, you can make the `NetworkObject.DontDestroyWithOwner` pro
 
 ### Despawning
 
-Only a server can despawn a NetworkObject, and the default despawn behavior is to destroy the associated GameObject. to despawn but not destroy a NetworkObject, you should call `NetworkObject.Despawn` and pass false as the parameter. Clients will always be notified and will mirror the despawn behavior. If you despawn and destroy on the server then all clients will despawn and then destroy the `GameObject` that the `NetworkObjet` component is attached to.
+Only a server can despawn a NetworkObject, and the default despawn behavior is to destroy the associated GameObject. to despawn but not destroy a NetworkObject, you should call `NetworkObject.Despawn` and pass false as the parameter. Clients will always be notified and will mirror the despawn behavior. If you despawn and destroy on the server then all clients will despawn and then destroy the `GameObject` that the `NetworkObject` component is attached to.
 
 On the client side, you should never call `Object.Destroy` on any `GameObject` with a NetworkObject component attached to it (this isn't supported and will cause an exception to be thrown). If you want to use a more client authority model, have the client with ownership invoke an RPC to defer the despawning on server side.
 

docs/learn/bossroom/getting-started-boss-room.md

@@ -67,7 +67,7 @@ For more information on the art in Boss Room, see [ART_NOTES.md](https://github.
 
 ### Install the Boss Room project
 
-To install the Boss Room project, download or clone it from the [com.unity.multiplayer.samples.coop](https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop) repository. 
+To install the Boss Room project, download or clone it from the [com.unity.multiplayer.samples.coop](https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop) repository.
 
 **Note**: If you install the project with Git, you must install Git LFS first.
 
@@ -233,6 +233,10 @@ Boss Room includes the following tools and utilities:
 * Scene utils with synced loading screens - [Packages/com.unity.multiplayer.samples.coop/Utilities/SceneManagement/](https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop/blob/main/Packages/com.unity.multiplayer.samples.coop/Utilities/SceneManagement)
 * RNSM custom config - [Packages/com.unity.multiplayer.samples.coop/Utilities/Net/RNSM/CustomNetStatsMonitorConfiguration.asset](https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop/blob/main/Packages/com.unity.multiplayer.samples.coop/Utilities/Net/RNSM/CustomNetStatsMonitorConfiguration.asset)
 * NetworkSimulator usage through UI - [Assets/Scripts/Utils/NetworkSimulatorUIMediator.cs ](https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop/blob/main/Assets/Scripts/Utils/NetworkSimulatorUIMediator.cs)
+<<<<<<< HEAD
+=======
+* ParrelSync - [Packages/manifest.json](https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop/blob/main/Packages/manifest.json)
+>>>>>>> main
 
 ### Troubleshooting
 
@@ -283,4 +287,4 @@ Please check out [CONTRIBUTING.md](https://github.com/Unity-Technologies/com.uni
 
 Thank you for cloning Boss Room and taking a look at the project. To help us improve and build better samples in the future, please consider submitting feedback about your experiences with Boss Room. It'll only take a couple of minutes. Thanks!
 
-[Enter the Boss Room Feedback Form](https://unitytech.typeform.com/bossroom)
+[Enter the Boss Room Feedback Form](https://unitytech.typeform.com/bossroom)

docusaurus.config.js

@@ -252,6 +252,10 @@ module.exports = {
               label: "2.0.0",
               path: "2.0.0",
             },
+            "1.12.0": {
+              label: "1.12.0",
+              path: "1.12.0",
+            },
             "1.11.0": {
               label: "1.11.0",
               path: "1.11.0",

mppm/about.md

@@ -10,8 +10,8 @@ Use Multiplayer Play Mode to test multiplayer functionality within the Unity Edi
 
 Multiplayer Play Mode version 1.5.0-exp.1 is compatible with the following: 
 
-* Unity Editor versions 6000.0.22f1 or later.
-* Windows, Linux,and MacOS platforms.
+* Unity Editor versions 6000.1.0b1 or later.
+* Windows and MacOS platforms.
 * Experimental Android support for Unity Editor version 6.1.
 
 ## Multiplayer Play Mode terminology

mppm/install.md

@@ -4,14 +4,14 @@ title: Install Multiplayer Play Mode
 description: How to install Multiplayer Play Mode
 ---
 
-You can use Multiplayer Play Mode version 1.1.0 in Unity Editor versions 6000.0.3f1 or later. Multiplayer Play mode versions 1.0.0 and earlier are compatible with Unity version 2023.1 or later.
+You can use this version of Multiplayer Play Mode in Unity Editor versions 6000.1.0b1 or later.
 To install the Multiplayer Play Mode package, follow these steps:
 
 1. Open Unity Hub.
 2. Select a Project to open it.
 3. In the Editor's menu bar, navigate to **Window** > **Package Manager**.
 4. Select **Unity Registry**.
-5. Select the **Multiplayer Play Mode** package. 
+5. Select the **Multiplayer Play Mode** package.
 6. Select **Install**.
 
 ## Next steps

mppm/sys-req.md

@@ -1,17 +1,11 @@
 ---
 id: sys-req
-title: System requirements and compatibility
+title: Compatibility
 ---
-
-The Multiplayer Play Mode package requires the following:
-
-- Unity Editor version 2023.1 or later.
-- An active Project in the Unity Hub.
-
-## Compatibility
-Multiplayer Play Mode is compatible with the following multiplayer packages and services: 
+You can use Multiplayer Play Mode with any Netcode solution.
+Multiplayer Play Mode also contains features that integrate with the following multiplayer packages and services: 
 - [Netcode for GameObjects](https://docs-multiplayer.unity3d.com/netcode/1.6.0/about/)
 - [Netcode for Entities](https://docs.unity3d.com/Packages/[email protected]/manual/index.html)
 - [Multiplayer Tools](https://docs-multiplayer.unity3d.com/tools/current/about/)
 - [Dedicated Server](https://docs.unity3d.com/Packages/[email protected]/manual/index.html) 
-- [Unity Game Services that use Multiplayer](https://docs.unity.com/ugs/en-us/manual/overview/manual/unity-gaming-services-home)
+- [Unity Game Services that use Multiplayer](https://docs.unity.com/ugs/en-us/manual/overview/manual/unity-gaming-services-home)

mppm_versioned_docs/version-1.0.0/about.md

@@ -9,9 +9,6 @@ Use Multiplayer Play Mode to test multiplayer functionality within the Unity Edi
 ## Compatibility
 Multiplayer Play Mode version 1.0.0 is compatible with Unity Editor versions 6000.0.3f1 or later.
 
-## Compatibility
-Multiplayer Play Mode version 1.0.0 is compatible with Unity Editor versions 2023.1 or later.
-
 ## Multiplayer Play Mode terminology
 
 The following have specific meaning in relation to Multiplayer Play Mode:

mppm_versioned_docs/version-1.1.0/install.md

@@ -4,7 +4,7 @@ title: Install Multiplayer Play Mode
 description: How to install Multiplayer Play Mode
 ---
 
-You can use Multiplayer Play Mode version 1.1.0 in Unity Editor versions 6000.0.3f1 or later. Multiplayer Play mode versions 1.0.0 and earlier are compatible with Unity version 2023.1 or later.
+You can use Multiplayer Play Mode version 1.1.0 in Unity Editor versions 6000.0.3f1 or later.
 To install the Multiplayer Play Mode package, follow these steps:
 
 1. Open Unity Hub.

mppm_versioned_docs/version-1.1.0/sys-req.md

@@ -5,13 +5,12 @@ title: System requirements and compatibility
 
 The Multiplayer Play Mode package requires the following:
 
-- Unity Editor version 2023.1 or later.
 - An active Project in the Unity Hub.
 
 ## Compatibility
-Multiplayer Play Mode is compatible with the following multiplayer packages and services: 
+Multiplayer Play Mode is compatible with the following multiplayer packages and services:
 - [Netcode for GameObjects](https://docs-multiplayer.unity3d.com/netcode/1.6.0/about/)
 - [Netcode for Entities](https://docs.unity3d.com/Packages/[email protected]/manual/index.html)
 - [Multiplayer Tools](https://docs-multiplayer.unity3d.com/tools/current/about/)
-- [Dedicated Server](https://docs.unity3d.com/Packages/[email protected]/manual/index.html) 
+- [Dedicated Server](https://docs.unity3d.com/Packages/[email protected]/manual/index.html)
 - [Unity Game Services that use Multiplayer](https://docs.unity.com/ugs/en-us/manual/overview/manual/unity-gaming-services-home)

mppm_versioned_docs/version-1.2.0/install.md

@@ -4,7 +4,7 @@ title: Install Multiplayer Play Mode
 description: How to install Multiplayer Play Mode
 ---
 
-You can use Multiplayer Play Mode version 1.1.0 in Unity Editor versions 6000.0.3f1 or later. Multiplayer Play mode versions 1.0.0 and earlier are compatible with Unity version 2023.1 or later.
+You can use this version of Multiplayer Play Mode in Unity Editor versions 6000.0.3f1 or later.
 To install the Multiplayer Play Mode package, follow these steps:
 
 1. Open Unity Hub.
@@ -16,4 +16,4 @@ To install the Multiplayer Play Mode package, follow these steps:
 
 ## Next steps
 
-You can now access and configure your [Virtual Players](../virtual-players) and their [tags](../player-tags).
+You can now access and configure your [Virtual Players](../virtual-players) and their [tags](../player-tags).