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
Wooden cart and barrel
2025-06-15 10:38:23 +03:00 · 2025-06-15 07:47:14 +03:00
12 changed files with 36 additions and 0 deletions
--- a/Content/SM_HandController.uasset
+++ b/Content/SM_HandController.uasset
--- 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