Merge remote-tracking branch 'origin/Danis'

Browse Source

# Conflicts:
#	Content/AssetPacks/CarMoveSpline/Materials/VehicleVarietyPack/Textures/Hatchback/TX_Hatchback_Diffuse_0.uasset
#	Content/AssetPacks/Procedural_Ecosystem/Materials/Material_Functions/MF_Landscape_birch_Asphalt10.uasset
#	Content/AssetPacks/Procedural_Ecosystem/Materials/Material_Functions/MF_Landscape_birch_Asphalt11.uasset

...

This commit is contained in:

Andron666

2020-12-04 21:44:53 +05:00

parent 0f40e9fe2c 0143b9a837

commit 2522e3da5a

172 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/Glass_Test.uasset

BIN

Binary file not shown.

Content/Materials/Instances/MI_Squad_01_01.uasset

BIN

Binary file not shown.

Content/Materials/Instances/MI_Squad_01_02.uasset

BIN

Binary file not shown.

Content/Materials/Instances/MI_Squad_02_01.uasset

BIN

Binary file not shown.

Content/Materials/Instances/MI_Squad_02_02.uasset

BIN

Binary file not shown.

Content/Materials/Instances/MI_Squad_03_01.uasset

BIN

Binary file not shown.

Content/Materials/Instances/MI_Squad_03_02.uasset

BIN

Binary file not shown.

Content/Materials/Instances/MI_Squad_04_01.uasset

BIN

Binary file not shown.

Content/Materials/Instances/MI_Squad_04_02.uasset

BIN

Binary file not shown.

Content/Materials/Instances/MI_Squad_05_01.uasset

BIN

Binary file not shown.

Content/Materials/Instances/MI_Squad_05_02.uasset

BIN

Binary file not shown.

Content/Materials/Instances/M_Squad_Build.uasset

BIN

Binary file not shown.

Content/Materials/M_Scan_RA_Master.uasset

BIN

Binary file not shown.

Content/Materials/M_newAsphalt.uasset

BIN

Binary file not shown.