Merge branch 'main' into pr/275

icosa-foundation · Oct 10, 2022 · 72525b5 · 72525b5
2 parents bdb23c5 + 7ba4a28
commit 72525b5
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 10 deletions.
diff --git a/Assets/Scripts/Export/ExportUtils.cs b/Assets/Scripts/Export/ExportUtils.cs
@@ -300,7 +300,7 @@ public int GetIdFromInstanceId(UnityEngine.Object obj)
         public class SceneStatePayload
         {
             // Metadata.
-            public string generator = "Open Brush {0}.{1}";
+            public string generator = "Tilt Brush 23.3.841faedfb compatible (Actually: Open Brush {0}.{1})";
             public DeterministicIdGenerator idGenerator = new DeterministicIdGenerator();
 
             // Space Bases.

diff --git a/Assets/Scripts/Widgets/StencilWidget.cs b/Assets/Scripts/Widgets/StencilWidget.cs
@@ -319,8 +319,17 @@ public static void FromGuideIndex(Guides guide)
 
             foreach (var state in guide.States)
             {
-                StencilWidget stencil = Instantiate(
+                StencilWidget stencil;
+                try
+                {
+                    stencil = Instantiate(
                     WidgetManager.m_Instance.GetStencilPrefab(stencilType));
+                }
+                catch (ArgumentException e)
+                {
+                    Debug.LogException(e);
+                    return;
+                }
 
                 stencil.m_SkipIntroAnim = true;
                 stencil.transform.parent = App.Instance.m_CanvasTransform;

diff --git a/Assets/XR/Settings/Open XR Package Settings.asset b/Assets/XR/Settings/Open XR Package Settings.asset
@@ -292,11 +292,33 @@ MonoBehaviour:
   - {fileID: 5082403655935391592}
   - {fileID: -4431914812882349843}
   - {fileID: -1562417761177608366}
+  - {fileID: -568313750252970699}
   - {fileID: -238312934105289492}
   - {fileID: -3768601675236611697}
   - {fileID: 4073621059260807014}
   m_renderMode: 0
   m_depthSubmissionMode: 1
+--- !u!114 &-568313750252970699
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7de993716e042c6499d0c18eed3a773c, type: 3}
+  m_Name: MockRuntime Android
+  m_EditorClassIdentifier: 
+  m_enabled: 0
+  nameUi: Mock Runtime
+  version: 0.0.2
+  featureIdInternal: com.unity.openxr.feature.mockruntime
+  openxrExtensionStrings: XR_UNITY_null_gfx XR_UNITY_android_present
+  company: Unity
+  priority: 0
+  required: 0
+  ignoreValidationErrors: 0
 --- !u!114 &-238312934105289492
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -453,7 +475,7 @@ MonoBehaviour:
   nameUi: Mock Runtime
   version: 0.0.2
   featureIdInternal: com.unity.openxr.feature.mockruntime
-  openxrExtensionStrings: XR_UNITY_null_gfx
+  openxrExtensionStrings: XR_UNITY_null_gfx XR_UNITY_android_present
   company: Unity
   priority: 0
   required: 0

diff --git a/Packages/manifest.json b/Packages/manifest.json
@@ -14,11 +14,11 @@
     "com.unity.textmeshpro": "3.0.6",
     "com.unity.timeline": "1.6.4",
     "com.unity.ugui": "1.0.0",
-    "com.unity.xr.core-utils": "2.0.0",
+    "com.unity.xr.core-utils": "2.1.0",
     "com.unity.xr.management": "4.2.1",
-    "com.unity.xr.oculus": "3.0.2",
-    "com.unity.xr.openxr": "1.5.1",
-    "com.unity.xr.picoxr": "file:D:/01Pico/PICO Unity Integration SDK v211",
+    "com.unity.xr.oculus": "3.0.2", 
+    "com.unity.xr.picoxr": "2.1.1",
+    "com.unity.xr.openxr": "1.5.3",
     "org.nuget.google.apis": "1.57.0",
     "org.nuget.google.apis.auth": "1.57.0",
     "org.nuget.google.apis.core": "1.57.0",

diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
@@ -140,7 +140,7 @@
       }
     },
     "com.unity.xr.core-utils": {
-      "version": "2.0.0",
+      "version": "2.1.0",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -196,13 +196,13 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.xr.openxr": {
-      "version": "1.5.1",
+      "version": "1.5.3",
       "depth": 0,
       "source": "registry",
       "dependencies": {
         "com.unity.xr.management": "4.0.1",
         "com.unity.xr.legacyinputhelpers": "2.1.2",
-        "com.unity.inputsystem": "1.4.1"
+        "com.unity.inputsystem": "1.4.2"
       },
       "url": "https://packages.unity.com"
     },