Merge branch '1e3de80' into doolysbranch

BasisVR · Feb 25, 2025 · 6b9d7c1 · 6b9d7c1
2 parents b9a7ff4 + f79a44d
commit 6b9d7c1
Show file tree

Hide file tree

Showing 77 changed files with 4,103 additions and 4,239 deletions.
diff --git a/Basis Server/BasisNetworkCore/Serializable/ResourceManagementMessage.cs b/Basis Server/BasisNetworkCore/Serializable/ResourceManagementMessage.cs
@@ -33,6 +33,11 @@ public struct LocalLoadResource
         public float ScaleZ;
 
         public bool Persist;
+        /// <summary>
+        /// this is used to state if the scale should be set or
+        /// just use whatever scale it thinks it is.
+        /// </summary>
+        public bool ModifyScale;
         //will never remove this item from the server,
         //if off when player count on server is zero it will be removed.
         public void Deserialize(NetDataReader Writer)
@@ -44,6 +49,7 @@ public void Deserialize(NetDataReader Writer)
             BundleURL = Writer.GetString();
             IsLocalLoad = Writer.GetBool();
             Persist = Writer.GetBool();
+            ModifyScale = Writer.GetBool();
             if (Mode == 0)
             {
                 PositionX = Writer.GetFloat();
@@ -69,6 +75,7 @@ public void Serialize(NetDataWriter Writer)
             Writer.Put(BundleURL);
             Writer.Put(IsLocalLoad);
             Writer.Put(Persist);
+            Writer.Put(ModifyScale);
             if (Mode == 0)
             {
                 Writer.Put(PositionX);

diff --git a/Basis Server/BasisNetworkServer/BasisNetworking/InitalData/BasisLoadableConfiguration.cs b/Basis Server/BasisNetworkServer/BasisNetworking/InitalData/BasisLoadableConfiguration.cs
@@ -30,7 +30,7 @@ public class BasisLoadableConfiguration
         public float ScaleZ = 1f;
 
         public bool Persist = false;
-
+        public bool ModifyScale;
         public static BasisLoadableConfiguration[] LoadAllFromFolder(string folderPath)
         {
             if (!Directory.Exists(folderPath))

diff --git a/Basis Server/BasisNetworkServer/BasisNetworking/InitalData/BasisLoadableLoader.cs b/Basis Server/BasisNetworkServer/BasisNetworking/InitalData/BasisLoadableLoader.cs
@@ -64,7 +64,8 @@ public static LocalLoadResource FromBasisLoadableConfiguration(BasisLoadableConf
                 ScaleX = config.ScaleX,
                 ScaleY = config.ScaleY,
                 ScaleZ = config.ScaleZ,
-                Persist = config.Persist
+                Persist = config.Persist,
+                 ModifyScale = config.ModifyScale
             };
         }
         public const string exampleXml = @"<BasisLoadableConfiguration>

diff --git a/Basis/Assets/AddressableAssetsData/AddressableAssetSettings.asset b/Basis/Assets/AddressableAssetsData/AddressableAssetSettings.asset
@@ -15,7 +15,7 @@ MonoBehaviour:
   m_DefaultGroup: 37c75a6cf72db324eb01200602299fc8
   m_currentHash:
     serializedVersion: 2
-    Hash: 920aad7d21db81c2fc8af62e86b03f62
+    Hash: 00000000000000000000000000000000
   m_OptimizeCatalogSize: 0
   m_BuildRemoteCatalog: 0
   m_CatalogRequestsTimeout: 0

diff --git a/Basis/Assets/AddressableAssetsData/AssetGroups/Basis Foundation Assets.asset b/Basis/Assets/AddressableAssetsData/AssetGroups/Basis Foundation Assets.asset
@@ -211,7 +211,7 @@ MonoBehaviour:
     m_SerializedLabels: []
     FlaggedDuringContentUpdateRestriction: 0
   - m_GUID: c92fd7b20eb8eaf4eb4a6e236e4ac620
-    m_Address: Assets/Prefabs/Loadins/Virtual Keyboard.prefab
+    m_Address: Virtual Keyboard
     m_ReadOnly: 0
     m_SerializedLabels: []
     FlaggedDuringContentUpdateRestriction: 0

diff --git a/Basis/Assets/Basis/Settings/InputActions/InputAction.inputactions b/Basis/Assets/Basis/Settings/InputActions/InputAction.inputactions
@@ -342,6 +342,17 @@
                     "isComposite": false,
                     "isPartOfComposite": false
                 },
+                {
+                    "name": "",
+                    "id": "d00b0952-966b-4182-930e-abd4b219cdf8",
+                    "path": "<Gamepad>/buttonSouth",
+                    "interactions": "",
+                    "processors": "",
+                    "groups": "",
+                    "action": "Jump",
+                    "isComposite": false,
+                    "isPartOfComposite": false
+                },
                 {
                     "name": "",
                     "id": "f2e78f9f-6b38-4981-9d67-a04d8dc17a76",
@@ -386,6 +397,17 @@
                     "isComposite": false,
                     "isPartOfComposite": false
                 },
+                {
+                    "name": "",
+                    "id": "6e4ca21b-30ca-4e5e-be2a-226b643c368f",
+                    "path": "<Gamepad>/start",
+                    "interactions": "",
+                    "processors": "",
+                    "groups": "",
+                    "action": "Escape",
+                    "isComposite": false,
+                    "isPartOfComposite": false
+                },
                 {
                     "name": "",
                     "id": "439b6574-6177-4be8-a26a-799ae0e364e5",

diff --git a/Basis/Assets/Basis/Settings/Quality Settiings/Modified - Desktop.asset b/Basis/Assets/Basis/Settings/Quality Settiings/Modified - Desktop.asset
@@ -19,14 +19,14 @@ MonoBehaviour:
   m_RendererDataList:
   - {fileID: 11400000, guid: c40be3174f62c4acf8c1216858c64956, type: 2}
   m_DefaultRendererIndex: 0
-  m_RequireDepthTexture: 0
-  m_RequireOpaqueTexture: 0
+  m_RequireDepthTexture: 1
+  m_RequireOpaqueTexture: 1
   m_OpaqueDownsampling: 1
   m_SupportsTerrainHoles: 0
-  m_SupportsHDR: 1
-  m_HDRColorBufferPrecision: 1
+  m_SupportsHDR: 0
+  m_HDRColorBufferPrecision: 0
   m_MSAA: 1
-  m_RenderScale: 1.0486807
+  m_RenderScale: 1.041047
   m_UpscalingFilter: 0
   m_FsrOverrideSharpness: 0
   m_FsrSharpness: 0.92
@@ -43,17 +43,17 @@ MonoBehaviour:
   m_ProbeVolumeSHBands: 1
   m_MainLightRenderingMode: 1
   m_MainLightShadowsSupported: 1
-  m_MainLightShadowmapResolution: 8192
+  m_MainLightShadowmapResolution: 256
   m_AdditionalLightsRenderingMode: 1
-  m_AdditionalLightsPerObjectLimit: 8
+  m_AdditionalLightsPerObjectLimit: 0
   m_AdditionalLightShadowsSupported: 1
-  m_AdditionalLightsShadowmapResolution: 8192
+  m_AdditionalLightsShadowmapResolution: 256
   m_AdditionalLightsShadowResolutionTierLow: 128
   m_AdditionalLightsShadowResolutionTierMedium: 256
   m_AdditionalLightsShadowResolutionTierHigh: 512
   m_ReflectionProbeBlending: 1
   m_ReflectionProbeBoxProjection: 1
-  m_ShadowDistance: 150
+  m_ShadowDistance: 5
   m_ShadowCascadeCount: 4
   m_Cascade2Split: 0.12
   m_Cascade3Split: {x: 0.12, y: 0.5}
@@ -108,7 +108,7 @@ MonoBehaviour:
   m_PrefilteringModeScreenSpaceOcclusion: 0
   m_PrefilterDebugKeywords: 1
   m_PrefilterWriteRenderingLayers: 0
-  m_PrefilterHDROutput: 0
+  m_PrefilterHDROutput: 1
   m_PrefilterAlphaOutput: 1
   m_PrefilterSSAODepthNormals: 1
   m_PrefilterSSAOSourceDepthLow: 1

diff --git a/...ssets/Basis/Settings/Unity Rendering Defaults/UniversalRenderPipelineGlobalSettings.asset b/...ssets/Basis/Settings/Unity Rendering Defaults/UniversalRenderPipelineGlobalSettings.asset
@@ -36,25 +36,25 @@ MonoBehaviour:
       - rid: 2858994164428701698
       - rid: 2858994164428701699
       - rid: 2858994164428701700
-      - rid: 6147443510823354487
+      - rid: 6147443694684864612
       - rid: 2858994164428701702
       - rid: 2858994164428701703
-      - rid: 6147443510823354488
-      - rid: 6147443510823354489
+      - rid: 6147443694684864613
+      - rid: 6147443694684864614
       - rid: 2858994164428701706
-      - rid: 6147443510823354490
+      - rid: 6147443694684864615
       - rid: 2858994164428701708
       - rid: 6147443362521677920
-      - rid: 6147443510823354491
-      - rid: 6147443510823354492
-      - rid: 6282195191323426912
-      - rid: 6147443510823354493
-      - rid: 6147443510823354494
-      - rid: 6282195191323426915
+      - rid: 6147443694684864616
+      - rid: 6147443694684864617
+      - rid: 6147443694684864618
+      - rid: 6147443694684864619
+      - rid: 6147443694684864620
+      - rid: 6147443694684864621
       - rid: 2858994164428701716
       - rid: 2858994164428701717
       - rid: 2858994164428701718
-      - rid: 6147443510823354495
+      - rid: 6147443694684864622
     m_RuntimeSettings:
       m_List:
       - rid: 2858994164428701698
@@ -119,6 +119,9 @@ MonoBehaviour:
         m_CoreBlitPS: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3}
         m_CoreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b, type: 3}
         m_SamplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3}
