Skip to content

chore: merge release0.1.0 back to mainline, pt 2 #623

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattwalsh-unity merged 33 commits into from
Mar 16, 2021
Merged

chore: merge release0.1.0 back to mainline, pt 2 #623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
f0ed667
revert: Add NetworkAddress and NetworkPort properties to Transport. (…
mattwalsh-unity Mar 4, 2021
919462c
test: expose runtime internals to runtime tests asmdef (#534)
0xFA11 Mar 5, 2021
2546ef2
ci: enable yamato on PRs targeting master, develop and release/* bran…
0xFA11 Mar 5, 2021
41ac963
ci: enable conventional PR checks on PRs targeting release branches (…
0xFA11 Mar 5, 2021
de8a405
fix: Correctly collecting and drawing counters on dynamic modules (#539)
Mar 5, 2021
7fd6e10
refactor: Improve error messages for NetworkPrefab list. (#538)
LukeStampfli Mar 5, 2021
5e46275
refactor: Refactor spawncall and improve error handling for client si…
LukeStampfli Mar 5, 2021
07def31
fix: re-fix yamato release branch wildcard regex (#542)
0xFA11 Mar 6, 2021
ddf9d9b
fix: NetworkWriter.WriteObjectPacked to call WriteBool instead of Wri…
0xFA11 Mar 6, 2021
5187de6
fix: revert Application.isPlaying check in NetworkScenePostProcess (#…
0xFA11 Mar 8, 2021
59ce805
test: implement test for NetworkUpdateLoop injecting NetworkUpdateSta…
0xFA11 Mar 8, 2021
3b0c29d
refactor: rename spawn/destroy register/unregister methods (#551)
0xFA11 Mar 8, 2021
44cfa29
test: implement extra features on top of existing NetworkUpdateLoopTe…
0xFA11 Mar 9, 2021
f027e58
fix: exposing the network tick interval in the Editor (#566)
jeffreyrainy Mar 9, 2021
db4f940
ci: remove the --dry-run attribute on our package publish job (#567)
JesseOlmer Mar 9, 2021
3673ffc
refactor: remove NetworkManager.Singleton dependencies, add additiona…
NoelStephensUnity Mar 10, 2021
8f8770a
refactor: shutdown queue flush, max RpcQueueHistoryFrame, and spellin…
NoelStephensUnity Mar 10, 2021
b0c37e8
revert: refactor RPQQueue singleton, shutdown queue flush (#585)
mattwalsh-unity Mar 10, 2021
0743a97
fix: adjusting netvars manual tests (#583)
jeffreyrainy Mar 10, 2021
36607e7
fix: revert ReferenceEquals() checks back to Unity's custom == equali…
0xFA11 Mar 11, 2021
1817f62
fix: Moving tick writing out of NetworkVariable and into NetworkBehav…
jeffreyrainy Mar 12, 2021
9691b49
fix: networkprefab upgrade with formerlyserializedas attribute (#619)
LukeStampfli Mar 15, 2021
2fdbdec
test: [testProject] Using the existing NetworkTransform (RPC) instead…
jeffreyrainy Mar 15, 2021
2fb5e8c
fix: Removing MLAPI Profiler for 2020.2 and higher (fix #595) (#612)
Mar 15, 2021
9ffb544
feat: Remove lag compensation related stuff from config (#622)
LukeStampfli Mar 15, 2021
28f81d6
fix: fixing the number of connections counter to be correctly named a…
kvassall-unity Mar 15, 2021
7346a2f
fix: ServerDestroySpawnedSceneObjects throws an exception before swit…
NoelStephensUnity Mar 15, 2021
8b2e771
fix: unregister NetworkPlayerLoop systems from PlayerLoop (#588)
0xFA11 Mar 15, 2021
a39c4d6
fix: Mark Scene dirty when automatically adding a scene to the scene …
becksebenius-unity Mar 15, 2021
05206d6
refactor: Clarify naming of profiler constants (fix #602 and fix #603…
Mar 15, 2021
25d341c
fix: Add require component attribute to network navmesh agent. (#615)
LukeStampfli Mar 15, 2021
8ff56bf
ci: target 2019.4 LTS, 2020.3 LTS, 2021.1 TECH, 2021.2 TECH and trunk…
0xFA11 Mar 16, 2021
ef830ab
Merge remote-tracking branch 'origin/release/0.1.0' into tmp/release-…
mattwalsh-unity Mar 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .yamato/project-publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ publish_{{ project.name }}_{{ package.name }}:
flavor: b1.large
commands:
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- upm-ci package publish --package-path {{ package.path }} --dry-run
- upm-ci package publish --package-path {{ package.path }}
artifacts:
artifacts:
paths:
Expand Down
7 changes: 6 additions & 1 deletion .yamato/project.metafile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
# Editors where tests will happen. The first entry of this array is also used
# for validation
# for validation.
#
# Therefore, **do not** put an older V1-lifecycle ver.
# like 2020.x or 2019.x on top of 'test_editors'
test_editors:
- 2021.1
- 2021.2
- 2020.3
- 2019.4
- trunk

Expand Down
4 changes: 2 additions & 2 deletions com.unity.multiplayer.mlapi/Editor/MLAPIProfiler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace UnityEditor
{
public class MLAPIProfiler : EditorWindow
{
#if !UNITY_2020_2_OR_LATER
#if !UNITY_2020_2_OR_NEWER
[MenuItem("Window/MLAPI Profiler")]
public static void ShowWindow()
{
Expand Down Expand Up @@ -358,4 +358,4 @@ private GUIStyle GetStyleWithTextAlpha(GUIStyle style, float alpha)
return newStyle;
}
}
}
}
39 changes: 21 additions & 18 deletions com.unity.multiplayer.mlapi/Editor/MLAPIProfilerModule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ internal static class MLAPIProfilerModule
[Serializable]
private class MLAPIProfilerCounter
{
// Note: These fields are named this way for internal serialization
public string m_Name;
public string m_Category;
}
Expand All @@ -31,6 +32,7 @@ private class MLAPIProfilerCounter
[Serializable]
private class MLAPIProfilerModuleData
{
// Note: These fields are named this way for internal serialization
public List<MLAPIProfilerCounter> m_ChartCounters = new List<MLAPIProfilerCounter>();
public List<MLAPIProfilerCounter> m_DetailCounters = new List<MLAPIProfilerCounter>();
public string m_Name;
Expand All @@ -39,33 +41,34 @@ private class MLAPIProfilerModuleData
[Serializable]
private class MLAPIModules
{
// Note: These fields are named this way for internal serialization
public List<MLAPIProfilerModuleData> m_Modules;
}

private static List<MLAPIProfilerCounter> CreateRPCCounters() => new List<MLAPIProfilerCounter>()
{
new MLAPIProfilerCounter { m_Name = ProfilerConstants.NumberOfRPCsSent, m_Category = ProfilerCategory.Network.Name },
new MLAPIProfilerCounter { m_Name = ProfilerConstants.NumberOfRPCsReceived, m_Category = ProfilerCategory.Network.Name },
new MLAPIProfilerCounter { m_Name = ProfilerConstants.NumberOfRPCBatchesSent, m_Category = ProfilerCategory.Network.Name },
new MLAPIProfilerCounter { m_Name = ProfilerConstants.NumberOfRPCBatchesReceived, m_Category = ProfilerCategory.Network.Name },
new MLAPIProfilerCounter { m_Name = ProfilerConstants.NumberOfRPCQueueProcessed, m_Category = ProfilerCategory.Network.Name },
new MLAPIProfilerCounter { m_Name = ProfilerConstants.NumberOfRPCsInQueueSize, m_Category = ProfilerCategory.Network.Name },
new MLAPIProfilerCounter { m_Name = ProfilerConstants.NumberOfRPCsOutQueueSize, m_Category = ProfilerCategory.Network.Name },
new MLAPIProfilerCounter { m_Name = ProfilerConstants.RpcSent, m_Category = ProfilerCategory.Network.Name },
new MLAPIProfilerCounter { m_Name = ProfilerConstants.RpcReceived, m_Category = ProfilerCategory.Network.Name },
new MLAPIProfilerCounter { m_Name = ProfilerConstants.RpcBatchesSent, m_Category = ProfilerCategory.Network.Name },
new MLAPIProfilerCounter { m_Name = ProfilerConstants.RpcBatchesReceived, m_Category = ProfilerCategory.Network.Name },
new MLAPIProfilerCounter { m_Name = ProfilerConstants.RpcQueueProcessed, m_Category = ProfilerCategory.Network.Name },
new MLAPIProfilerCounter { m_Name = ProfilerConstants.RpcInQueueSize, m_Category = ProfilerCategory.Network.Name },
new MLAPIProfilerCounter { m_Name = ProfilerConstants.RpcOutQueueSize, m_Category = ProfilerCategory.Network.Name },
};

private static List<MLAPIProfilerCounter> CreateOperationsCounters() => new List<MLAPIProfilerCounter>()
{
new MLAPIProfilerCounter { m_Name = ProfilerConstants.NumberOfConnections, m_Category = ProfilerCategory.Network.Name },
new MLAPIProfilerCounter { m_Name = ProfilerConstants.Connections, m_Category = ProfilerCategory.Network.Name },
new MLAPIProfilerCounter { m_Name = ProfilerConstants.ReceiveTickRate, m_Category = ProfilerCategory.Network.Name },
};

private static List<MLAPIProfilerCounter> CreateMessagesCounters() => new List<MLAPIProfilerCounter>()
{
new MLAPIProfilerCounter { m_Name = ProfilerConstants.NumberOfNamedMessages, m_Category = ProfilerCategory.Network.Name },
new MLAPIProfilerCounter { m_Name = ProfilerConstants.NumberOfUnnamedMessages, m_Category = ProfilerCategory.Network.Name },
new MLAPIProfilerCounter { m_Name = ProfilerConstants.NumberBytesSent, m_Category = ProfilerCategory.Network.Name },
new MLAPIProfilerCounter { m_Name = ProfilerConstants.NumberBytesReceived, m_Category = ProfilerCategory.Network.Name },
new MLAPIProfilerCounter { m_Name = ProfilerConstants.NumberNetworkVarsReceived, m_Category = ProfilerCategory.Network.Name },
new MLAPIProfilerCounter { m_Name = ProfilerConstants.NamedMessageReceived, m_Category = ProfilerCategory.Network.Name },
new MLAPIProfilerCounter { m_Name = ProfilerConstants.UnnamedMessageReceived, m_Category = ProfilerCategory.Network.Name },
new MLAPIProfilerCounter { m_Name = ProfilerConstants.ByteSent, m_Category = ProfilerCategory.Network.Name },
new MLAPIProfilerCounter { m_Name = ProfilerConstants.ByteReceived, m_Category = ProfilerCategory.Network.Name },
new MLAPIProfilerCounter { m_Name = ProfilerConstants.NetworkVarReceived, m_Category = ProfilerCategory.Network.Name },
};

private delegate List<MLAPIProfilerCounter> CounterListFactoryDelegate();
Expand All @@ -75,10 +78,10 @@ private static bool CreateMLAPIDynamicModule(ref MLAPIModules mlapiModules, stri
var module = mlapiModules.m_Modules.Find(x => x.m_Name == moduleName);
if (module == null)
{
var newModule = new MLAPIProfilerModuleData();
newModule.m_Name = moduleName;
newModule.m_ChartCounters = counterListFactoryDelegate();
newModule.m_DetailCounters = counterListFactoryDelegate();
var newModule = new MLAPIProfilerModuleData
{
m_Name = moduleName, m_ChartCounters = counterListFactoryDelegate(), m_DetailCounters = counterListFactoryDelegate(),
};
mlapiModules.m_Modules.Add(newModule);
return true;
}
Expand Down Expand Up @@ -107,4 +110,4 @@ static MLAPIProfilerModule()
#endif
}
}
}
}
6 changes: 3 additions & 3 deletions com.unity.multiplayer.mlapi/Editor/NetworkAnimatorEditor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ private void DrawControls()
if (EditorGUI.EndChangeCheck()) m_Target.ResetTrackedParams();

var animator = m_Target.Animator;
if (ReferenceEquals(animator, null)) return;
if (animator == null) return;

var animatorController = animator.runtimeAnimatorController as AnimatorController;
if (ReferenceEquals(animatorController, null)) return;
if (animatorController == null) return;

EditorGUI.indentLevel += 1;
var showWarning = false;
Expand Down Expand Up @@ -75,4 +75,4 @@ public override void OnInspectorGUI()
serializedObject.ApplyModifiedProperties();
}
}
}
}
Loading