Skip to content

Commit

Permalink
Develop into main to update homepage (#1352)
Browse files Browse the repository at this point in the history
Co-authored-by: Gabriel Kwa <[email protected]>
Co-authored-by: Vic Cooper <[email protected]>
Co-authored-by: Nicolas PERNOT <[email protected]>
Co-authored-by: Cristian Mazo <[email protected]>
  • Loading branch information
5 people authored Sep 26, 2024
1 parent 129d8a1 commit 7f6721d
Show file tree
Hide file tree
Showing 11 changed files with 48 additions and 28 deletions.
14 changes: 7 additions & 7 deletions docusaurus.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ const admonitions = require("./config/admonitions.config.js");
const headTags = require("./config/scripts.config.js");

module.exports = {
title: "Unity Multiplayer Networking",
title: "Unity Multiplayer",
tagline: "Build multiplayer games in Unity",
url: "https://docs-multiplayer.unity3d.com/",
headTags,
Expand Down Expand Up @@ -87,7 +87,7 @@ module.exports = {
],
},
{
title: "Multiplayer Networking",
title: "Multiplayer",
items: [
{
label: "Licenses",
Expand Down Expand Up @@ -125,12 +125,12 @@ module.exports = {
title: "Contact",
items: [
{
label: "Unity Multiplayer Forum",
href: "https://forum.unity.com/forums/multiplayer.26/",
label: "Unity Multiplayer Discussions",
href: "https://discussions.unity.com/lists/multiplayer",
},
{
label: "Unity Forums",
href: "https://forum.unity.com/",
label: "Unity Discussions",
href: "https://discussions.unity.com",
},
{
label: "Discord",
Expand All @@ -142,7 +142,7 @@ module.exports = {
copyright: ${new Date().getFullYear()} Unity Technologies`,
},
navbar: {
title: "Multiplayer Networking",
title: "Multiplayer",
logo: {
alt: "Unity",
src: "img/logo.png",
Expand Down
4 changes: 4 additions & 0 deletions mppm/about.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ Multiplayer Play Mode version 1.1.0 is compatible with Unity Editor versions 600

Multiplayer Play Mode version 1.1.0 is compatible with Unity Editor versions 6000.0.3f1 or later.

## Compatibility

Multiplayer Play Mode version 1.1.0 is compatible with Unity Editor versions 6000.0.3f1 or later.

## Multiplayer Play Mode terminology

The following have specific meaning in relation to Multiplayer Play Mode:
Expand Down
4 changes: 2 additions & 2 deletions mppm/mppm-reference/play-mode-scenario-window-reference.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ You can change the Multiplayer Role in the **File** > **Build Profiles** window.
|Additional Editor Instances|||A [virtual player](https://docs-multiplayer.unity3d.com/mppm/current/virtual-players/) that exists in the Unity Editor.|
||Name||The name for this additional Editor instance that appears in the [Play Mode status window](play-mode-scenario-window-reference.md). |
||Multiplayer Role||The [Multiplayer Role](https://docs.unity3d.com/Packages/[email protected]/manual/multiplayer-roles.html) that this instance uses. Unity uses this Multiplayer Role and ignores the Multiplayer Role you assign in the Project Settings window. This property appears when the [Dedicated Server package](https://docs.unity3d.com/Packages/[email protected]/manual/index.html) exists in your project|
||Tag||One or more reference words that you can use in a script to assign the main Editor Player to a certain behavior.
To control whether a player exists on the client or server, use the **Multiplayer Role** property.|
||Tag||One or more reference words that you can use in a script to assign the main Editor Player to a certain behavior.<br/>To control whether a player exists on the client or server, use the **Multiplayer Role** property.|
|Local Instances|||Instances of this project that run on your local machine.|
||Name||The name of this instance that appears in the [Play Mode status window](play-mode-scenario-window-reference.md).|
||Build Profile||The [Build Profile](https://docs.unity3d.com/6000.0/Documentation/Manual/build-profiles.html) that this instance uses. When you build on a Windows device, select the Windows platform. When you build on a MacOS device, select the MacOS platform.|
Expand All @@ -29,6 +28,7 @@ To control whether a player exists on the client or server, use the **Multiplaye
|||Arguments|The [UGS launch parameters](https://docs.unity.com/ugs/manual/game-server-hosting/manual/concepts/launch-parameters) that modify this instance.|
|Remote Instances|||Instances that exist in the [Unity Cloud](https://docs.unity.com/cloud/en-us) and use [Unity Gaming Services (UGS) Multiplay Hosting](https://docs.unity.com/ugs/en-us/manual/game-server-hosting/manual/welcome-to-multiplay).|
||Name||The name of this instance that appears in the [Play Mode status window](play-mode-scenario-window-reference.md).|
||Identifier||The label, in a string, that determines the name of the Multiplay build, fleet, and server. This string field uses the format `CreatedFromTheUnityEditor-[identifier]-[username]`. Don't use any special characters.|
||Multiplayer Role||The [Multiplayer Role](https://docs.unity3d.com/Packages/[email protected]/manual/multiplayer-roles.html) that this remote instance uses. Unity uses this Multiplayer Role and ignores the Multiplayer Role you assign in the Project Settings window. This property appears when the [Dedicated Server package](https://docs.unity3d.com/Packages/[email protected]/manual/index.html) exists in your project|
||Advanced Configuration|||Optional properties that you can use to debug and control this remote instance. |
|||Fleet Name|The name of the server fleet to display in the Multiplayer Hosting environment. |
Expand Down
3 changes: 1 addition & 2 deletions mppm/play-mode-scenario/play-mode-scenario-req.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,9 @@ The Play Mode Scenario window has the following limitations:
* You can only run a remote instance on the Linux platform.
* You can only run a local instance on Mac, Linux, or Windows platforms.
* Play Mode scenarios doesn’t support [Play Mode shortcuts](https://docs.unity3d.com/6000.0/Documentation/Manual/UnityHotkeys.html).
* When you enable [domain reloading](https://docs.unity3d.com/Manual/DomainReloading.html), streaming logs for local instances might stop working.

## Additional resources
* [Netcode for Entities Project Setup](https://docs.unity3d.com/Packages/[email protected]/manual/installation.html)
* [Multiplayer Play Mode System requirements and compatibility](sys-req.md)
* [Play Mode scenario window reference](mppm-reference/play-mode-scenario-window-reference.md)
* [Create a Play Mode scenario](play-mode-scenario-create.md)
* [Create a Play Mode scenario](play-mode-scenario-create.md)
2 changes: 1 addition & 1 deletion mppm/virtual-players/virtual-players.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ This section contains the following information:
|-|-|
| [Activate a Virtual Player](../virtual-players/virtual-players-enable) | Set up Virtual Players. |
| [Focus the Multiplayer Play Mode view on a Virtual Player](../virtual-players/virtual-players-focus) | Switch the Multiplayer Play Mode view between Players. |
| [Change the layout of a Virtual Player](../virtual-players/virtual-players-layout)| Control which parts of the [Unity Interface](https://docs.unity3d.com/Manual/UsingTheEditor.html) appear in a Virtual Player. |
| [Change the layout of a Virtual Player](../virtual-players/virtual-players-layout)| Control which parts of the [Unity Interface](https://docs.unity3d.com/Manual/UsingTheEditor.html) appear in a Virtual Player. |
3 changes: 3 additions & 0 deletions mppm_versioned_docs/version-1.0.0/about.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ 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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ description: Learn how to test a player running in Multiplayer Play Mode

Use the Test Runner included in the [Unity Test Framework (UTF)](https://docs.unity3d.com/Packages/[email protected]/manual/index.html) to test players in a multiplayer project.

:::note:
:::note
Multiplayer Play Mode is compatible with Unity Editor versions 2023.1 or later.
:::

Expand Down
27 changes: 18 additions & 9 deletions src/pages/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ const highlights = [
title: "Unity Transport and Netcode for GameObjects",
imageUrl: "img/hilight-code.jpg",
description: (
<>Unity Netcode for GameObject uses Unity Transport by default!</>
<>Unity Transport is a low-level networking library for multiplayer game development. It's the underlying protocol for Netcode for GameObjects, but you can also use it with a custom solution.</>
),
link: (
<>
Expand Down Expand Up @@ -158,15 +158,24 @@ function Home() {
<p className="hero__subtitle">{siteConfig.tagline}</p>
<div className="buttons-pages">
<Link
className={clsx(
"button button--outline button--secondary button--lg",
styles.getStarted
)}
to={useBaseUrl("netcode/current/about")}
className={clsx(
"button button--outline button--secondary button--lg",
styles.heroButton
)}
to={useBaseUrl("netcode/current/about")}
>
Get Started
Get started
</Link>
</div>
<Link
className={clsx(
"button button--outline button--secondary button--lg",
styles.heroButton
)}
to="https://docs.unity3d.com/6000.0/Documentation/Manual/multiplayer.html" target="_blank"
>
Multiplayer Unity Manual
</Link>
</div>
</div>
</header>
<main>
Expand Down Expand Up @@ -204,7 +213,7 @@ function Home() {
<h1 className="blog-title">Be part of the community!</h1>
<p className="blog-subtitle">
We have an active community on Discord for tips, announcements, and
interact with other users and Unity developers to help you on your Multiplayer Networking
interact with other users and Unity developers to help you on your Multiplayer
journey!
Connect to our {" "}
<a href="https://discord.gg/buMxnnPvTb" target="_blank">
Expand Down
8 changes: 8 additions & 0 deletions src/pages/styles.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,11 @@
height: 200px;
width: 200px;
}

.heroButton {
margin-bottom: 1rem;
}

.heroButton:not(:last-child) {
margin-right: 1rem;
}
2 changes: 1 addition & 1 deletion transport/workflow-client-server-secure.md
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ void Start ()
var settings = new NetworkSettings();
settings.WithSecureServerParameters(
certificate: SecureParameters.MyGameServerCertificate,
privateKey: SecureParameters.myGameServerPrivateKey);
privateKey: SecureParameters.MyGameServerPrivateKey);

// ...
}
Expand Down
7 changes: 2 additions & 5 deletions transport/workflow-client-server-udp.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,7 @@ public class ServerBehaviour : MonoBehaviour {

void Update () {
}

public NetworkDriver m_Driver;
private NativeList<NetworkConnection> m_Connections;
}
```

Next, expand the `Start`, `OnDestroy`, and `Update` methods.
Expand Down Expand Up @@ -179,12 +177,11 @@ The following code iterates through the connection list and removes any stale co

```csharp
// Clean up connections
for (int i = 0; i < m_Connections.Length; i++)
for (int i = m_Connections.Length - 1; i >= 0; i--)
{
if (!m_Connections[i].IsCreated)
{
m_Connections.RemoveAtSwapBack(i);
--i;
}
}
```
Expand Down

0 comments on commit 7f6721d

Please sign in to comment.