+        m_TerrainDetailLit: {fileID: 4800000, guid: f6783ab646d374f94b199774402a5144, type: 3}
+        m_TerrainDetailGrassBillboard: {fileID: 4800000, guid: 29868e73b638e48ca99a19ea58c48d90, type: 3}
+        m_TerrainDetailGrass: {fileID: 4800000, guid: e507fdfead5ca47e8b9a768b51c291a1, type: 3}
     - rid: 2858994164428701703
       type: {class: URPDefaultVolumeProfileSettings, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
       data:
@@ -168,7 +171,7 @@ MonoBehaviour:
         m_OcclusionCullingDebugKernels: {fileID: 7200000, guid: b23e766bcf50ca4438ef186b174557df, type: 3}
         m_DebugOcclusionTestPS: {fileID: 4800000, guid: d3f0849180c2d0944bc71060693df100, type: 3}
         m_DebugOccluderPS: {fileID: 4800000, guid: b3c92426a88625841ab15ca6a7917248, type: 3}
-    - rid: 6147443510823354487
+    - rid: 6147443694684864612
       type: {class: Renderer2DResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
       data:
         m_Version: 0
@@ -183,14 +186,14 @@ MonoBehaviour:
         m_DefaultLitMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
         m_DefaultUnlitMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
         m_DefaultMaskMaterial: {fileID: 2100000, guid: 15d0c3709176029428a0da2f8cecf0b5, type: 2}
-    - rid: 6147443510823354488
+    - rid: 6147443694684864613
       type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
       data:
         m_Version: 0
         m_StripUnusedPostProcessingVariants: 1
         m_StripUnusedVariants: 1
         m_StripScreenCoordOverrideVariants: 1
-    - rid: 6147443510823354489
+    - rid: 6147443694684864614
       type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
       data:
         m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
@@ -199,7 +202,7 @@ MonoBehaviour:
         m_DefaultTerrainMaterial: {fileID: 2100000, guid: 594ea882c5a793440b60ff72d896021e, type: 2}
         m_DefaultDecalMaterial: {fileID: 2100000, guid: 31d0dcc6f2dd4e4408d18036a2c93862, type: 2}
         m_DefaultSpriteMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
-    - rid: 6147443510823354490
+    - rid: 6147443694684864615
       type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
       data:
         m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3}
@@ -211,13 +214,13 @@ MonoBehaviour:
         m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3}
         m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3}
         m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3}
