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

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

Content

FPWeapon/Mesh

M_Soul_TreeDead.uasset

Helena_migrated/Environment

Materials

Functions

MF_FuzzyShading_JM.uassetMF_VertexBlend_JM.uassetMF_Wetness.uasset

MaterialLayers

MF_Solid_Color.uasset

Nature

M_Soul_TreeDead.uasset

Rocks

MF_Cave_Moss.uassetMF_Cave_Rock01.uassetMF_Cave_Rock02.uassetMI_Cave_Rock_DemonStatue_Moss.uassetM_Cave_Rock_MASTER_VertexPaint_Moss.uasset

Meshes

Building

SM_Cave_Statue_01.uasset

Nature

SM_S_Soul_Tree3.uasset

Textures

Building

T_DemonStatue_M.uassetT_DemonStatue_N.uasset

Nature

T_Soul_Trees_D.uassetT_Soul_Trees_N.uasset

Rock

T_Cave_Rock_01_D.uassetT_Cave_Rock_01_N.uassetT_Cave_Rock_Detail_D.uassetT_Cave_Rock_Stalactite_M.uassetT_Cave_Rock_Stalactite_N.uassetT_Moss_D.uassetT_Moss_N.uasset

ProceduralNaturePack

Materials

leaves

tree_leaves_01.uasset

master_leaves.uassetmaster_spline_material.uasset

tree_bark

tree_bark_a.uasset

wind_function

wind_branches.uasset

Meshes/trees_w_roots

large_tree_w_roots_a.uasset

Textures

clouds.uassetleaves_tree_bsm.uassetleaves_tree_nrm.uassetleaves_tree_rgm.uassetmoss_bsm.uassetmoss_nrm.uassetmoss_rgm.uassettree_bark_01_ao.uassettree_bark_01_bsm-1.uassettree_bark_01_nrm.uassettree_bark_01_plx.uassettree_bark_01_rgm.uasset

Siim_migrated

SM_Exo_Decos_Set01_Facade03.uassetSM_Exo_Doorframe_Column_01.uassetSM_West_SPG_M109_Damaged.uasset

SoulCave/Environment

Materials

Functions

MF_FuzzyShading_JM.uassetMF_VertexBlend_JM.uassetMF_Wetness.uasset

MaterialLayers

MF_Solid_Color.uasset

Nature

M_Soul_TreeDead.uasset

Rocks

MF_Cave_Moss.uassetMF_Cave_Rock01.uassetMF_Cave_Rock02.uassetMI_Cave_Rock_DemonStatue_Moss.uassetM_Cave_Rock_MASTER_VertexPaint_MOSS.uasset

Meshes

Building

SM_Cave_Statue_01.uasset

Nature

SM_S_Soul_Tree3.uasset

Textures

Building

T_DemonStatue_M.uassetT_DemonStatue_N.uasset

Nature

T_Soul_Trees_D.uassetT_Soul_Trees_N.uasset

Rock

T_Cave_Rock_01_D.uassetT_Cave_Rock_01_N.uassetT_Cave_Rock_Detail_D.uassetT_Cave_Rock_Stalactite_M.uassetT_Cave_Rock_Stalactite_N.uassetT_Moss_D.uassetT_Moss_N.uasset

VRTemplate/Maps

VRTemplateMap.umapVRTemplateMap_BuiltData.uasset

BIN

