Merge remote-tracking branch 'origin/main' into feature/plugin-scripting

# Conflicts: # Assets/Scripts/Tools/FreePaintTool.cs
icosa-foundation · Jan 13, 2025 · 8ca807d · 8ca807d
2 parents f66ec1b + 7452de9
commit 8ca807d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/Assets/QualityLevels.asset b/Assets/QualityLevels.asset
@@ -29,7 +29,7 @@ MonoBehaviour:
     m_GpuLevel: 4
     m_FixedFoveationLevel: 0
   - m_Bloom: 1
-    m_Hdr: 0
+    m_Hdr: 1
     m_Fxaa: 1
     m_MsaaLevel: 1
     m_MaxLod: 99999999

diff --git a/Assets/Scripts/Sharing/DriveAccess.cs b/Assets/Scripts/Sharing/DriveAccess.cs
@@ -120,7 +120,15 @@ private static string GetDeviceId()
                     Debug.LogError("Host id not implemented for iOS");
                     return "iOS-unknown";
                 default:
-                    return GetPcId();
+                    try
+                    {
+                        return GetPcId();
+                    }
+                    catch (Exception e)
+                    {
+                        // We suspect wmic.xe can cause an exception on some systems, so we catch it here.
+                        return "PC-unknown";
+                    }
             }
         }
 

diff --git a/Assets/Scripts/Tools/FreePaintTool.cs b/Assets/Scripts/Tools/FreePaintTool.cs
@@ -238,7 +238,7 @@ void PositionPointer()
         {
             // Discard the pointer if the controller is exactly zero
             // as it probably indicates the controller tracking stalled this frame
-            // TODO: is there a better solution?
+            // TODO:Mikesky: See if can be done at input level
             if (InputManager.m_Instance.GetControllerBehavior(InputManager.ControllerName.Brush).transform.position == Vector3.zero)
             {
                 Debug.LogError($"Controller Glitch!");

diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset
@@ -88,7 +88,7 @@ QualitySettings:
     shadows: 1
     shadowResolution: 2
     shadowProjection: 1
-    shadowCascades: 1
+    shadowCascades: 2
     shadowDistance: 30
     shadowNearPlaneOffset: 2
     shadowCascade2Split: 0.33333334