-    - rid: 6147443510823354491
+    - rid: 6147443694684864616
       type: {class: STP/RuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
       data:
         m_setupCS: {fileID: 7200000, guid: 33be2e9a5506b2843bdb2bdff9cad5e1, type: 3}
         m_preTaaCS: {fileID: 7200000, guid: a679dba8ec4d9ce45884a270b0e22dda, type: 3}
         m_taaCS: {fileID: 7200000, guid: 3923900e2b41b5e47bc25bfdcbcdc9e6, type: 3}
-    - rid: 6147443510823354492
+    - rid: 6147443694684864617
       type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
       data:
         m_Version: 1
@@ -230,7 +233,12 @@ MonoBehaviour:
         skyOcclusionRT: {fileID: -5126288278712620388, guid: 5a2a534753fbdb44e96c3c78b5a6999d, type: 3}
         renderingLayerCS: {fileID: -6772857160820960102, guid: 94a070d33e408384bafc1dea4a565df9, type: 3}
         renderingLayerRT: {fileID: -5126288278712620388, guid: 94a070d33e408384bafc1dea4a565df9, type: 3}
-    - rid: 6147443510823354493
+    - rid: 6147443694684864618
+      type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
+      data:
+        m_Version: 1
+        m_ProbeVolumeDisableStreamingAssets: 1
+    - rid: 6147443694684864619
       type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
       data:
         m_Version: 1
@@ -240,26 +248,21 @@ MonoBehaviour:
         probeVolumeOffsetDebugShader: {fileID: 4800000, guid: db8bd7436dc2c5f4c92655307d198381, type: 3}
         probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 20be25aac4e22ee49a7db76fb3df6de2, type: 3}
         numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a, type: 3}
