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

Browse Source

# Conflicts:
#	Content/Maps/Masharov_Buildings.umap
#	Content/Maps/Masharov_cars.umap
#	Content/Maps/mainScene.umap

...

This commit is contained in:

Andron666

2022-06-23 23:11:53 +05:00

parent e47016785e 7f2f95864d

commit 071a6968e7

7 changed files with 0 additions and 0 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/Blueprints/Lamp/BP_streetLamp_Child_6m.uasset

BIN

Binary file not shown.

Content/Maps/Masharov_Buildings.umap

BIN

Binary file not shown.

Content/Maps/Masharov_Nightlight.umap

BIN

Binary file not shown.

Content/Maps/Masharov_Yard.umap

BIN

Binary file not shown.

Content/Maps/Masharov_cars.umap

BIN

Binary file not shown.

Content/Meshes/Exterior/Main/New/SM_ST_12_re.uasset

BIN

Binary file not shown.

Content/Textures/Megascan/Pavestone/stone_cobblestone_umkkabxo/MI_Metal_Black15.uasset

BIN

Binary file not shown.