Skip to content

Commit 8bfad34

Browse files
Merge branch 'develop-2.0.0' into fix/networktransform-autoswitchspace-forcing-updates-localspace
2 parents 0d59c57 + 7422c91 commit 8bfad34

28 files changed

+733
-458
lines changed

.yamato/cmb-service-standalone-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
cmb_service_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{ editor }}:
3535
name : CMB Service Test - NGO {{ project.name }} - [{{ platform.name }}, {{ editor }}, {{ backend }}]
3636
agent:
37-
type: {{ platform.type }}::GPU
37+
type: {{ platform.type }}
3838
image: {{ platform.image }}
3939
flavor: {{ platform.flavor }}
4040

.yamato/desktop-standalone-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
desktop_standalone_build_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{ editor }}:
3737
name : Standalone Build - NGO {{ project.name }} - [{{ platform.name }}, {{ editor }}, {{ backend }}]
3838
agent:
39-
type: {% if platform.name == "mac" %} {{ platform.type }} {% else %} {{ platform.type }}::GPU {% endif %}
39+
type: {% if platform.name == "mac" %} {{ platform.type }} {% else %} {{ platform.type }} {% endif %}
4040
image: {{ platform.image }}
4141
flavor: {{ platform.flavor }}
4242
{% if platform.name == "mac" %}
@@ -70,7 +70,7 @@ desktop_standalone_build_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{
7070
desktop_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{ editor }}:
7171
name : Standalone Test - NGO {{ project.name }} - [{{ platform.name }}, {{ editor }}, {{ backend }}]
7272
agent:
73-
type: {% if platform.name == "mac" %} {{ platform.type }} {% else %} {{ platform.type }}::GPU {% endif %}
73+
type: {% if platform.name == "mac" %} {{ platform.type }} {% else %} {{ platform.type }} {% endif %}
7474
image: {{ platform.image }}
7575
flavor: {{ platform.flavor }}
7676
{% if platform.name == "mac" %}

com.unity.netcode.gameobjects/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ Additional documentation and release notes are available at [Multiplayer Documen
1010

1111
### Added
1212

13+
- `NetworkSceneManager` as an internal wrapper for the `SceneManager.Scene.handle` and swapped all places that use an `int` to represent a `Scene.handle` to instead use the `NetworkSceneManager`. (#3647)
1314
- Added NetworkRigidbody documentation section. (#3664)
1415
- Clicking on the Help icon in the inspector will now redirect to the relevant documentation. (#3663)
1516
- Added a `Set` function onto `NetworkList` that takes an optional parameter that forces an update to be processed even if the current value is equal to the previous value. (#3690)
@@ -32,6 +33,7 @@ Additional documentation and release notes are available at [Multiplayer Documen
3233

3334
### Fixed
3435

36+
- Distributed authority clients no longer send themselves in the `ClientIds` list when sending a `ChangeOwnershipMessage`. (#3687)
3537
- Made a variety of small performance improvements. (#3683)
3638
- Fixed NetworkTransform state synchronization issue when `NetworkTransform.SwitchTransformSpaceWhenParented` is enabled and the associated NetworkObject is parented multiple times in a single frame or within a couple of frames. (#3664)
3739
- Fixed issue when spawning, parenting, and immediately re-parenting. (#3664)

com.unity.netcode.gameobjects/Documentation~/TableOfContents.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
* [Distributed authority WebGL quickstart](learn/distributed-authority-webgl.md)
88
* [Networking concepts](networking-concepts.md)
99
* [Authority](terms-concepts/authority.md)
10+
* [Ownership](terms-concepts/ownership.md)
1011
* [Network topologies](network-topologies.md)
1112
* [Network topologies](terms-concepts/network-topologies.md)
1213
* [Client-server](terms-concepts/client-server.md)

com.unity.netcode.gameobjects/Documentation~/basics/ownership.md

Lines changed: 0 additions & 94 deletions
This file was deleted.

com.unity.netcode.gameobjects/Documentation~/basics/race-conditions.md

Lines changed: 0 additions & 34 deletions
This file was deleted.

com.unity.netcode.gameobjects/Documentation~/networking-concepts.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ Understand the networking concepts that underpin Netcode for GameObjects.
55
| **Topic** | **Description** |
66
| :------------------------------ | :------------------------------- |
77
| **[Authority](terms-concepts/authority.md)** | Multiplayer games are games that are played between many different game instances. Each game instance has their own copy of the game world and behaviors within that game world. To have a shared game experience, each networked object is required to have an **authority**. |
8+
| **[Ownership](terms-concepts/ownership.md)** | Understand how ownership works in Netcode for GameObjects as a precursor to [authority](terms-concepts/authority.md). |
89
| **[Network topologies](network-topologies.md)** | Understand and decide which network topology to use in your project. |

com.unity.netcode.gameobjects/Documentation~/ownership-authority.md

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)