Merge branch 'master' of https://cgvrgit.ulno.net/l31tm0t1f/GalleryEnvironment into master

# Conflicts: # Content/VRTemplate/Maps/VRTemplateMap.umap # Content/VRTemplate/Maps/VRTemplateMap_BuiltData.uasset
2022-03-07 17:33:55 +02:00
parent c936cbdc02 734dd5f8e0
commit efa77c7dbb
70 changed files with 136 additions and 79 deletions
--- a/Content/FPWeapon/Mesh/M_Soul_TreeDead.uasset
+++ b/Content/FPWeapon/Mesh/M_Soul_TreeDead.uasset
--- a/Content/Helena_migrated/Environment/Materials/Functions/MF_FuzzyShading_JM.uasset
+++ b/Content/Helena_migrated/Environment/Materials/Functions/MF_FuzzyShading_JM.uasset
--- a/Content/Helena_migrated/Environment/Materials/Functions/MF_VertexBlend_JM.uasset
+++ b/Content/Helena_migrated/Environment/Materials/Functions/MF_VertexBlend_JM.uasset
--- a/Content/Helena_migrated/Environment/Materials/Functions/MF_Wetness.uasset
+++ b/Content/Helena_migrated/Environment/Materials/Functions/MF_Wetness.uasset
--- a/Content/Helena_migrated/Environment/Materials/MaterialLayers/MF_Solid_Color.uasset
+++ b/Content/Helena_migrated/Environment/Materials/MaterialLayers/MF_Solid_Color.uasset
--- a/Content/Helena_migrated/Environment/Materials/Nature/M_Soul_TreeDead.uasset
+++ b/Content/Helena_migrated/Environment/Materials/Nature/M_Soul_TreeDead.uasset
--- a/Content/Helena_migrated/Environment/Materials/Rocks/MF_Cave_Moss.uasset
+++ b/Content/Helena_migrated/Environment/Materials/Rocks/MF_Cave_Moss.uasset
--- a/Content/Helena_migrated/Environment/Materials/Rocks/MF_Cave_Rock01.uasset
+++ b/Content/Helena_migrated/Environment/Materials/Rocks/MF_Cave_Rock01.uasset
--- a/Content/Helena_migrated/Environment/Materials/Rocks/MF_Cave_Rock02.uasset
+++ b/Content/Helena_migrated/Environment/Materials/Rocks/MF_Cave_Rock02.uasset
--- a/Content/Helena_migrated/Environment/Materials/Rocks/MI_Cave_Rock_DemonStatue_Moss.uasset
+++ b/Content/Helena_migrated/Environment/Materials/Rocks/MI_Cave_Rock_DemonStatue_Moss.uasset
--- a/Content/Helena_migrated/Environment/Materials/Rocks/M_Cave_Rock_MASTER_VertexPaint_Moss.uasset
+++ b/Content/Helena_migrated/Environment/Materials/Rocks/M_Cave_Rock_MASTER_VertexPaint_Moss.uasset
--- a/Content/Helena_migrated/Environment/Meshes/Building/SM_Cave_Statue_01.uasset
+++ b/Content/Helena_migrated/Environment/Meshes/Building/SM_Cave_Statue_01.uasset
--- a/Content/Helena_migrated/Environment/Meshes/Nature/SM_S_Soul_Tree3.uasset
+++ b/Content/Helena_migrated/Environment/Meshes/Nature/SM_S_Soul_Tree3.uasset
--- a/Content/Helena_migrated/Environment/Textures/Building/T_DemonStatue_M.uasset
+++ b/Content/Helena_migrated/Environment/Textures/Building/T_DemonStatue_M.uasset
--- a/Content/Helena_migrated/Environment/Textures/Building/T_DemonStatue_N.uasset
+++ b/Content/Helena_migrated/Environment/Textures/Building/T_DemonStatue_N.uasset
--- a/Content/Helena_migrated/Environment/Textures/Nature/T_Soul_Trees_D.uasset
+++ b/Content/Helena_migrated/Environment/Textures/Nature/T_Soul_Trees_D.uasset
--- a/Content/Helena_migrated/Environment/Textures/Nature/T_Soul_Trees_N.uasset
+++ b/Content/Helena_migrated/Environment/Textures/Nature/T_Soul_Trees_N.uasset
--- a/Content/Helena_migrated/Environment/Textures/Rock/T_Cave_Rock_01_D.uasset
+++ b/Content/Helena_migrated/Environment/Textures/Rock/T_Cave_Rock_01_D.uasset
--- a/Content/Helena_migrated/Environment/Textures/Rock/T_Cave_Rock_01_N.uasset
+++ b/Content/Helena_migrated/Environment/Textures/Rock/T_Cave_Rock_01_N.uasset
--- a/Content/Helena_migrated/Environment/Textures/Rock/T_Cave_Rock_Detail_D.uasset
+++ b/Content/Helena_migrated/Environment/Textures/Rock/T_Cave_Rock_Detail_D.uasset
--- a/Content/Helena_migrated/Environment/Textures/Rock/T_Cave_Rock_Stalactite_M.uasset
+++ b/Content/Helena_migrated/Environment/Textures/Rock/T_Cave_Rock_Stalactite_M.uasset
--- a/Content/Helena_migrated/Environment/Textures/Rock/T_Cave_Rock_Stalactite_N.uasset
+++ b/Content/Helena_migrated/Environment/Textures/Rock/T_Cave_Rock_Stalactite_N.uasset
--- a/Content/Helena_migrated/Environment/Textures/Rock/T_Moss_D.uasset
+++ b/Content/Helena_migrated/Environment/Textures/Rock/T_Moss_D.uasset
--- a/Content/Helena_migrated/Environment/Textures/Rock/T_Moss_N.uasset
+++ b/Content/Helena_migrated/Environment/Textures/Rock/T_Moss_N.uasset
--- a/Content/ProceduralNaturePack/Materials/leaves/tree_leaves_01.uasset
+++ b/Content/ProceduralNaturePack/Materials/leaves/tree_leaves_01.uasset
--- a/Content/ProceduralNaturePack/Materials/master_leaves.uasset
+++ b/Content/ProceduralNaturePack/Materials/master_leaves.uasset
--- a/Content/ProceduralNaturePack/Materials/master_spline_material.uasset
+++ b/Content/ProceduralNaturePack/Materials/master_spline_material.uasset
--- a/Content/ProceduralNaturePack/Materials/tree_bark/tree_bark_a.uasset
+++ b/Content/ProceduralNaturePack/Materials/tree_bark/tree_bark_a.uasset
--- a/Content/ProceduralNaturePack/Materials/wind_function/wind_branches.uasset
+++ b/Content/ProceduralNaturePack/Materials/wind_function/wind_branches.uasset
--- a/Content/ProceduralNaturePack/Meshes/trees_w_roots/large_tree_w_roots_a.uasset
+++ b/Content/ProceduralNaturePack/Meshes/trees_w_roots/large_tree_w_roots_a.uasset
--- a/Content/ProceduralNaturePack/Textures/clouds.uasset
+++ b/Content/ProceduralNaturePack/Textures/clouds.uasset
--- a/Content/ProceduralNaturePack/Textures/leaves_tree_bsm.uasset
+++ b/Content/ProceduralNaturePack/Textures/leaves_tree_bsm.uasset
--- a/Content/ProceduralNaturePack/Textures/leaves_tree_nrm.uasset
+++ b/Content/ProceduralNaturePack/Textures/leaves_tree_nrm.uasset
--- a/Content/ProceduralNaturePack/Textures/leaves_tree_rgm.uasset
+++ b/Content/ProceduralNaturePack/Textures/leaves_tree_rgm.uasset
--- a/Content/ProceduralNaturePack/Textures/moss_bsm.uasset
+++ b/Content/ProceduralNaturePack/Textures/moss_bsm.uasset
--- a/Content/ProceduralNaturePack/Textures/moss_nrm.uasset
+++ b/Content/ProceduralNaturePack/Textures/moss_nrm.uasset
--- a/Content/ProceduralNaturePack/Textures/moss_rgm.uasset
+++ b/Content/ProceduralNaturePack/Textures/moss_rgm.uasset
--- a/Content/ProceduralNaturePack/Textures/tree_bark_01_ao.uasset
+++ b/Content/ProceduralNaturePack/Textures/tree_bark_01_ao.uasset
--- a/Content/ProceduralNaturePack/Textures/tree_bark_01_bsm-1.uasset
+++ b/Content/ProceduralNaturePack/Textures/tree_bark_01_bsm-1.uasset
--- a/Content/ProceduralNaturePack/Textures/tree_bark_01_nrm.uasset
+++ b/Content/ProceduralNaturePack/Textures/tree_bark_01_nrm.uasset
--- a/Content/ProceduralNaturePack/Textures/tree_bark_01_plx.uasset
+++ b/Content/ProceduralNaturePack/Textures/tree_bark_01_plx.uasset
--- a/Content/ProceduralNaturePack/Textures/tree_bark_01_rgm.uasset
+++ b/Content/ProceduralNaturePack/Textures/tree_bark_01_rgm.uasset
--- a/Content/Siim_migrated/SM_Exo_Decos_Set01_Facade03.uasset
+++ b/Content/Siim_migrated/SM_Exo_Decos_Set01_Facade03.uasset
--- a/Content/Siim_migrated/SM_Exo_Doorframe_Column_01.uasset
+++ b/Content/Siim_migrated/SM_Exo_Doorframe_Column_01.uasset
--- a/Content/Siim_migrated/SM_West_SPG_M109_Damaged.uasset
+++ b/Content/Siim_migrated/SM_West_SPG_M109_Damaged.uasset
--- a/Content/SoulCave/Environment/Materials/Functions/MF_FuzzyShading_JM.uasset
+++ b/Content/SoulCave/Environment/Materials/Functions/MF_FuzzyShading_JM.uasset
--- a/Content/SoulCave/Environment/Materials/Functions/MF_VertexBlend_JM.uasset
+++ b/Content/SoulCave/Environment/Materials/Functions/MF_VertexBlend_JM.uasset
--- a/Content/SoulCave/Environment/Materials/Functions/MF_Wetness.uasset
+++ b/Content/SoulCave/Environment/Materials/Functions/MF_Wetness.uasset
--- a/Content/SoulCave/Environment/Materials/MaterialLayers/MF_Solid_Color.uasset
+++ b/Content/SoulCave/Environment/Materials/MaterialLayers/MF_Solid_Color.uasset
--- a/Content/SoulCave/Environment/Materials/Nature/M_Soul_TreeDead.uasset
+++ b/Content/SoulCave/Environment/Materials/Nature/M_Soul_TreeDead.uasset
--- a/Content/SoulCave/Environment/Materials/Rocks/MF_Cave_Moss.uasset
+++ b/Content/SoulCave/Environment/Materials/Rocks/MF_Cave_Moss.uasset
--- a/Content/SoulCave/Environment/Materials/Rocks/MF_Cave_Rock01.uasset
+++ b/Content/SoulCave/Environment/Materials/Rocks/MF_Cave_Rock01.uasset
--- a/Content/SoulCave/Environment/Materials/Rocks/MF_Cave_Rock02.uasset
+++ b/Content/SoulCave/Environment/Materials/Rocks/MF_Cave_Rock02.uasset
--- a/Content/SoulCave/Environment/Materials/Rocks/MI_Cave_Rock_DemonStatue_Moss.uasset
+++ b/Content/SoulCave/Environment/Materials/Rocks/MI_Cave_Rock_DemonStatue_Moss.uasset
--- a/Content/SoulCave/Environment/Materials/Rocks/M_Cave_Rock_MASTER_VertexPaint_MOSS.uasset
+++ b/Content/SoulCave/Environment/Materials/Rocks/M_Cave_Rock_MASTER_VertexPaint_MOSS.uasset
--- a/Content/SoulCave/Environment/Meshes/Building/SM_Cave_Statue_01.uasset
+++ b/Content/SoulCave/Environment/Meshes/Building/SM_Cave_Statue_01.uasset
--- a/Content/SoulCave/Environment/Meshes/Nature/SM_S_Soul_Tree3.uasset
+++ b/Content/SoulCave/Environment/Meshes/Nature/SM_S_Soul_Tree3.uasset
--- a/Content/SoulCave/Environment/Textures/Building/T_DemonStatue_M.uasset
+++ b/Content/SoulCave/Environment/Textures/Building/T_DemonStatue_M.uasset
--- a/Content/SoulCave/Environment/Textures/Building/T_DemonStatue_N.uasset
+++ b/Content/SoulCave/Environment/Textures/Building/T_DemonStatue_N.uasset
--- a/Content/SoulCave/Environment/Textures/Nature/T_Soul_Trees_D.uasset
+++ b/Content/SoulCave/Environment/Textures/Nature/T_Soul_Trees_D.uasset
--- a/Content/SoulCave/Environment/Textures/Nature/T_Soul_Trees_N.uasset
+++ b/Content/SoulCave/Environment/Textures/Nature/T_Soul_Trees_N.uasset
--- a/Content/SoulCave/Environment/Textures/Rock/T_Cave_Rock_01_D.uasset
+++ b/Content/SoulCave/Environment/Textures/Rock/T_Cave_Rock_01_D.uasset
--- a/Content/SoulCave/Environment/Textures/Rock/T_Cave_Rock_01_N.uasset
+++ b/Content/SoulCave/Environment/Textures/Rock/T_Cave_Rock_01_N.uasset
--- a/Content/SoulCave/Environment/Textures/Rock/T_Cave_Rock_Detail_D.uasset
+++ b/Content/SoulCave/Environment/Textures/Rock/T_Cave_Rock_Detail_D.uasset
--- a/Content/SoulCave/Environment/Textures/Rock/T_Cave_Rock_Stalactite_M.uasset
+++ b/Content/SoulCave/Environment/Textures/Rock/T_Cave_Rock_Stalactite_M.uasset
--- a/Content/SoulCave/Environment/Textures/Rock/T_Cave_Rock_Stalactite_N.uasset
+++ b/Content/SoulCave/Environment/Textures/Rock/T_Cave_Rock_Stalactite_N.uasset
--- a/Content/SoulCave/Environment/Textures/Rock/T_Moss_D.uasset
+++ b/Content/SoulCave/Environment/Textures/Rock/T_Moss_D.uasset
--- a/Content/SoulCave/Environment/Textures/Rock/T_Moss_N.uasset
+++ b/Content/SoulCave/Environment/Textures/Rock/T_Moss_N.uasset
--- a/Content/VRTemplate/Maps/VRTemplateMap.umap
+++ b/Content/VRTemplate/Maps/VRTemplateMap.umap
--- a/Content/VRTemplate/Maps/VRTemplateMap_BuiltData.uasset
+++ b/Content/VRTemplate/Maps/VRTemplateMap_BuiltData.uasset