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

2025-06-14 22:38:15 +03:00
parent afa83b5fdd 0b913431e6
commit 30bd771e75
17 changed files with 47 additions and 2 deletions
--- a/Content/VRTemplate/Maps/VRTemplateMap.umap
+++ b/Content/VRTemplate/Maps/VRTemplateMap.umap
--- a/Content/WoodManequin/WoodManequin.uasset
+++ b/Content/WoodManequin/WoodManequin.uasset
--- a/Content/WoodManequin/WoodManequin_PhysicsAsset.uasset
+++ b/Content/WoodManequin/WoodManequin_PhysicsAsset.uasset
--- a/Content/WoodManequin/WoodManequin_Poses_Sequence.uasset
+++ b/Content/WoodManequin/WoodManequin_Poses_Sequence.uasset
--- a/Content/WoodManequin/WoodManequin_Skeleton.uasset
+++ b/Content/WoodManequin/WoodManequin_Skeleton.uasset
--- a/Content/WoodManequin/lay_figure_BaseColor_2K.uasset
+++ b/Content/WoodManequin/lay_figure_BaseColor_2K.uasset
--- a/Content/WoodManequin/lay_figure_Normal_2K.uasset
+++ b/Content/WoodManequin/lay_figure_Normal_2K.uasset
--- a/Content/WoodManequin/lay_figure_Roughness_2K.uasset
+++ b/Content/WoodManequin/lay_figure_Roughness_2K.uasset
--- a/Content/WoodManequin/lay_figure_material.uasset
+++ b/Content/WoodManequin/lay_figure_material.uasset
--- a/Content/Wood_Manequin/WoodManequin.fbx
+++ b/Content/Wood_Manequin/WoodManequin.fbx
--- a/Content/Wood_Manequin/WoodManequinPoses.xlsx
+++ b/Content/Wood_Manequin/WoodManequinPoses.xlsx
--- a/Content/Wood_Manequin/WoodManequin_Poses_Sequence.fbx
+++ b/Content/Wood_Manequin/WoodManequin_Poses_Sequence.fbx
--- a/Content/Wood_Manequin/wooden-mannequin-lay-figure-rigged/textures/lay_figure_BaseColor_2K.png
+++ b/Content/Wood_Manequin/wooden-mannequin-lay-figure-rigged/textures/lay_figure_BaseColor_2K.png
--- a/Content/Wood_Manequin/wooden-mannequin-lay-figure-rigged/textures/lay_figure_Emissive_4K.png
+++ b/Content/Wood_Manequin/wooden-mannequin-lay-figure-rigged/textures/lay_figure_Emissive_4K.png
--- a/Content/Wood_Manequin/wooden-mannequin-lay-figure-rigged/textures/lay_figure_Metallic_4K.png
+++ b/Content/Wood_Manequin/wooden-mannequin-lay-figure-rigged/textures/lay_figure_Metallic_4K.png
--- a/Content/Wood_Manequin/wooden-mannequin-lay-figure-rigged/textures/lay_figure_Normal_2K.png
+++ b/Content/Wood_Manequin/wooden-mannequin-lay-figure-rigged/textures/lay_figure_Normal_2K.png
--- a/Content/Wood_Manequin/wooden-mannequin-lay-figure-rigged/textures/lay_figure_Roughness_4K.png
+++ b/Content/Wood_Manequin/wooden-mannequin-lay-figure-rigged/textures/lay_figure_Roughness_4K.png