Merge branch 'jonas' into mad

camera functionality
putting menu on left arm and let it spawn stuff
2025-06-14 17:46:35 +03:00 · 2025-06-14 17:45:08 +03:00 · 2025-06-14 17:43:14 +03:00 · 2025-06-14 16:13:44 +03:00
14 changed files with 34 additions and 16 deletions
--- a/Content/CineCameraActor_Blueprint_Blueprint.uasset
+++ b/Content/CineCameraActor_Blueprint_Blueprint.uasset
--- a/Content/HandMenu/BP_SelectionMenu.uasset
+++ b/Content/HandMenu/BP_SelectionMenu.uasset
--- a/Content/HandMenu/Items/BP_HandMenuItem.uasset
+++ b/Content/HandMenu/Items/BP_HandMenuItem.uasset
--- a/Content/StageAssets/BP_DummyAsset.uasset
+++ b/Content/StageAssets/BP_DummyAsset.uasset
--- a/Content/StageAssets/BP_DummyLight.uasset
+++ b/Content/StageAssets/BP_DummyLight.uasset
--- a/Content/StageAssets/aiStandardSurface3.uasset
+++ b/Content/StageAssets/aiStandardSurface3.uasset
--- a/Content/StageAssets/body.uasset
+++ b/Content/StageAssets/body.uasset
--- a/Content/StageAssets/dress.uasset
+++ b/Content/StageAssets/dress.uasset
--- a/Content/StageAssets/manican.uasset
+++ b/Content/StageAssets/manican.uasset
--- a/Content/VRTemplate/Blueprints/GrabComponent.uasset
+++ b/Content/VRTemplate/Blueprints/GrabComponent.uasset
--- a/Content/VRTemplate/Blueprints/Pistol.uasset
+++ b/Content/VRTemplate/Blueprints/Pistol.uasset
--- a/Content/VRTemplate/Blueprints/VRPawn.uasset
+++ b/Content/VRTemplate/Blueprints/VRPawn.uasset
--- a/Content/VRTemplate/Cameramaterial.uasset
+++ b/Content/VRTemplate/Cameramaterial.uasset
--- a/Content/VRTemplate/Maps/VRTemplateMap.umap
+++ b/Content/VRTemplate/Maps/VRTemplateMap.umap
Author	SHA1	Message	Date
Jonas	d5f67aa38f	Merge branch 'jonas' into mad	2025-06-14 17:46:35 +03:00
MSI\madli	fe34ba46a8	camera functionality	2025-06-14 17:45:08 +03:00
Jonas	5d1a9ae4df	putting menu on left arm and let it spawn stuff	2025-06-14 17:43:14 +03:00
MSI\madli	15e8a122e0	(j) fixing menu grab function	2025-06-14 16:13:44 +03:00