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
nomessages
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 · 2025-06-15 07:47:14 +03:00 · 2025-06-15 06:23:33 +03:00
23 changed files with 63 additions and 12 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_SelectionMenu.uasset
+++ b/Content/HandMenu/BP_SelectionMenu.uasset
--- a/Content/HandMenu/Items/BP_HandMenuTrash.uasset
+++ b/Content/HandMenu/Items/BP_HandMenuTrash.uasset
--- a/Content/HandMenu/Textures/sun-solid.uasset
+++ b/Content/HandMenu/Textures/sun-solid.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/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	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