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

Browse Source

# Conflicts:
#	Content/Level/Environment.umap
#	Content/Level/Index.umap
#	Content/Level/People.umap
#	Content/PeopleSplineWalk/PeopleMove.uasset

...

This commit is contained in:

Lenta_Mebiusa

2019-12-03 15:38:59 +05:00

parent 2ed7548725 9afd5c60fe

commit c88f52dc2f

146 changed files with 1 additions and 3 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/Instances/Roof/MI_Roofing_AsbestosOndulated_2.uasset

BIN

Binary file not shown.

Content/Instances/Tile/MI_MarbleSlab_2.uasset

BIN

Binary file not shown.