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

Browse Source

# Conflicts:
#	Content/VRTemplate/Maps/VRTemplateMap.umap
#	Content/VRTemplate/Maps/VRTemplateMap_BuiltData.uasset

...

This commit is contained in:

l31tm0t1f

2022-03-07 17:33:55 +02:00

parent c936cbdc02 734dd5f8e0

commit efa77c7dbb

70 changed files with 136 additions and 79 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/FPWeapon/Mesh/M_Soul_TreeDead.uasset

LFS

BIN

Binary file not shown.

Content/Helena_migrated/Environment/Materials/Functions/MF_FuzzyShading_JM.uasset

LFS

BIN

Binary file not shown.

Content/Helena_migrated/Environment/Materials/Functions/MF_VertexBlend_JM.uasset

LFS

BIN

Binary file not shown.

Content/Helena_migrated/Environment/Materials/Functions/MF_Wetness.uasset

LFS

BIN

Binary file not shown.

Content/Helena_migrated/Environment/Materials/MaterialLayers/MF_Solid_Color.uasset

LFS

BIN

Binary file not shown.

Content/Helena_migrated/Environment/Materials/Nature/M_Soul_TreeDead.uasset

LFS

BIN

Binary file not shown.

Content/Helena_migrated/Environment/Materials/Rocks/MF_Cave_Moss.uasset

LFS

BIN

Binary file not shown.

Content/Helena_migrated/Environment/Materials/Rocks/MF_Cave_Rock01.uasset

LFS

BIN

Binary file not shown.

Content/Helena_migrated/Environment/Materials/Rocks/MF_Cave_Rock02.uasset

LFS

BIN

Binary file not shown.

Content/Helena_migrated/Environment/Materials/Rocks/MI_Cave_Rock_DemonStatue_Moss.uasset

LFS

BIN

Binary file not shown.

Content/Helena_migrated/Environment/Materials/Rocks/M_Cave_Rock_MASTER_VertexPaint_Moss.uasset

LFS

BIN

Binary file not shown.

Content/Helena_migrated/Environment/Meshes/Building/SM_Cave_Statue_01.uasset

LFS

BIN

Binary file not shown.

Content/Helena_migrated/Environment/Meshes/Nature/SM_S_Soul_Tree3.uasset

LFS

BIN

Binary file not shown.

Content/Helena_migrated/Environment/Textures/Building/T_DemonStatue_M.uasset

LFS

BIN

Binary file not shown.

Content/Helena_migrated/Environment/Textures/Building/T_DemonStatue_N.uasset

LFS

BIN

Binary file not shown.

Content/Helena_migrated/Environment/Textures/Nature/T_Soul_Trees_D.uasset

LFS

BIN

Binary file not shown.

Content/Helena_migrated/Environment/Textures/Nature/T_Soul_Trees_N.uasset

LFS

BIN

Binary file not shown.

Content/Helena_migrated/Environment/Textures/Rock/T_Cave_Rock_01_D.uasset

LFS

BIN

Binary file not shown.

Content/Helena_migrated/Environment/Textures/Rock/T_Cave_Rock_01_N.uasset

LFS

BIN

Binary file not shown.

Content/Helena_migrated/Environment/Textures/Rock/T_Cave_Rock_Detail_D.uasset

LFS

BIN

Binary file not shown.

Content/Helena_migrated/Environment/Textures/Rock/T_Cave_Rock_Stalactite_M.uasset

LFS

BIN

Binary file not shown.

Content/Helena_migrated/Environment/Textures/Rock/T_Cave_Rock_Stalactite_N.uasset

LFS

BIN

Binary file not shown.

Content/Helena_migrated/Environment/Textures/Rock/T_Moss_D.uasset

LFS

BIN

Binary file not shown.

Content/Helena_migrated/Environment/Textures/Rock/T_Moss_N.uasset

LFS

BIN

Binary file not shown.

Content/ProceduralNaturePack/Materials/leaves/tree_leaves_01.uasset

LFS

BIN

Binary file not shown.

Content/ProceduralNaturePack/Materials/master_leaves.uasset

LFS

BIN

Binary file not shown.

Content/ProceduralNaturePack/Materials/master_spline_material.uasset

LFS

BIN

Binary file not shown.

Content/ProceduralNaturePack/Materials/tree_bark/tree_bark_a.uasset

LFS

BIN

Binary file not shown.

Content/ProceduralNaturePack/Materials/wind_function/wind_branches.uasset

LFS

BIN

Binary file not shown.

Content/ProceduralNaturePack/Meshes/trees_w_roots/large_tree_w_roots_a.uasset

LFS

BIN

Binary file not shown.

Content/ProceduralNaturePack/Textures/clouds.uasset

LFS

BIN

Binary file not shown.

Content/ProceduralNaturePack/Textures/leaves_tree_bsm.uasset

LFS

BIN

Binary file not shown.

Content/ProceduralNaturePack/Textures/leaves_tree_nrm.uasset

LFS

BIN

