Commit Graph

4 Commits

Author SHA1 Message Date
GRAFF 21dfaf79d1 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer 2022-01-10 17:11:41 +05:00
PC-G09 2d0976c8bd Add floors 2022-01-10 15:58:44 +05:00
GRAFF 54f6561b7d Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer
# Conflicts:
#	Content/Maps/Landscape.umap
#	Content/Maps/MainSceneMigrate.umap
#	Content/Materials/Instances/NewMaterial_day_good.uasset
#	Content/Meshes/water.uasset
2021-12-21 13:34:40 +05:00
GRAFF 0d8781d6aa защита, подвижки всякие 2021-12-17 21:41:07 +05:00