Make death screens behave like before, update unity project (#524)

* Make death screens behave like before, update unity project * Bump version for release
Raicuparta · Sep 18, 2022 · 00f5e45 · 00f5e45
1 parent a8b49cc
commit 00f5e45
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 44 deletions.
diff --git a/NomaiVR/NomaiVR.cs b/NomaiVR/NomaiVR.cs
@@ -66,11 +66,6 @@ internal static void ApplyMod()
             new VirtualKeyboard();
             new Menus();
             new FixProbeCannonVisibility();
-
-            //Load UnityExplorer if enabled
-#if UNITYEXPLORER
-                UnityExplorer.ExplorerStandalone.CreateInstance();
-#endif
         }
 
         private static void InitSteamVR()

diff --git a/NomaiVR/NomaiVR.csproj b/NomaiVR/NomaiVR.csproj
@@ -57,9 +57,6 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="UnityExplorer.STANDALONE.Mono">
-      <HintPath>$(OwmlDir)\$(ModDir)\UnityExplorer.STANDALONE.Mono.dll</HintPath>
-    </Reference>
     <Reference Include="Valve.Newtonsoft.Json">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>$(ProjectDir)\..\Unity\Build\OuterWildsVR_Data\Managed\Valve.Newtonsoft.Json.dll</HintPath>

diff --git a/NomaiVR/UI/Menus.cs b/NomaiVR/UI/Menus.cs
@@ -243,34 +243,18 @@ private static void AdjustScaler(Canvas canvas)
                 }
             }
 
-            // Mod config buttons generated by OWML get broken,
-            // this workaround fixes their position;
-            private static void AdjustModConfigButtons(Canvas canvas)
-            {
-                var selectables = canvas.GetComponentsInChildren<TooltipDisplay>(true);
-                foreach (var selectable in selectables)
-                {
-                    selectable.transform.localPosition = new Vector3(851.5f, -35f, 0);
-                    selectable.transform.localRotation = Quaternion.identity;
-                }
-            }
-
             private bool IsDeathTextCanvas(Canvas canvas)
             {
-                return canvas.name == "Canvas_Text";
+                return canvas.name == "Canvas_Text"
+                    || canvas.name == "Canvas_GameOver"
+                    || canvas.name == "Canvas_EchoesOver";
             }
 
             private bool IsIgnoredCanvas(Canvas canvas)
             {
                 return ignoredCanvases.Contains(canvas.name);
             }
 
-            private bool IsOwmlModConfigMenuCanvas(Canvas canvas)
-            {
-                // Hack! If OWML ever changes this name, this check needs to be fixed.
-                return canvas.name == "KeyboardRebindingCanvas(Clone)";
-            }
-
             private void SetUpDeathTextCanvas(Canvas canvas)
             {
                 canvas.renderMode = RenderMode.ScreenSpaceCamera;
@@ -312,11 +296,6 @@ private void ScreenCanvasesToWorld()
                     {
                         AddFollowTarget(canvas);
                     }
-
-                    if (isPatched && IsOwmlModConfigMenuCanvas(canvas))
-                    {
-                        AdjustModConfigButtons(canvas);
-                    }
                 }
             }
 

diff --git a/NomaiVR/manifest.json b/NomaiVR/manifest.json
@@ -8,7 +8,7 @@
     "title": "Before playing NomaiVR, some information:",
     "body": "- Click the NomaiVR readme button in the Mod Manager for information about troubleshooting, requirements, performance, how to uninstall, etc.\n\n- Some VR controllers will have missing icons. Message us if you want to help us add icons for these devices.\n\n- If you have the game on Steam:\n--- Right-click Outer Wilds on your Steam library\n--- Select 'Properties...'\n--- Disable 'Use Desktop Game Theatre.'"
   },
-  "version": "2.8.2",
+  "version": "2.8.4",
   "owmlVersion": "2.3.0",
   "requireVR": true
 }
diff --git a/Unity/Assets/StreamingAssets/StreamingAssets b/Unity/Assets/StreamingAssets/StreamingAssets
diff --git a/Unity/Assets/StreamingAssets/StreamingAssets.manifest b/Unity/Assets/StreamingAssets/StreamingAssets.manifest
@@ -1,20 +1,20 @@
 ManifestFileVersion: 0
-CRC: 2080010098
+CRC: 3565622252
 AssetBundleManifest:
   AssetBundleInfos:
     Info_0:
       Name: vrbindings-textures
       Dependencies: {}
     Info_1:
-      Name: autopilot-button
+      Name: cockpit-buttons
       Dependencies: {}
     Info_2:
+      Name: autopilot-button
+      Dependencies: {}
+    Info_3:
       Name: handheld-buttons
       Dependencies:
         Dependency_0: cockpit-buttons
-    Info_3:
-      Name: cockpit-buttons
-      Dependencies: {}
     Info_4:
       Name: steamvr-shaders
       Dependencies: {}
diff --git a/Unity/Assets/StreamingAssets/steamvr-shaders b/Unity/Assets/StreamingAssets/steamvr-shaders
diff --git a/Unity/Assets/StreamingAssets/steamvr-shaders.manifest b/Unity/Assets/StreamingAssets/steamvr-shaders.manifest
@@ -1,9 +1,9 @@
 ManifestFileVersion: 0
-CRC: 1671130502
+CRC: 330592053
 Hashes:
   AssetFileHash:
     serializedVersion: 2
-    Hash: 081785b8d370b2609b9bfbf11c413c69
+    Hash: ee24843b5bbba524ce8475deff51410d
   TypeTreeHash:
     serializedVersion: 2
     Hash: 55d48f4ad9c3b13330b9eb5ee5686477
@@ -19,7 +19,6 @@ Assets:
 - Assets/Shaders/SimulationCamera/StereoBlitSimulationMask.shader
 - Assets/Shaders/MindProjectionFix.shader
 - Assets/SteamVR/Resources/SteamVR_Fade_WorldSpace.shader
-- Assets/Shaders/SSSR/stochasticSSR.shader
 - Assets/SteamVR/Resources/SteamVR_SphericalProjection.shader
 - Assets/SteamVR/Resources/SteamVR_AlphaOut.shader
 - Assets/SteamVR/Resources/SteamVR_ColorOut.shader

diff --git a/Unity/Assets/StreamingAssets/vrbindings-textures.manifest b/Unity/Assets/StreamingAssets/vrbindings-textures.manifest
@@ -3,7 +3,7 @@ CRC: 1405974999
 Hashes:
   AssetFileHash:
     serializedVersion: 2
-    Hash: 1c88a4bc7569dcc4716d2843d0f0b904
+    Hash: 4505fa967587e0c3cf752223101289a6
   TypeTreeHash:
     serializedVersion: 2
     Hash: 7859cd501ea75098bcf7e53f1b477c26

diff --git a/Unity/ProjectSettings/ProjectVersion.txt b/Unity/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2019.4.39f1
-m_EditorVersionWithRevision: 2019.4.39f1 (78d14dfa024b)
+m_EditorVersion: 2019.4.27f1
+m_EditorVersionWithRevision: 2019.4.27f1 (23dc10685eb4)