Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA

Browse Source

# Conflicts:
#	Content/Level/Environment.umap

...

This commit is contained in:

zheka3777123

2019-10-27 16:36:13 +05:00

parent a9886b6441 8b3d3785f4

commit b035ecc51f

6 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/Level/Environment.umap

BIN

Binary file not shown.

Content/Level/Index.umap

BIN

Binary file not shown.

Content/Level/MAF.umap

BIN

Binary file not shown.

Content/Materials/carMats/red_plast.uasset

BIN

Binary file not shown.

Content/Meshes/Environment/M_grey.uasset

BIN

Binary file not shown.

Content/Meshes/Environment/SM_StreetsNames_Text_001.uasset

BIN

Binary file not shown.