Binary file not shown.

Content/ProceduralNaturePack/Textures/leaves_tree_rgm.uasset

LFS

BIN

Binary file not shown.

Content/ProceduralNaturePack/Textures/moss_bsm.uasset

LFS

BIN

Binary file not shown.

Content/ProceduralNaturePack/Textures/moss_nrm.uasset

LFS

BIN

Binary file not shown.

Content/ProceduralNaturePack/Textures/moss_rgm.uasset

LFS

BIN

Binary file not shown.

Content/ProceduralNaturePack/Textures/tree_bark_01_ao.uasset

LFS

BIN

Binary file not shown.

Content/ProceduralNaturePack/Textures/tree_bark_01_bsm-1.uasset

LFS

BIN

Binary file not shown.

Content/ProceduralNaturePack/Textures/tree_bark_01_nrm.uasset

LFS

BIN

Binary file not shown.

Content/ProceduralNaturePack/Textures/tree_bark_01_plx.uasset

LFS

BIN

Binary file not shown.

Content/ProceduralNaturePack/Textures/tree_bark_01_rgm.uasset

LFS

BIN

Binary file not shown.

Content/Siim_migrated/SM_Exo_Decos_Set01_Facade03.uasset

LFS

BIN

Binary file not shown.

Content/Siim_migrated/SM_Exo_Doorframe_Column_01.uasset

LFS

BIN

Binary file not shown.

Content/Siim_migrated/SM_West_SPG_M109_Damaged.uasset

LFS

BIN

Binary file not shown.

Content/SoulCave/Environment/Materials/Functions/MF_FuzzyShading_JM.uasset

LFS

BIN

Binary file not shown.

Content/SoulCave/Environment/Materials/Functions/MF_VertexBlend_JM.uasset

LFS

BIN

Binary file not shown.

Content/SoulCave/Environment/Materials/Functions/MF_Wetness.uasset

LFS

BIN

Binary file not shown.

Content/SoulCave/Environment/Materials/MaterialLayers/MF_Solid_Color.uasset

LFS

BIN

Binary file not shown.

Content/SoulCave/Environment/Materials/Nature/M_Soul_TreeDead.uasset

LFS

BIN

Binary file not shown.

Content/SoulCave/Environment/Materials/Rocks/MF_Cave_Moss.uasset

LFS

BIN

Binary file not shown.

Content/SoulCave/Environment/Materials/Rocks/MF_Cave_Rock01.uasset

LFS

BIN

Binary file not shown.

Content/SoulCave/Environment/Materials/Rocks/MF_Cave_Rock02.uasset

LFS

BIN

Binary file not shown.

Content/SoulCave/Environment/Materials/Rocks/MI_Cave_Rock_DemonStatue_Moss.uasset

LFS

BIN

Binary file not shown.

Content/SoulCave/Environment/Materials/Rocks/M_Cave_Rock_MASTER_VertexPaint_MOSS.uasset

LFS

BIN

Binary file not shown.

Content/SoulCave/Environment/Meshes/Building/SM_Cave_Statue_01.uasset

LFS

BIN

Binary file not shown.

Content/SoulCave/Environment/Meshes/Nature/SM_S_Soul_Tree3.uasset

LFS

BIN

Binary file not shown.

Content/SoulCave/Environment/Textures/Building/T_DemonStatue_M.uasset

LFS

BIN

Binary file not shown.

Content/SoulCave/Environment/Textures/Building/T_DemonStatue_N.uasset

LFS

BIN

Binary file not shown.

Content/SoulCave/Environment/Textures/Nature/T_Soul_Trees_D.uasset

LFS

BIN

Binary file not shown.

Content/SoulCave/Environment/Textures/Nature/T_Soul_Trees_N.uasset

LFS

BIN

Binary file not shown.

Content/SoulCave/Environment/Textures/Rock/T_Cave_Rock_01_D.uasset

LFS

BIN

Binary file not shown.

Content/SoulCave/Environment/Textures/Rock/T_Cave_Rock_01_N.uasset

LFS

BIN

Binary file not shown.

Content/SoulCave/Environment/Textures/Rock/T_Cave_Rock_Detail_D.uasset

LFS

BIN

Binary file not shown.

Content/SoulCave/Environment/Textures/Rock/T_Cave_Rock_Stalactite_M.uasset

LFS

BIN

Binary file not shown.

Content/SoulCave/Environment/Textures/Rock/T_Cave_Rock_Stalactite_N.uasset

LFS

BIN

Binary file not shown.

Content/SoulCave/Environment/Textures/Rock/T_Moss_D.uasset

LFS

BIN

Binary file not shown.

Content/SoulCave/Environment/Textures/Rock/T_Moss_N.uasset

LFS

BIN

Binary file not shown.

Content/VRTemplate/Maps/VRTemplateMap.umap

LFS

BIN

Binary file not shown.

Content/VRTemplate/Maps/VRTemplateMap_BuiltData.uasset

LFS

BIN

Binary file not shown.