last one

barrels and cart
Merge branch 'dens' of https://cgvrgit.ulno.net/kaljomad/edmunds_fanclub into mad
2025-06-15 14:24:09 +03:00 · 2025-06-15 10:44:18 +03:00 · 2025-06-15 10:38:23 +03:00 · 2025-06-15 10:33:24 +03:00 · 2025-06-15 10:30:44 +03:00 · 2025-06-15 09:16:13 +03:00
37 changed files with 102 additions and 18 deletions
--- a/Content/AreaAdjusterMaterial.uasset
+++ b/Content/AreaAdjusterMaterial.uasset
--- 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/sun-solid.uasset
+++ b/Content/HandMenu/Textures/sun-solid.uasset
--- a/Content/HandMenu/Textures/trash.uasset
+++ b/Content/HandMenu/Textures/trash.uasset
--- a/Content/SM_HandController.uasset
+++ b/Content/SM_HandController.uasset
--- a/Content/SceneMeshes/FirstOutput10MIL_u0_v0.uasset
+++ b/Content/SceneMeshes/FirstOutput10MIL_u0_v0.uasset
--- a/Content/SceneMeshes/Material_001.uasset
+++ b/Content/SceneMeshes/Material_001.uasset
--- a/Content/SceneMeshes/MeshRework.uasset
+++ b/Content/SceneMeshes/MeshRework.uasset
--- a/Content/SceneMeshes/onlyfortexturedeleteme_u0_v0_diffuse.uasset
+++ b/Content/SceneMeshes/onlyfortexturedeleteme_u0_v0_diffuse.uasset
--- a/Content/StageAssets/BP_Mannequin.uasset
+++ b/Content/StageAssets/BP_Mannequin.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/Barrel/barrel_basecolor.uasset
+++ b/Content/WoodManequin/Barrel/barrel_basecolor.uasset
--- a/Content/WoodManequin/Barrel/barrel_metal.uasset
+++ b/Content/WoodManequin/Barrel/barrel_metal.uasset
--- a/Content/WoodManequin/Barrel/barrel_norm.uasset
+++ b/Content/WoodManequin/Barrel/barrel_norm.uasset
--- a/Content/WoodManequin/Barrel/barrel_rough.uasset
+++ b/Content/WoodManequin/Barrel/barrel_rough.uasset
--- a/Content/WoodManequin/Barrel/m_barrel_001.uasset
+++ b/Content/WoodManequin/Barrel/m_barrel_001.uasset
--- a/Content/WoodManequin/Barrel/medieval_barrel.uasset
+++ b/Content/WoodManequin/Barrel/medieval_barrel.uasset
--- a/Content/WoodManequin/Wooden_cart/Charette_DIFF.uasset
+++ b/Content/WoodManequin/Wooden_cart/Charette_DIFF.uasset
--- a/Content/WoodManequin/Wooden_cart/Charette_NM.uasset
+++ b/Content/WoodManequin/Wooden_cart/Charette_NM.uasset
--- a/Content/WoodManequin/Wooden_cart/Charette_ROUGH.uasset
+++ b/Content/WoodManequin/Wooden_cart/Charette_ROUGH.uasset
--- a/Content/WoodManequin/Wooden_cart/Wooden_Cart.uasset
+++ b/Content/WoodManequin/Wooden_cart/Wooden_Cart.uasset
--- a/Content/WoodManequin/Wooden_cart/wire_140088225.uasset
+++ b/Content/WoodManequin/Wooden_cart/wire_140088225.uasset
Author	SHA1	Message	Date
MSI\madli	9fae5e9ee1	last one	2025-06-15 14:24:09 +03:00
MSI\madli	9e96a827d8	barrels and cart	2025-06-15 10:44:18 +03:00
MSI\madli	3270aa85e6	Merge branch 'dens' of https://cgvrgit.ulno.net/kaljomad/edmunds_fanclub into mad # Conflicts: # Content/CineCameraActor_Blueprint_Blueprint.uasset # Content/HandMenu/BP_Menu_Hand_Modifier.uasset # Content/HandMenu/BP_SelectionMenu.uasset # Content/HandMenu/Items/BP_HandMenuItem.uasset # Content/StageAssets/BP_Mannequin.uasset # Content/VRTemplate/Blueprints/GrabComponent.uasset # Content/VRTemplate/Blueprints/VRPawn.uasset # Content/VRTemplate/Cameramaterial.uasset # Content/VRTemplate/Maps/VRTemplateMap.umap	2025-06-15 10:38:23 +03:00
MSI\madli	49d562566c	nomessages	2025-06-15 10:33:24 +03:00
MSI\madli	fb4ec36350	better city material, better mannequin	2025-06-15 10:30:44 +03:00
MSI\madli	842d7a6b89	finally arrived in the city	2025-06-15 09:16:13 +03:00
Dens_Enrijs_Lakucs	24d2bd2a4b	Wooden cart and barrel	2025-06-15 07:47:14 +03:00
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