Merge branch 'jonas' into mad

Merge branch 'bernhards' into jonas
Merge branch 'dens' of https://cgvrgit.ulno.net/kaljomad/edmunds_fanclub into bernhards
2025-06-15 00:42:10 +03:00 · 2025-06-15 00:31:30 +03:00 · 2025-06-14 22:38:15 +03:00 · 2025-06-14 22:06:14 +03:00
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
Author	SHA1	Message	Date
Jonas	95ac2950d3	Merge branch 'jonas' into mad	2025-06-15 00:42:10 +03:00
Jonas	eb7053729e	Merge branch 'bernhards' into jonas	2025-06-15 00:31:30 +03:00
Bmo	30bd771e75	Merge branch 'dens' of https://cgvrgit.ulno.net/kaljomad/edmunds_fanclub into bernhards	2025-06-14 22:38:15 +03:00
Bmo	afa83b5fdd	Lights uhh stuff	2025-06-14 22:06:14 +03:00