Content/FPWeapon/Mesh/M_Soul_TreeDead.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Helena_migrated/Environment/Materials/Functions/MF_FuzzyShading_JM.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Helena_migrated/Environment/Materials/Functions/MF_VertexBlend_JM.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Helena_migrated/Environment/Materials/Functions/MF_Wetness.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Helena_migrated/Environment/Materials/MaterialLayers/MF_Solid_Color.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Helena_migrated/Environment/Materials/Nature/M_Soul_TreeDead.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Helena_migrated/Environment/Materials/Rocks/MF_Cave_Moss.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Helena_migrated/Environment/Materials/Rocks/MF_Cave_Rock01.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Helena_migrated/Environment/Materials/Rocks/MF_Cave_Rock02.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Helena_migrated/Environment/Materials/Rocks/MI_Cave_Rock_DemonStatue_Moss.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Helena_migrated/Environment/Materials/Rocks/M_Cave_Rock_MASTER_VertexPaint_Moss.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Helena_migrated/Environment/Meshes/Building/SM_Cave_Statue_01.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Helena_migrated/Environment/Meshes/Nature/SM_S_Soul_Tree3.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Helena_migrated/Environment/Textures/Building/T_DemonStatue_M.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Helena_migrated/Environment/Textures/Building/T_DemonStatue_N.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Helena_migrated/Environment/Textures/Nature/T_Soul_Trees_D.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Helena_migrated/Environment/Textures/Nature/T_Soul_Trees_N.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Helena_migrated/Environment/Textures/Rock/T_Cave_Rock_01_D.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Helena_migrated/Environment/Textures/Rock/T_Cave_Rock_01_N.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Helena_migrated/Environment/Textures/Rock/T_Cave_Rock_Detail_D.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Helena_migrated/Environment/Textures/Rock/T_Cave_Rock_Stalactite_M.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Helena_migrated/Environment/Textures/Rock/T_Cave_Rock_Stalactite_N.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Helena_migrated/Environment/Textures/Rock/T_Moss_D.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Helena_migrated/Environment/Textures/Rock/T_Moss_N.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/ProceduralNaturePack/Materials/leaves/tree_leaves_01.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/ProceduralNaturePack/Materials/master_leaves.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/ProceduralNaturePack/Materials/master_spline_material.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/ProceduralNaturePack/Materials/tree_bark/tree_bark_a.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/ProceduralNaturePack/Materials/wind_function/wind_branches.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/ProceduralNaturePack/Meshes/trees_w_roots/large_tree_w_roots_a.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/ProceduralNaturePack/Textures/clouds.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/ProceduralNaturePack/Textures/leaves_tree_bsm.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/ProceduralNaturePack/Textures/leaves_tree_nrm.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/ProceduralNaturePack/Textures/leaves_tree_rgm.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/ProceduralNaturePack/Textures/moss_bsm.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/ProceduralNaturePack/Textures/moss_nrm.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/ProceduralNaturePack/Textures/moss_rgm.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/ProceduralNaturePack/Textures/tree_bark_01_ao.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/ProceduralNaturePack/Textures/tree_bark_01_bsm-1.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/ProceduralNaturePack/Textures/tree_bark_01_nrm.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/ProceduralNaturePack/Textures/tree_bark_01_plx.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/ProceduralNaturePack/Textures/tree_bark_01_rgm.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Siim_migrated/SM_Exo_Decos_Set01_Facade03.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Siim_migrated/SM_Exo_Doorframe_Column_01.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Siim_migrated/SM_West_SPG_M109_Damaged.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/SoulCave/Environment/Materials/Functions/MF_FuzzyShading_JM.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/SoulCave/Environment/Materials/Functions/MF_VertexBlend_JM.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/SoulCave/Environment/Materials/Functions/MF_Wetness.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/SoulCave/Environment/Materials/MaterialLayers/MF_Solid_Color.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/SoulCave/Environment/Materials/Nature/M_Soul_TreeDead.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/SoulCave/Environment/Materials/Rocks/MF_Cave_Moss.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/SoulCave/Environment/Materials/Rocks/MF_Cave_Rock01.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/SoulCave/Environment/Materials/Rocks/MF_Cave_Rock02.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/SoulCave/Environment/Materials/Rocks/MI_Cave_Rock_DemonStatue_Moss.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/SoulCave/Environment/Materials/Rocks/M_Cave_Rock_MASTER_VertexPaint_MOSS.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/SoulCave/Environment/Meshes/Building/SM_Cave_Statue_01.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/SoulCave/Environment/Meshes/Nature/SM_S_Soul_Tree3.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/SoulCave/Environment/Textures/Building/T_DemonStatue_M.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/SoulCave/Environment/Textures/Building/T_DemonStatue_N.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/SoulCave/Environment/Textures/Nature/T_Soul_Trees_D.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/SoulCave/Environment/Textures/Nature/T_Soul_Trees_N.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/SoulCave/Environment/Textures/Rock/T_Cave_Rock_01_D.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/SoulCave/Environment/Textures/Rock/T_Cave_Rock_01_N.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/SoulCave/Environment/Textures/Rock/T_Cave_Rock_Detail_D.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/SoulCave/Environment/Textures/Rock/T_Cave_Rock_Stalactite_M.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/SoulCave/Environment/Textures/Rock/T_Cave_Rock_Stalactite_N.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/SoulCave/Environment/Textures/Rock/T_Moss_D.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/SoulCave/Environment/Textures/Rock/T_Moss_N.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/VRTemplate/Maps/VRTemplateMap.umap (Stored with Git LFS)

Binary file not shown.

BIN

Content/VRTemplate/Maps/VRTemplateMap_BuiltData.uasset (Stored with Git LFS)

Binary file not shown.