-    - rid: 6147443510823354494
+    - rid: 6147443694684864620
       type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
       data:
         m_version: 0
         m_IncludeReferencedInScenes: 0
         m_IncludeAssetsByLabel: 0
         m_LabelToInclude: 
-    - rid: 6147443510823354495
-      type: {class: UniversalRenderPipelineEditorAssets, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
-      data:
-        m_DefaultSettingsVolumeProfile: {fileID: 11400000, guid: eda47df5b85f4f249abf7abd73db2cb2, type: 2}
-    - rid: 6282195191323426912
-      type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
-      data:
-        m_Version: 1
-        m_ProbeVolumeDisableStreamingAssets: 1
-    - rid: 6282195191323426915
+    - rid: 6147443694684864621
       type: {class: ProbeVolumeRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
       data:
         m_Version: 1
         probeVolumeBlendStatesCS: {fileID: 7200000, guid: a3f7b8c99de28a94684cb1daebeccf5d, type: 3}
         probeVolumeUploadDataCS: {fileID: 7200000, guid: 0951de5992461754fa73650732c4954c, type: 3}
         probeVolumeUploadDataL2CS: {fileID: 7200000, guid: 6196f34ed825db14b81fb3eb0ea8d931, type: 3}
+    - rid: 6147443694684864622
+      type: {class: UniversalRenderPipelineEditorAssets, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
+      data:
+        m_DefaultSettingsVolumeProfile: {fileID: 11400000, guid: eda47df5b85f4f249abf7abd73db2cb2, type: 2}
diff --git a/Basis/Assets/StreamingAssets/SteamVR/bindings_knuckles.json b/Basis/Assets/StreamingAssets/SteamVR/bindings_knuckles.json
@@ -86,9 +86,6 @@
                "inputs" : {
                   "pull" : {
                      "output" : "/actions/default/in/handtrigger"
-                  },
-                  "touch" : {
-                     "output" : "/actions/default/in/grip"
                   }
                },
                "mode" : "trigger",
@@ -137,9 +134,6 @@
                "inputs" : {
                   "pull" : {
                      "output" : "/actions/default/in/handtrigger"
-                  },
-                  "touch" : {
-                     "output" : "/actions/default/in/grip"
                   }
                },
                "mode" : "trigger",
@@ -186,6 +180,34 @@
                },
                "mode" : "trigger",
                "path" : "/user/hand/right/input/trigger"
+            },
+            {
+               "inputs" : {
+                  "grab" : {
+                     "output" : "/actions/default/in/grip"
+                  }
+               },
+               "mode" : "grab",
+               "parameters" : {
+                  "force_hold_threshold" : "0.15",
+                  "value_hold_threshold" : "1.1",
+                  "value_release_threshold" : "0.65"
+               },
+               "path" : "/user/hand/left/input/grip"
+            },
+            {
+               "inputs" : {
+                  "grab" : {
+                     "output" : "/actions/default/in/grip"
+                  }
+               },
+               "mode" : "grab",
+               "parameters" : {
+                  "force_hold_threshold" : "0.15",
+                  "value_hold_threshold" : "1.1",
+                  "value_release_threshold" : "0.65"
+               },
+               "path" : "/user/hand/right/input/grip"
             }
          ]
       },