Commit Graph

9 Commits

Author SHA1 Message Date
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
PC-G09 df6c351602 Генпланы, парк, увеличение радиуса 2021-12-17 16:01:17 +05:00
GRAFF d2d7174e54 пачка всякого 2021-12-13 18:15:08 +05:00
GRAFF 89d92dad95 водичка, деревце, окошки, синева, центр карты 2021-12-10 14:49:59 +05:00
GRAFF 88d7be61c8 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer
# Conflicts:
#	Content/Materials/Instances/NewMaterial_day_good.uasset
#	Content/Materials/M_RMA_Tile_Master.uasset
#	Content/SpeedTree/Lipa/MI_Lipa_Leaf.uasset
2021-12-10 13:05:17 +05:00
PC-G09 d81a60cca7 Генплан школа 2021-12-10 12:29:19 +05:00
PC-G09 e569f81157 Перенос мастеров в мастеры, вода поинтересней вроде, Декаль спортивной прощадки за ГП 4 2021-12-10 02:41:03 +05:00
GRAFF d55e7528d1 еще правочки 2021-12-08 12:45:21 +05:00
PC-G09 40f70385c0 Сборка 2021-12-07 12:55:31 +05:00