Merge branch 'master' of http://192.168.1.163:3000/Maxim/Helicopter_K52

Browse Source

# Conflicts:
#	Content/Levels/Hangar_2.umap

...

This commit is contained in:

Lenta_Mebiusa

2019-10-01 20:44:03 +05:00

parent e5fe0edbba 4bc30fb558

commit 10e2631a0a

9 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/Materials/Instances/MI_PaintMetal_Orang.uasset

BIN

Binary file not shown.

Content/Materials/Instances/T_Metal_ThreadplateBare.uasset

BIN

Binary file not shown.

Content/Meshes/_SM_ladder.uasset

BIN

Binary file not shown.

Content/Textures/T_Metal_ThreadplateBare_AO.uasset

BIN

Binary file not shown.

Content/Textures/T_Metal_ThreadplateBare_BC.uasset

BIN

Binary file not shown.

Content/Textures/T_Metal_ThreadplateBare_H.uasset

BIN

Binary file not shown.

Content/Textures/T_Metal_ThreadplateBare_M.uasset

BIN

Binary file not shown.

Content/Textures/T_Metal_ThreadplateBare_N.uasset

BIN

Binary file not shown.

Content/Textures/T_Metal_ThreadplateBare_R.uasset

BIN

Binary file not shown.