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

Browse Source

# Conflicts:
#	Content/Assetpacks/AM_vol4/Textures/T_AM_vol4_trunk_26_N.uasset
#	Content/Assetpacks/CarMoveSpline/Materials/VehicleVarietyPack/Textures/Hatchback/TX_Hatchback_Normal_2.uasset
#	Content/Assetpacks/Kitchen/Textures/T_Tiles_Subway_R.uasset
#	Content/Assetpacks/Maf/Textures/T_Chute01_ORM.uasset
#	Content/Assetpacks/Maf/Textures/T_GamePad02_N.uasset
#	Content/Assetpacks/ThreeDee/Textures/Tileable/T_FabricPlain_N.uasset
#	Content/Assetpacks/xoio_berlinflat/Materials/blackmatte.uasset
#	Content/Maps/Yard.umap
#	Content/Materials/M_WinGlass.uasset
#	Content/Mavis/Materials/Interior/uh1lafuv_2K_Albedo.uasset
#	Content/Mavis/Meshes/Interior/Furniture/Textures/T_fabric_5_BC.uasset
#	Content/Mavis/Textures/Exterior/T_Bricks_dark_4K_AO.uasset
#	Content/Mavis/Textures/Exterior/T_Bricks_light_4K_AO.uasset
#	Content/Mavis/Textures/Exterior/T_Parking_Door_4K_Albedo.uasset
#	Content/Mavis/Textures/Exterior/T_Parking_Door_4K_Roughness.uasset
#	Content/Mavis/Textures/Exterior/ueinehidy_4K_Albedo.uasset
#	Content/Mavis/Textures/Exterior/ueinehidy_4K_Roughness.uasset
#	Content/Mavis/Textures/Exterior/ulmlbijg_4K_Roughness.uasset
#	Content/Mavis/Textures/Exterior/ulyobjsn_4K_Roughness.uasset
#	Content/Mavis/Textures/Exterior/umejfjwfw_4K_AO.uasset
#	Content/Mavis/Textures/Exterior/umejfjwfw_4K_Roughness.uasset

...

This commit is contained in:

Lenta_Mebiusa

2021-06-23 16:42:51 +05:00

parent f63c5985e3

commit 9ef979d92f

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/Mavis/Materials/Interior/uh1lafuv_2K_Albedo.uasset~HEAD

BIN

Binary file not shown.

Content/Mavis/Materials/Interior/uh1lafuv_2K_Albedo.uasset~c94e050da43385aaef3cf0e8a60f45bbf2c74ba3

BIN

Binary file not shown.

Content/Mavis/Meshes/Interior/Furniture/Textures/T_fabric_5_BC.uasset~HEAD

BIN

Binary file not shown.

Content/Mavis/Meshes/Interior/Furniture/Textures/T_fabric_5_BC.uasset~c94e050da43385aaef3cf0e8a60f45bbf2c74ba3

BIN

Binary file not shown.

Content/Mavis/Textures/Exterior/T_Bricks_dark_4K_AO.uasset~HEAD

BIN

Binary file not shown.

Content/Mavis/Textures/Exterior/T_Bricks_dark_4K_AO.uasset~c94e050da43385aaef3cf0e8a60f45bbf2c74ba3

BIN

Binary file not shown.

Content/Mavis/Textures/Exterior/T_Bricks_light_4K_AO.uasset~HEAD

BIN

Binary file not shown.

Content/Mavis/Textures/Exterior/T_Bricks_light_4K_AO.uasset~c94e050da43385aaef3cf0e8a60f45bbf2c74ba3

BIN

Binary file not shown.

Content/Mavis/Textures/Exterior/T_Parking_Door_4K_Albedo.uasset~HEAD

BIN

Binary file not shown.

Content/Mavis/Textures/Exterior/T_Parking_Door_4K_Albedo.uasset~c94e050da43385aaef3cf0e8a60f45bbf2c74ba3

BIN

Binary file not shown.

Content/Mavis/Textures/Exterior/T_Parking_Door_4K_Roughness.uasset~HEAD

BIN

Binary file not shown.

Content/Mavis/Textures/Exterior/T_Parking_Door_4K_Roughness.uasset~c94e050da43385aaef3cf0e8a60f45bbf2c74ba3

BIN

Binary file not shown.

Content/Meshes/Yard/SM_Curb_012.uasset

BIN

Binary file not shown.

Content/Meshes/Yard/SM_Curb_013.uasset

BIN

Binary file not shown.

Content/Meshes/Yard/SM_Curb_014.uasset

BIN

Binary file not shown.

Content/Meshes/Yard/SM_Curb_015.uasset

BIN

Binary file not shown.

Content/Meshes/Yard/SM_Curb_016.uasset

BIN

Binary file not shown.