Skip to content

Commit 1939d6d

Browse files
chore: Defines cleanup and dependencies update (#3736)
* Removed MULTIPLAYER_TOOLS_1_0_0_PRE_7 define usage * Updated services package * Updated transport dependency * Removal of UNITY_UNET_PRESENT define * changelog update * Updated testproject default editor to 6000.0.51f1 * Removed UNET.meta file * Reverted removal of Tools define --------- Co-authored-by: Noel Stephens <[email protected]>
1 parent 6eb88aa commit 1939d6d

File tree

30 files changed

+288
-503
lines changed

30 files changed

+288
-503
lines changed

Examples/CharacterControllerMovingBodies/Packages/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"com.unity.ide.visualstudio": "2.0.22",
1212
"com.unity.netcode.gameobjects": "https://github.com/Unity-Technologies/com.unity.netcode.gameobjects.git?path=com.unity.netcode.gameobjects#develop-2.0.0",
1313
"com.unity.purchasing": "4.12.2",
14-
"com.unity.services.multiplayer": "1.0.0-pre.1",
14+
"com.unity.services.multiplayer": "1.2.0",
1515
"com.unity.test-framework": "1.4.5",
1616
"com.unity.timeline": "1.8.7",
1717
"com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.9",

Examples/OverridingScenesAndPrefabs/Packages/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"com.unity.multiplayer.center": "1.0.0",
1313
"com.unity.netcode.gameobjects": "https://github.com/Unity-Technologies/com.unity.netcode.gameobjects.git?path=com.unity.netcode.gameobjects#develop-2.0.0",
1414
"com.unity.purchasing": "4.12.2",
15-
"com.unity.services.multiplayer": "1.0.0",
15+
"com.unity.services.multiplayer": "1.2.0",
1616
"com.unity.test-framework": "1.4.5",
1717
"com.unity.timeline": "1.8.7",
1818
"com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.9",

Examples/PingTool/Packages/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"com.unity.multiplayer.playmode": "1.3.0",
1313
"com.unity.multiplayer.tools": "2.2.1",
1414
"com.unity.netcode.gameobjects": "https://github.com/Unity-Technologies/com.unity.netcode.gameobjects.git?path=com.unity.netcode.gameobjects#develop-2.0.0",
15-
"com.unity.services.multiplayer": "1.0.0",
15+
"com.unity.services.multiplayer": "1.2.0",
1616
"com.unity.test-framework": "1.4.5",
1717
"com.unity.timeline": "1.8.7",
1818
"com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.9",

com.unity.netcode.gameobjects/CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ Additional documentation and release notes are available at [Multiplayer Documen
2424
- Changed the default `NetworkDelivery` used by all messages is now reliable fragmented sequenced with the exception of named, unnamed, and any messages sent with a user specified network delivery type. This assures certain order of operations to be preserved when same call-stack changes are applied to a newly spawned, authority side, NetworkObject. (#3664)
2525
- Changed NetworkTransform documentation to better reflect the Teleport methods intended usage along with updates to NetworkObject and physics areas of the documentation. (#3664)
2626
- The first session owner no longer sends two synchronization messages to the service. (#3563)
27+
- Updated transport dependency of the package to 2.6.0 (#3736)
2728

2829
### Deprecated
2930

@@ -32,6 +33,8 @@ Additional documentation and release notes are available at [Multiplayer Documen
3233

3334
### Removed
3435

36+
- Removed usage of UNITY_UNET_PRESENT define (#3736)
37+
3538
### Fixed
3639

3740
- Multiple disconnect events from the same transport will no longer disconnect the host. (#3707)

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
#if COM_UNITY_MODULES_ANIMATION || COM_UNITY_MODULES_PHYSICS || COM_UNITY_MODULES_PHYSICS2D
22
using Unity.Netcode.Components;
33
#endif
4-
#if UNITY_UNET_PRESENT
5-
using Unity.Netcode.Transports.UNET;
6-
#endif
74
using Unity.Netcode.Transports.UTP;
85
using UnityEditor;
96
using UnityEngine;
@@ -29,16 +26,6 @@ public override void OnInspectorGUI()
2926
EditorGUI.EndChangeCheck();
3027
}
3128
}
32-
#if UNITY_UNET_PRESENT
33-
/// <summary>
34-
/// Internal use. Hides the script field for UNetTransport.
35-
/// </summary>
36-
[CustomEditor(typeof(UNetTransport), true)]
37-
public class UNetTransportEditor : HiddenScriptEditor
38-
{
39-
40-
}
41-
#endif
4229

4330
/// <summary>
4431
/// Internal use. Hides the script field for UnityTransport.

com.unity.netcode.gameobjects/Editor/Unity.Netcode.Editor.asmdef

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,6 @@
2424
"expression": "",
2525
"define": "MULTIPLAYER_TOOLS"
2626
},
27-
{
28-
"name": "Unity",
29-
"expression": "(0,2022.2.0a5)",
30-
"define": "UNITY_UNET_PRESENT"
31-
},
3227
{
3328
"name": "com.unity.modules.animation",
3429
"expression": "",

com.unity.netcode.gameobjects/Runtime/Transports/UNET/UNetTransport.cs

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

0 commit comments

Comments
 (0)