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

Browse Source

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

...

This commit is contained in:

helenasokk 2022-03-06 16:41:06 +02:00

parent 4825126cd7 c1d47a9a82

commit 1e440bc4ab

47 changed files with 139 additions and 4 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

BIN

Content/Siim_migrated/MI_West_SPG_M109_Damaged.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Siim_migrated/M_Decos_Facade01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Siim_migrated/M_Villa_Pillar_1.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Siim_migrated/M_Villa_Plaster_1.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Siim_migrated/Materials/M_Decos_BSP_Stucco02.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Siim_migrated/Materials/M_Decos_BSP_Stucco03.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Siim_migrated/Materials/M_Decos_Door.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Siim_migrated/Materials/M_Decos_Door_Frame.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Siim_migrated/Materials/M_Decos_Facade01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Siim_migrated/Materials/M_Exo_CobWeb01_NoMove.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Siim_migrated/Materials/M_HardWood_Floor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Siim_migrated/Materials/M_Pew.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Siim_migrated/Materials/M_Tile_Floor_Broken_Tex_A.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Siim_migrated/Materials/M_Villa_Pillar_1.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Siim_migrated/Materials/M_Villa_Plaster_1.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Siim_migrated/Materials/m_Flooded_ConcRail1.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Siim_migrated/SM_Exo_Decos_Set01_Facade03.FBX (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

Content/Siim_migrated/SM_Exo_Doorframe_Column_01.FBX (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

Content/Siim_migrated/SM_West_SPG_M109_Damaged.FBX (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

Content/Siim_migrated/Textures/T_Cobweb03_D.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Siim_migrated/Textures/T_Decos_BSP_Stucco02_D.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Siim_migrated/Textures/T_Decos_BSP_Stucco02_N.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Siim_migrated/Textures/T_Decos_BSP_Stucco03_D.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Siim_migrated/Textures/T_Decos_Door_D.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Siim_migrated/Textures/T_Decos_Door_Frame_D.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Siim_migrated/Textures/T_Decos_Door_Frame_D_NRM.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Siim_migrated/Textures/T_Decos_Door_M.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Siim_migrated/Textures/T_Decos_Door_N.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Siim_migrated/Textures/T_Decos_Facade01_D.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Siim_migrated/Textures/T_Decos_Facade01_D_NRM.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Siim_migrated/Textures/T_Flooded_ConcRail1_D.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Siim_migrated/Textures/T_Flooded_ConcRail1_D_NRM.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Siim_migrated/Textures/T_HardWood_Floor_D.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Siim_migrated/Textures/T_HardWood_Floor_D_NRM.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Siim_migrated/Textures/T_Pew_D.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Siim_migrated/Textures/T_Pew_N.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Siim_migrated/Textures/T_Tile_Floor_Broken_D.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Siim_migrated/Textures/T_Tile_Floor_Broken_D_NRM.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Siim_migrated/Textures/T_Villa_Pillar_1_D.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Siim_migrated/Textures/T_Villa_Pillar_1_D_NRM.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Siim_migrated/Textures/T_Villa_Plaster_1_D.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Siim_migrated/Textures/T_Villa_Plaster_1_D_NRM.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.