Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer

# Conflicts:
#	Content/Maps/Masharov_Buildings.umap
#	Content/Meshes/Exterior/Main/SM_Masharov_GP1_pos.uasset
#	Content/Meshes/Exterior/Main/SM_Masharov_GP2_pos.uasset

This commit is contained in:

Andron666

2022-07-15 20:42:11 +05:00

parent c122da9464 51d0bd9857

commit 51b844e209

15 changed files with 0 additions and 0 deletions

Content/Maps/Masharov_Buildings.umap

BIN

View File

Binary file not shown.

Content/Meshes/Exterior/Main/SM_BT_pos.uasset

BIN

View File

Binary file not shown.

Content/Meshes/Exterior/Main/SM_Building_4_pos.uasset

BIN

View File

Binary file not shown.

Content/Meshes/Exterior/Main/SM_Masharov_GP1_pos.uasset

BIN

View File

Binary file not shown.

Content/Meshes/Exterior/Main/SM_Masharov_GP2_pos.uasset

BIN

View File

Binary file not shown.

Content/Meshes/Interior/Commerce/GP1_Commerce.uasset

BIN

View File

Binary file not shown.

Content/Meshes/Interior/Commerce/MI_Glass_Black1.uasset

BIN

View File

Binary file not shown.

Content/Meshes/Interior/Commerce/MI_Glass_Black_BT.uasset

BIN

View File

Binary file not shown.

Content/Meshes/Interior/Commerce/MI_MOP_Plaster_Green1.uasset

BIN

View File

Binary file not shown.

Content/Meshes/Interior/Commerce/M_Glass_ThinRaytraced_1.uasset

BIN

View File

Binary file not shown.

Content/Meshes/Interior/Commerce/M_Glass_ThinRaytraced_2.uasset

BIN

View File

Binary file not shown.

Content/Meshes/Interior/Commerce/M_Glass_ThinRaytraced_BT.uasset

BIN

View File

Binary file not shown.

Content/Meshes/Interior/Commerce/SM_CummerciaGP5.uasset

BIN

View File

Binary file not shown.

Content/Meshes/Interior/Commerce/SM_CummerciaVusotski.uasset

BIN

View File

Binary file not shown.

Content/Meshes/Interior/Commerce/SM_GP2_Commerce.uasset

BIN

View File

Binary file not shown.