Merge branch 'master' of http://192.168.1.163:3000/Dron/AIR

Browse Source

# Conflicts:
#	Content/Levels/Exterior.umap
#	Content/Levels/RivetsWings.umap
#	Content/PhotoR_Landscape_4/Maps/Photorealistic_Island.umap

...

This commit is contained in:

Maxim

2019-04-11 15:38:42 +05:00

parent 7402e6b877 a576350ea1

commit f4e2f7f20a

17 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/Levels/Interior_1.umap

BIN

Binary file not shown.

Content/Materials/Material_Instance/MI_Fabric_4.uasset

BIN

Binary file not shown.

Content/Materials/Material_Instance/MI_Fabric_5.uasset

BIN

Binary file not shown.

Content/Materials/Material_Instance/MI_Fabric_6.uasset

BIN

Binary file not shown.

Content/Materials/Material_Instance/MI_Fabric_7.uasset

BIN

Binary file not shown.

Content/Meshes/Characters/Animations/Zombie_Headbutt.uasset

BIN

Binary file not shown.

Content/Meshes/Characters/Materials/M_Zombie.uasset

BIN

Binary file not shown.

Content/Meshes/Characters/Textures/T_Zombie_BC.uasset

BIN

Binary file not shown.

Content/Meshes/Characters/Textures/T_Zombie_N.uasset

BIN

Binary file not shown.

Content/Meshes/Characters/Textures/T_Zombie_S.uasset

BIN

Binary file not shown.

Content/Meshes/Characters/Zombie_TPose_FBX.uasset

BIN

Binary file not shown.

Content/Meshes/Characters/Zombie_TPose_FBX_PhysicsAsset.uasset

BIN

Binary file not shown.

Content/Meshes/Characters/Zombie_TPose_FBX_Skeleton.uasset

BIN

Binary file not shown.

Content/Meshes/Interior/SM_Bag_Backpack.uasset

BIN

Binary file not shown.

Content/Meshes/Interior/SM_Bag_Chemodan.uasset

BIN

Binary file not shown.

Content/Meshes/Interior/SM_Bag_ChemodanLarge_01.uasset

BIN

Binary file not shown.

Content/Meshes/Interior/SM_Bag_ChemodanLarge_02.uasset

BIN

Binary file not shown.