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

# Conflicts:
#	Content/Maps/Landscape.umap
#	Content/Materials/Instances/MI_RMA_Fasad_RAL_6028.uasset
#	Content/Materials/Instances/MI_RMA_Fasad_RAL_9003.uasset

2022-01-31 18:07:39 +05:00

..

Interiors

Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer

2022-01-31 18:07:39 +05:00

Landscape_sharedassets

Сборка

2021-12-07 12:55:31 +05:00

L_Lighting.umap

Naberejnaya playground

2022-01-18 17:48:24 +05:00

Landscape.umap

всякий кал

2022-01-31 18:07:11 +05:00

Main_Building.umap

Outside update + add Furniture (meshes + mat)

2022-01-21 11:01:31 +05:00

MainScene.umap

всякий кал

2022-01-31 18:07:11 +05:00

MainSceneMigrate.umap

Naberejnaya playground

2022-01-18 17:48:24 +05:00

OutsideHolo.umap

пачка всякого

2021-12-13 18:15:08 +05:00

test.umap

всякий кал

2022-01-31 18:07:11 +05:00

WaterTestMap_BuiltData.uasset

Сборка

2021-12-07 12:55:31 +05:00

WaterTestMap.umap

Сборка

2021-12-07 12:55:31 +05:00