Merge branch 'jonas' into mad

2025-06-15 00:42:10 +03:00
parent 41d436df2a eb7053729e
commit 95ac2950d3
9 changed files with 23 additions and 8 deletions
--- a/Content/AdjustablePointLIght.uasset
+++ b/Content/AdjustablePointLIght.uasset
--- a/Content/AdjustableSpotLight.uasset
+++ b/Content/AdjustableSpotLight.uasset
--- a/Content/DomLightControlSphere.uasset
+++ b/Content/DomLightControlSphere.uasset
--- a/Content/Grid.uasset
+++ b/Content/Grid.uasset
--- a/Content/NewHapticFeedbackEffect_Curve.uasset
+++ b/Content/NewHapticFeedbackEffect_Curve.uasset
--- a/Content/VRTemplate/Blueprints/GrabComponent.uasset
+++ b/Content/VRTemplate/Blueprints/GrabComponent.uasset
--- a/Content/VRTemplate/Blueprints/GrabType.uasset
+++ b/Content/VRTemplate/Blueprints/GrabType.uasset
--- a/Content/VRTemplate/Haptics/GrabHapticEffect.uasset
+++ b/Content/VRTemplate/Haptics/GrabHapticEffect.uasset
--- a/Content/VRTemplate/Textures/T_Grid.uasset
+++ b/Content/VRTemplate/Textures/T_Grid.uasset