From bce8a434eb9d3201cbe239cfb2d26e4e23bab2ba Mon Sep 17 00:00:00 2001 From: Sean Parker Date: Thu, 25 Jun 2020 13:56:06 +0100 Subject: [PATCH] Add new menu item to open inspector v2 (#1407) * Add new menu item, open inspector v2 * Add entry to CHANGELOG * Update android SDK versions in init.ps1 script --- CHANGELOG.md | 1 + init.ps1 | 4 ++-- .../unity/Packages/io.improbable.gdk.tools/LocalLaunch.cs | 7 +++++++ .../Packages/io.improbable.gdk.tools/MenuPriorities.cs | 3 ++- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0fd8ab0e8b..e6211168da 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### Added - Added `map` support to the Worker Inspector window. [#1403](https://github.com/spatialos/gdk-for-unity/pull/1403) +- Added `Open inspector V2` menu item that opens the new inspector in the browser. [#1407](https://github.com/spatialos/gdk-for-unity/pull/1407) ### Fixed diff --git a/init.ps1 b/init.ps1 index 40b7b044eb..6f5ee504f0 100644 --- a/init.ps1 +++ b/init.ps1 @@ -59,7 +59,7 @@ UpdateSpot spot-macos "$SdkPath/.spot/spot" UpdatePackage worker_sdk c-static-arm-clang-ios "$SdkMobilePath/Plugins/Improbable/Core/iOS/arm" UpdatePackage worker_sdk c-static-x86_64-clang-ios "$SdkMobilePath/Plugins/Improbable/Core/iOS/x86_64" -UpdatePackage worker_sdk c-dynamic-arm64v8a-clang_ndk16b-android "$SdkMobilePath/Plugins/Improbable/Core/Android/arm64" -UpdatePackage worker_sdk c-dynamic-armv7a-clang_ndk16b-android "$SdkMobilePath/Plugins/Improbable/Core/Android/armv7" +UpdatePackage worker_sdk c-dynamic-arm64v8a-clang_ndk21-android "$SdkMobilePath/Plugins/Improbable/Core/Android/arm64" +UpdatePackage worker_sdk c-dynamic-armv7a-clang_ndk21-android "$SdkMobilePath/Plugins/Improbable/Core/Android/armv7" UpdatePackage worker_sdk csharp_cinterop_static "$SdkMobilePath/Plugins/Improbable/Sdk/iOS" diff --git a/workers/unity/Packages/io.improbable.gdk.tools/LocalLaunch.cs b/workers/unity/Packages/io.improbable.gdk.tools/LocalLaunch.cs index c3967cbdae..8c2772365e 100644 --- a/workers/unity/Packages/io.improbable.gdk.tools/LocalLaunch.cs +++ b/workers/unity/Packages/io.improbable.gdk.tools/LocalLaunch.cs @@ -12,6 +12,7 @@ namespace Improbable.Gdk.Tools public static class LocalLaunch { private const string InspectorUrl = "http://localhost:21000/inspector"; + private const string InspectorV2Url = "http://localhost:21000/inspector-v2"; private static readonly string DefaultLogFileName = Path.GetFullPath(Path.Combine(Common.SpatialProjectRootDir, "logs", "*unityclient.log")); @@ -61,6 +62,12 @@ private static void OpenInspector() Application.OpenURL(InspectorUrl); } + [MenuItem("SpatialOS/Open inspector V2 (Beta)", false, MenuPriorities.OpenInspectorV2)] + private static void OpenInspectorV2() + { + Application.OpenURL(InspectorV2Url); + } + public static void BuildConfig() { using (new ShowProgressBarScope("Building worker configs...")) diff --git a/workers/unity/Packages/io.improbable.gdk.tools/MenuPriorities.cs b/workers/unity/Packages/io.improbable.gdk.tools/MenuPriorities.cs index d064aabbf6..03dfa9681e 100644 --- a/workers/unity/Packages/io.improbable.gdk.tools/MenuPriorities.cs +++ b/workers/unity/Packages/io.improbable.gdk.tools/MenuPriorities.cs @@ -9,7 +9,8 @@ internal static class MenuPriorities internal const int LocalLaunch = 71; internal const int LaunchStandaloneClient = 72; internal const int OpenInspector = 74; - internal const int PortForwarding = 75; + internal const int OpenInspectorV2 = 75; + internal const int PortForwarding = 76; internal const int GdkToolsConfiguration = 201; internal const int GenerateDevAuthToken = 202;