Skip to content

Commit bcb626d

Browse files
EmandMEmandM
authored
Merge branch 'develop-2.0.0' into chore/update-ownership-documentation
2 parents 62dd7b9 + 7c515b3 commit bcb626d

24 files changed

+256
-209
lines changed

‎.github/ISSUE_TEMPLATE/feature_request.md‎

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

‎.yamato/_triggers.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,20 +75,20 @@ pr_code_changes_checks:
7575
# Run API validation to early-detect all new APIs that would force us to release new minor version of the package. Note that for this to work the package version in package.json must correspond to "actual package state" which means that it should be higher than last released version
7676
- .yamato/vetting-test.yml#vetting_test
7777

78-
# Run package EditMode and Playmode package tests on trunk and an older supported editor (6000.0)
79-
- .yamato/package-tests.yml#package_test_-_ngo_trunk_mac
78+
# Run package EditMode and Playmode package tests on 6000.5 and an older supported editor (6000.0)
79+
- .yamato/package-tests.yml#package_test_-_ngo_6000.5_mac
8080
- .yamato/package-tests.yml#package_test_-_ngo_6000.0_win
8181

82-
# Run testproject EditMode and Playmode project tests on trunk and an older supported editor (6000.0)
83-
- .yamato/project-tests.yml#test_testproject_win_trunk
82+
# Run testproject EditMode and Playmode project tests on 6000.5 and an older supported editor (6000.0)
83+
- .yamato/project-tests.yml#test_testproject_win_6000.5
8484
- .yamato/project-tests.yml#test_testproject_mac_6000.0
8585

