Merge branch 'mad' of https://cgvrgit.ulno.net/kaljomad/edmunds_fanclub into mad

templatemap
Merge remote-tracking branch 'origin/bernhards' into jonas
2025-06-15 06:23:33 +03:00 · 2025-06-15 06:20:40 +03:00 · 2025-06-15 06:19:24 +03:00 · 2025-06-15 06:18:24 +03:00 · 2025-06-15 04:57:29 +03:00 · 2025-06-15 04:55:18 +03:00
18 changed files with 47 additions and 14 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/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/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
MSI\madli	c4ce414e2c	Merge branch 'mad' of https://cgvrgit.ulno.net/kaljomad/edmunds_fanclub into mad	2025-06-15 06:23:33 +03:00
MSI\madli	1fc282707c	templatemap	2025-06-15 06:20:40 +03:00
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
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