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

Browse Source

# 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

...

This commit is contained in:

MSI\madli

2025-06-15 10:38:23 +03:00

parent 49d562566c 24d2bd2a4b

commit 3270aa85e6

12 changed files with 36 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Content/SM_HandController.uasset

LFS

BIN

Binary file not shown.

Content/WoodManequin/Barrel/barrel_basecolor.uasset

LFS

BIN

Binary file not shown.

Content/WoodManequin/Barrel/barrel_metal.uasset

LFS

BIN

Binary file not shown.

Content/WoodManequin/Barrel/barrel_norm.uasset

LFS

BIN

Binary file not shown.

Content/WoodManequin/Barrel/barrel_rough.uasset

LFS

BIN

Binary file not shown.

Content/WoodManequin/Barrel/m_barrel_001.uasset

LFS

BIN

Binary file not shown.

Content/WoodManequin/Barrel/medieval_barrel.uasset

LFS

BIN

Binary file not shown.

Content/WoodManequin/Wooden_cart/Charette_DIFF.uasset

LFS

BIN

Binary file not shown.

Content/WoodManequin/Wooden_cart/Charette_NM.uasset

LFS

BIN

Binary file not shown.

Content/WoodManequin/Wooden_cart/Charette_ROUGH.uasset

LFS

BIN

Binary file not shown.

Content/WoodManequin/Wooden_cart/Wooden_Cart.uasset

LFS

BIN

Binary file not shown.

Content/WoodManequin/Wooden_cart/wire_140088225.uasset

LFS

BIN

Binary file not shown.