8686
# Run standalone test. We run it only on Ubuntu since it's the fastest machine, and it was noted that for example distribution on macOS is taking 40m since we switched to Apple Silicon
8787
# Coverage on other standalone machines is present in Nightly job so it's enough to not run all of them for PRs
8888
# desktop_standalone_test and cmb_service_standalone_test are both reusing desktop_standalone_build dependency so we run those in the same configuration on PRs to reduce waiting time.
89-
# Note that our daily tests will anyway run both test configurations in "minimal supported" and "trunk" configurations
90-
- .yamato/desktop-standalone-tests.yml#desktop_standalone_test_testproject_ubuntu_il2cpp_trunk
91-
- .yamato/cmb-service-standalone-tests.yml#cmb_service_standalone_test_testproject_ubuntu_il2cpp_trunk
89+
# Note that our daily tests will anyway run both test configurations in "minimal supported" and "6000.5" configurations
90+
- .yamato/desktop-standalone-tests.yml#desktop_standalone_test_testproject_ubuntu_il2cpp_6000.5
91+
- .yamato/cmb-service-standalone-tests.yml#cmb_service_standalone_test_testproject_ubuntu_il2cpp_6000.5
9292
triggers:
9393
expression: |-
9494
(pull_request.comment eq "ngo" OR

‎.yamato/project.metafile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ validation_editors:
181181
- 6000.0
182182
- 6000.3
183183
- 6000.4
184+
- 6000.5
184185
- trunk
185186
minimal:
186187
- 6000.0

‎Tools/scripts/ReleaseAutomation/release_config.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -98,16 +98,16 @@ def __init__(self):
9898

9999
self.yamato_build_automation_configs = [
100100
{
101-
"job_name": "Build Sample for Windows with minimal supported editor (2022.3), burst ON, IL2CPP",
101+
"job_name": "Build Sample for Windows with minimal supported editor (6000.0), burst ON, IL2CPP",
102102
"variables": [
103103
{ "key": "BURST_ON_OFF", "value": "on" },
104104
{ "key": "PLATFORM_WIN64_MAC_ANDROID", "value": "win64" },
105105
{ "key": "SCRIPTING_BACKEND_IL2CPP_MONO", "value": "il2cpp" },
106-
{ "key": "UNITY_VERSION", "value": "2022.3" } # Minimal supported editor
106+
{ "key": "UNITY_VERSION", "value": "6000.0" } # Minimal supported editor
107107
]
108108
},
109109
{
110-
"job_name": "Build Sample for Windows with latest functional editor (6000.2), burst ON, IL2CPP",
110+
"job_name": "Build Sample for Windows with latest functional editor (6000.3), burst ON, IL2CPP",
111111
"variables": [
112112
{ "key": "BURST_ON_OFF", "value": "on" },
113113
{ "key": "PLATFORM_WIN64_MAC_ANDROID", "value": "win64" },
@@ -125,16 +125,16 @@ def __init__(self):
125125
]
126126
},
127127
{
128-
"job_name": "Build Sample for MacOS with minimal supported editor (2022.3), burst OFF, Mono",
128+
"job_name": "Build Sample for MacOS with minimal supported editor (6000.0), burst OFF, Mono",
129129
"variables": [
130130
{ "key": "BURST_ON_OFF", "value": "off" },
131131
{ "key": "PLATFORM_WIN64_MAC_ANDROID", "value": "mac" },
132132
{ "key": "SCRIPTING_BACKEND_IL2CPP_MONO", "value": "mono" },
133-
{ "key": "UNITY_VERSION", "value": "2022.3" } # Minimal supported editor
133+
{ "key": "UNITY_VERSION", "value": "6000.0" } # Minimal supported editor
134134
]
135135
},
136136
{
137-
"job_name": "Build Sample for MacOS with latest functional editor (6000.2), burst OFF, Mono",
137+
"job_name": "Build Sample for MacOS with latest functional editor (6000.3), burst OFF, Mono",
138138
"variables": [
139139
{ "key": "BURST_ON_OFF", "value": "off" },
140140
{ "key": "PLATFORM_WIN64_MAC_ANDROID", "value": "mac" },
@@ -152,16 +152,16 @@ def __init__(self):
152152
]
153153
},
154154
{
155-
"job_name": "Build Sample for Android with minimal supported editor (2022.3), burst ON, IL2CPP",
155+
"job_name": "Build Sample for Android with minimal supported editor (6000.0), burst ON, IL2CPP",
156156
"variables": [
157157
{ "key": "BURST_ON_OFF", "value": "on" },
158158
{ "key": "PLATFORM_WIN64_MAC_ANDROID", "value": "android" },
159159
{ "key": "SCRIPTING_BACKEND_IL2CPP_MONO", "value": "il2cpp" },
160-
{ "key": "UNITY_VERSION", "value": "2022.3" } # Minimal supported editor
160+
{ "key": "UNITY_VERSION", "value": "6000.0" } # Minimal supported editor
161161
]
162162
},
163163
{
164-
"job_name": "Build Sample for Android with latest functional editor (6000.2), burst ON, IL2CPP",
164+
"job_name": "Build Sample for Android with latest functional editor (6000.3), burst ON, IL2CPP",
165165
"variables": [
166166
{ "key": "BURST_ON_OFF", "value": "on" },
167167
{ "key": "PLATFORM_WIN64_MAC_ANDROID", "value": "android" },

‎Tools/scripts/Utils/triggerYamatoJobsForReleasePreparation.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,12 @@ def trigger_automated_builds_job_on_yamato(yamato_api_token, project_id, branch_
7575
7676
build_automation_configs = [
7777
{
78-
"job_name": "Build Sample for Windows with minimal supported editor (2022.3), burst ON, IL2CPP",
78+
"job_name": "Build Sample for Windows with latest supported editor (6000.3), burst ON, IL2CPP",
7979
"variables": [
8080
{ "key": "BURST_ON_OFF", "value": "on" },
8181
{ "key": "PLATFORM_WIN64_MAC_ANDROID", "value": "win64" },
8282
{ "key": "SCRIPTING_BACKEND_IL2CPP_MONO", "value": "il2cpp" },
83-
{ "key": "UNITY_VERSION", "value": "2022.3" }
83+
{ "key": "UNITY_VERSION", "value": "6000.3" }
8484
]
8585
}
8686
]
@@ -125,7 +125,8 @@ def trigger_release_preparation_jobs(config: ReleaseConfig):
125125
try:
126126
revision_sha = get_latest_git_revision(config.release_branch_name)
127127

128-
trigger_wrench_promotion_job_on_yamato(config.yamato_api_token, config.yamato_project_id, config.release_branch_name, revision_sha)
128+
# We don't need to trigger promotion job to run the tests for the release branch since those are being triggered automatically on release/ prefixed branches
129+
#trigger_wrench_promotion_job_on_yamato(config.yamato_api_token, config.yamato_project_id, config.release_branch_name, revision_sha)
129130
trigger_automated_builds_job_on_yamato(config.yamato_api_token, config.yamato_project_id, config.release_branch_name, revision_sha, config.yamato_samples_to_build, config.yamato_build_automation_configs)
130131

131132
except Exception as e:

‎com.unity.netcode.gameobjects/CHANGELOG.md‎

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

1111
### Added
1212

13+
- Added a `WebSocketPath` field to `UnityTransport.ConnectionData` (which also shows up in the inspector if "Use WebSockets" is checked) that controls the path clients will connect to and servers/hosts will listen on when using WebSockets. (#3901)
14+
- `NetworkTransport.EarlyUpdate` and `NetworkTransport.PostLateUpdate` are now public. For the vast majority of users, there's really no point in ever calling those methods directly (the `NetworkManager` handles it). It's only useful if wrapping transports outside of NGO. (#3890)
1315

1416
### Changed
1517

@@ -18,16 +20,19 @@ Additional documentation and release notes are available at [Multiplayer Documen
1820

1921

2022
### Removed
21-
23+
- Removed un-needed exceptions on `NetworkObject.cs`. (#3867)
2224

2325
### Fixed
2426

27+
- Fixed issue where an attachable could log an error upon being de-spawned during shutdown. (#3895)
28+
- NestedNetworkVariables initialized with no value no longer throw an error. (#3891)
29+
- Fixed `NetworkShow` behavior when it is called twice. (#3867)
2530

2631
### Security
2732

2833

2934
### Obsolete
30-
35+
- `NotListeningException` is now marked as obsolete as it is no longer used internally. (#3867)
3136

3237
## [2.10.0] - 2026-03-01
3338

‎com.unity.netcode.gameobjects/Editor/HiddenScriptEditor.cs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ public class UnityTransportEditor : HiddenScriptEditor
4242

4343
private SerializedProperty m_ServerAddressProperty;
4444
private SerializedProperty m_ServerPortProperty;
45+
private SerializedProperty m_WebSocketPathProperty;
4546

4647
private const string k_LoopbackIpv4 = "127.0.0.1";
4748
private const string k_LoopbackIpv6 = "::1";
@@ -62,6 +63,7 @@ private void Initialize()
6263

6364
m_ServerAddressProperty = connectionDataProperty.FindPropertyRelative(nameof(UnityTransport.ConnectionAddressData.Address));
6465
m_ServerPortProperty = connectionDataProperty.FindPropertyRelative(nameof(UnityTransport.ConnectionAddressData.Port));
66+
m_WebSocketPathProperty = connectionDataProperty.FindPropertyRelative(nameof(UnityTransport.ConnectionAddressData.WebSocketPath));
6567
}
6668

6769
/// <summary>
@@ -79,6 +81,11 @@ public override void OnInspectorGUI()
7981
EditorGUILayout.PropertyField(m_ServerAddressProperty);
8082
EditorGUILayout.PropertyField(m_ServerPortProperty);
8183

84+
if (m_UnityTransport.UseWebSockets)
85+
{
86+
EditorGUILayout.PropertyField(m_WebSocketPathProperty);
87+
}
88+
8289
serializedObject.ApplyModifiedProperties();
8390

8491
EditorGUILayout.HelpBox("It's recommended to leave remote connections disabled for local testing to avoid exposing ports on your device.", MessageType.Info);

‎com.unity.netcode.gameobjects/Editor/NetworkManagerRelayIntegration.cs‎

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

‎com.unity.netcode.gameobjects/Editor/NetworkManagerRelayIntegration.cs.meta‎

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

0 commit comments

Comments
 (0)