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

handmenu items
The directional light control sphere is now a proper gimbal. Courtesy of Asj, very epik!!!!1111
2025-06-15 06:19:24 +03:00 · 2025-06-15 06:18:24 +03:00 · 2025-06-15 05:42:09 +03:00 · 2025-06-15 05:21:04 +03:00 · 2025-06-15 05:01:05 +03:00 · 2025-06-15 04:57:29 +03:00
40 changed files with 102 additions and 33 deletions
--- a/Content/AdjustableSpotLight.uasset
+++ b/Content/AdjustableSpotLight.uasset
--- a/Content/AreaAdjusterMaterial.uasset
+++ b/Content/AreaAdjusterMaterial.uasset
--- a/Content/CineCameraActor_Blueprint_Blueprint.uasset
+++ b/Content/CineCameraActor_Blueprint_Blueprint.uasset
--- a/Content/DomLightControlSphere.uasset
+++ b/Content/DomLightControlSphere.uasset
--- a/Content/Grid.uasset
+++ b/Content/Grid.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/Base.uasset
+++ b/Content/HandMenu/Base.uasset
--- a/Content/HandMenu/Button.uasset
+++ b/Content/HandMenu/Button.uasset
--- a/Content/HandMenu/Items/BP_HandMenuItem.uasset
+++ b/Content/HandMenu/Items/BP_HandMenuItem.uasset
--- a/Content/HandMenu/Items/BP_HandMenuTrash.uasset
+++ b/Content/HandMenu/Items/BP_HandMenuTrash.uasset
--- a/Content/HandMenu/Meshes/Base1.uasset
+++ b/Content/HandMenu/Meshes/Base1.uasset
--- a/Content/HandMenu/Meshes/Button1.uasset
+++ b/Content/HandMenu/Meshes/Button1.uasset
--- a/Content/HandMenu/Meshes/Button2.uasset
+++ b/Content/HandMenu/Meshes/Button2.uasset
--- a/Content/HandMenu/Meshes/Button3.uasset
+++ b/Content/HandMenu/Meshes/Button3.uasset
--- a/Content/HandMenu/Meshes/Button4.uasset
+++ b/Content/HandMenu/Meshes/Button4.uasset
--- a/Content/HandMenu/Meshes/Button5.uasset
+++ b/Content/HandMenu/Meshes/Button5.uasset
--- a/Content/HandMenu/Meshes/Button6.uasset
+++ b/Content/HandMenu/Meshes/Button6.uasset
--- a/Content/HandMenu/Textures/trash.uasset
+++ b/Content/HandMenu/Textures/trash.uasset
--- a/Content/HandProximity.uasset
+++ b/Content/HandProximity.uasset
--- a/Content/ScanningLines.uasset
+++ b/Content/ScanningLines.uasset
--- a/Content/ScanningLinesForDomLightControlSphere.uasset
+++ b/Content/ScanningLinesForDomLightControlSphere.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/BP_Mannequin.uasset
+++ b/Content/StageAssets/BP_Mannequin.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/RT_camera.uasset
+++ b/Content/VRTemplate/Blueprints/RT_camera.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/MI_camera.uasset
+++ b/Content/VRTemplate/MI_camera.uasset
--- a/Content/VRTemplate/Maps/VRTemplateMap.umap
+++ b/Content/VRTemplate/Maps/VRTemplateMap.umap
--- a/Content/WoodManequin/WoodManequin_PhysicsAsset.uasset
+++ b/Content/WoodManequin/WoodManequin_PhysicsAsset.uasset
--- a/Content/WoodManequin/WoodManequin_Poses_Sequence.uasset
+++ b/Content/WoodManequin/WoodManequin_Poses_Sequence.uasset
Author	SHA1	Message	Date
Jonas	c2139fc425	Merge remote-tracking branch 'origin/bernhards' into jonas	2025-06-15 06:19:24 +03:00
MSI\madli	8262b9e65c	handmenu items	2025-06-15 06:18:24 +03:00
Bmo	ff1615d0fb	The directional light control sphere is now a proper gimbal. Courtesy of Asj, very epik!!!!1111	2025-06-15 05:42:09 +03:00
Bmo	1e5335b47e	Directional Light attaches to the control sphere now	2025-06-15 05:21:04 +03:00
Bmo	dfbc5024d8	Mannequin pose slider, light intensity slider, spot light material	2025-06-15 05:01:05 +03:00
Jonas	7e35ad5a61	adding new hand menu design, added trash func	2025-06-15 04:57:29 +03:00
Jonas	4511ef7aca	erge remote-tracking branch 'origin/mad' into jonas	2025-06-15 04:55:18 +03:00
MSI\madli	8b8d4dc8c6	goodnight	2025-06-15 04:42:30 +03:00
Bmo	49d5628b80	Merge branch 'mad' of https://cgvrgit.ulno.net/kaljomad/edmunds_fanclub into bernhards	2025-06-15 01:38:41 +03:00
Bmo	0aaae3bb3a	Fixed grabbed object sticking to the inital hand if grabbing with another hand	2025-06-15 01:37:34 +03:00
MSI\madli	e7bb931a43	spawned an actual light on menu instead of this blocky stuff	2025-06-15 01:27:08 +03:00
Bmo	9951674ae4	Merge branch 'mad' of https://cgvrgit.ulno.net/kaljomad/edmunds_fanclub into bernhards	2025-06-15 01:23:27 +03:00
MSI\madli	5415fa7079	fixed autograbbing and teleporting	2025-06-15 01:17:31 +03:00
Jonas	95ac2950d3	Merge branch 'jonas' into mad	2025-06-15 00:42:10 +03:00
MSI\madli	41d436df2a	nothing special	2025-06-15 00:39:34 +03:00
Jonas	eb7053729e	Merge branch 'bernhards' into jonas	2025-06-15 00:31:30 +03:00
MSI\madli	f96888d73a	Merge branch 'mad' of https://cgvrgit.ulno.net/kaljomad/edmunds_fanclub into mad	2025-06-14 23:58:18 +03:00
MSI\madli	09295f17e2	smol commit	2025-06-14 23:55:42 +03:00
Jonas	05562b8bab	Merge remote-tracking branch 'origin/mad' into jonas	2025-06-14 23:44:43 +03:00
Jonas	33e48fe9a7	added mannequin, editing hand menu	2025-06-14 23:43:32 +03:00
MSI\madli	0fdee0e537	camera sheenanigans (base of FOV)	2025-06-14 23:39:54 +03:00
MSI\madli	ceb085d1ee	different camerapicture	2025-06-14 22:58:13 +03:00
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