Andron666 0ba22bd555 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer ...

# Conflicts:
#	Content/Maps/Landscape.umap
#	Content/Materials/Instances/M_Plastic_RAL_716.uasset
#	Content/Materials/Master/M_RMA_Tile_Triplanar.uasset
#	Content/Meshes/test_import_SM_HouseTerritory.uasset
#	Content/SkatePark/Naberez_Model/fix/Yard/MI_Roof3.uasset

2022-02-28 11:11:22 +05:00

..

M_Asphalt_Inst1.uasset

Генпланы, набережная

2021-12-07 19:31:20 +05:00

M_Asphalt_Inst2.uasset

ходилка по всяким местам, сплайн-тачка

2022-02-28 11:09:32 +05:00

M_Asphalt_Inst3.uasset

Yards

2022-02-25 21:21:16 +05:00

M_Asphalt_Inst4.uasset

Набережная

2021-12-10 05:45:04 +05:00

M_Asphalt_Inst5.uasset

roads

2021-12-17 18:59:45 +05:00

M_Asphalt_Inst.uasset

Генпланы, набережная

2021-12-07 19:31:20 +05:00

M_Asphalt.uasset

ходилка по всяким местам, сплайн-тачка

2022-02-28 11:09:32 +05:00

M_Grass.uasset

GP4 GP5 Yard

2022-02-21 18:20:29 +05:00

MI_sand.uasset

Exterior + sofa mat

2022-02-16 15:40:16 +05:00

sjzkfega_2K_Albedo.uasset

Набережная

2021-12-10 05:45:04 +05:00

sjzkfega_2K_Normal.uasset

Набережная

2021-12-10 05:45:04 +05:00

sjzkfega_2K_Roughness.uasset

GP4 GP5 Yard

2022-02-21 18:20:29 +05:00