Merge branch 'Danis' of http://192.168.1.163:3000/Dron/Onejsky4U

Browse Source

# Conflicts:
#	Content/Maps/S01/S01F03.umap
#	Content/Meshes/Danis/S01/SM_DoorAL_001.uasset
#	Content/Meshes/Danis/S01/SM_DoorAL_001_Frame.uasset
#	Content/Meshes/Danis/S01/SM_DoorAR_001.uasset
#	Content/Meshes/Danis/S01/SM_DoorAR_001_Frame.uasset

...

This commit is contained in:

Andron666

2021-06-02 20:32:26 +05:00

parent 7c73fcc74b 488a4b0d68

commit 1bef8baabb

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/Textures/DoorA/T_DoorALFrame_N.uasset

BIN

Binary file not shown.

Content/Textures/DoorA/T_DoorA_N.uasset

BIN

Binary file not shown.

Content/Textures/DoorA/low_poly_M_DoorALFrame_Normal.uasset

BIN

Binary file not shown.