Andron666 1c06aa5181 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer ...

# Conflicts:
#	Content/Materials/Instances/Asphalt/MI_Asphalt.uasset
#	Content/Materials/Instances/Bricks/MI_Bricks_Gray11.uasset
#	Content/Materials/Instances/Concrete/MI_Concrete_BrightGray.uasset
#	Content/Materials/Instances/Concrete/MI_Concrete_DarkGray.uasset
#	Content/Materials/Instances/Metal/MI_Metal_Black.uasset
#	Content/Materials/Masharov_Interior/Palette/MI_Emissive_0_Power_Warm.uasset

2022-09-19 20:28:47 +05:00

..

Bench

1

2022-03-31 15:20:23 +05:00

Brick

1

2022-03-31 15:20:23 +05:00

Concrete

1

2022-03-31 15:20:23 +05:00

Floor_Pavement

1

2022-03-31 15:20:23 +05:00

Foliage

1

2022-03-31 15:20:23 +05:00

Glass

1

2022-03-31 15:20:23 +05:00

Ground

1

2022-03-31 15:20:23 +05:00

instancied_Mat

коллизии всякие, интерфейс, косячки

2022-07-13 17:52:29 +05:00

Master_Materials

parking

2022-09-19 19:41:24 +05:00

Metal

1

2022-03-31 15:20:23 +05:00

PBG_Default_Material

1

2022-03-31 15:20:23 +05:00

Road

оптимизация тачек, лендскейпа, починки всякие, интерфейс, инкрементный фильтр

2022-09-09 22:40:47 +05:00

Road_Asphalt

Parkink

2022-09-19 14:30:23 +05:00

Special

1

2022-03-31 15:20:23 +05:00

Telephone

1

2022-03-31 15:20:23 +05:00

Wood

1

2022-03-31 15:20:23 +05:00

M_Wires_Inst.uasset

1

2022-03-31 15:20:23 +05:00