Merge remote-tracking branch 'origin/dens' into jonas

fixed model spawn pos, added light dummy
2025-06-14 22:16:59 +03:00 · 2025-06-14 20:09:26 +03:00 · 2025-06-14 20:02:05 +03:00 · 2025-06-14 19:34:13 +03:00 · 2025-06-14 18:38:18 +03:00 · 2025-06-14 18:37:35 +03:00
17 changed files with 42 additions and 18 deletions
--- a/Content/CineCameraActor_Blueprint_Blueprint.uasset
+++ b/Content/CineCameraActor_Blueprint_Blueprint.uasset
--- a/Content/HandMenu/BP_Menu_Hand_Modifier.uasset
+++ b/Content/HandMenu/BP_Menu_Hand_Modifier.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_Asset_Modifier.uasset
+++ b/Content/StageAssets/BP_Asset_Modifier.uasset
--- a/Content/StageAssets/BP_DummyAsset.uasset
+++ b/Content/StageAssets/BP_DummyAsset.uasset
--- a/Content/StageAssets/BP_DummyCamera.uasset
+++ b/Content/StageAssets/BP_DummyCamera.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	b2bec43012	Merge remote-tracking branch 'origin/dens' into jonas	2025-06-14 22:16:59 +03:00
Jonas	d5e3de7159	Merge remote-tracking branch 'origin/dens' into jonas	2025-06-14 20:09:26 +03:00
MSI\madli	1f6ec83f30	fixed model spawn pos, added light dummy	2025-06-14 20:02:05 +03:00
MSI\madli	e4db9ce59f	made the selectionmenu finally work like desired	2025-06-14 19:34:13 +03:00
Jonas	5d21e9cbc9	Merge branch 'mad' into jonas	2025-06-14 18:38:18 +03:00
MSI\madli	e52c47f721	some more on camera	2025-06-14 18:37:35 +03:00
Jonas	9b337f97d1	sync itemmenu onto hand	2025-06-14 18:30:16 +03:00
MSI\madli	09fbff1e5a	trying out hand menu	2025-06-14 18:15:16 +03:00
MSI\madli	71a8290648	made the left hand big again	2025-06-14 18:04:40 +03:00
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