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
28 changed files with 68 additions and 29 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_Mannequin.uasset
+++ b/Content/StageAssets/BP_Mannequin.uasset
--- a/Content/VRTemplate/Blueprints/GrabComponent.uasset
+++ b/Content/VRTemplate/Blueprints/GrabComponent.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
--- 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