Commit Graph

234 Commits

Author SHA1 Message Date
Lenta_Mebiusa 9719698a32 Редактирование внешки. Добавил светофоры, знаки, ограждение дороги 2019-02-14 10:18:21 +05:00
Maxim 3bf2e9cdd8 Merge branch 'master' of http://192.168.1.163:3000/Maxim/Airport46 2019-02-12 19:17:47 +05:00
Maxim 2803a43c71 доп 2019-02-12 19:17:42 +05:00
Maxim e4042d2673 Правка окна 2019-02-12 19:12:27 +05:00
Lenta_Mebiusa 2c03d94968 Merge branch 'master' of http://192.168.1.163:3000/Maxim/Airport46
# Conflicts:
#	Content/Levels/Environment.umap
2019-02-12 18:35:31 +05:00
Lenta_Mebiusa 88ce28a4ae Редактирование внешки 2019-02-12 18:34:49 +05:00
Maxim 5eab59854e Различные правки интерьера 2019-02-12 18:24:41 +05:00
Zheka3777123 0efd60185f Merge branch 'master' of http://192.168.1.163:3000/Maxim/Airport46
# Conflicts:
#	Content/Levels/Turn1_Level1.umap
#	Content/Levels/Turn1_Level2.umap
#	Content/Levels/Turn3_Level2.umap
2019-02-12 18:08:58 +05:00
Zheka3777123 e9dd45e77b Правки интерьеров 2019-02-12 18:08:29 +05:00
Maxim 7a993232af Merge branch 'master' of http://192.168.1.163:3000/Maxim/Airport46
# Conflicts:
#	Content/Levels/Turn1_Level1.umap
#	Content/Levels/Turn1_Level2.umap
#	Content/Levels/Turn2_Level1.umap
#	Content/Levels/Turn2_Level2.umap
#	Content/Levels/Turn3_Level1.umap
#	Content/Levels/Turn3_Level2.umap
2019-02-12 18:04:57 +05:00
Maxim c757a36017 тест 2019-02-12 18:04:09 +05:00
Maxim 8dc4f86854 Добавлены раздвижные двери 2019-02-12 18:02:30 +05:00
Zheka3777123 d894775ba3 опустил 2 этажы 2019-02-12 16:35:52 +05:00
Zheka3777123 4acdf8a85c изменений по 3 секции 2019-02-12 16:32:17 +05:00
Zheka3777123 fd448d668c правка интерьеров 2019-02-12 14:24:43 +05:00
Maxim dcfdd5e842 Мелкие правки 2019-02-12 11:51:56 +05:00
Maxim dfb79cc3d8 Отредактирован экстерьер зданий 2019-02-12 11:26:44 +05:00
Maxim 347b37d0b7 Merge branch 'master' of http://192.168.1.163:3000/Maxim/Airport46 2019-02-12 11:14:04 +05:00
Maxim 0ad919fdca тест 2019-02-12 11:14:00 +05:00
Lenta_Mebiusa b473dc1cf4 Редактирование внешки 2019-02-11 20:53:59 +05:00
Maxim f84bf5256e Добавлены декали на первые этажи интерьеров 2019-02-11 19:26:04 +05:00
Maxim 9ffd5a4119 правки кубмап 2019-02-11 18:15:08 +05:00
Maxim 68967e4ffb Merge branch 'master' of http://192.168.1.163:3000/Maxim/Airport46
# Conflicts:
#	Content/Levels/Turn2_Level1.umap
2019-02-11 18:11:13 +05:00
Maxim db48657d35 тест 2019-02-11 18:10:48 +05:00
Maxim 7fee6625ef Правка декалей 2019-02-11 18:05:23 +05:00
Zheka3777123 141fecb64d исправление интерьеров 2019-02-11 18:01:31 +05:00
Lenta_Mebiusa 887f3d8303 Merge branch 'master' of http://192.168.1.163:3000/Maxim/Airport46
# Conflicts:
#	Content/BP_Tools/BP_S2F2Exterior.uasset
#	Content/BP_Tools/BP_S3F2Exterior.uasset
2019-02-11 11:22:42 +05:00
Lenta_Mebiusa b0c36bbe56 Редактирование внешки 2019-02-11 11:22:01 +05:00
Maxim 6827aa1f60 Merge remote-tracking branch 'origin/master' 2019-02-08 19:33:31 +05:00
Maxim caa0477a15 тест 2019-02-08 19:33:11 +05:00
Zheka3777123 9dbdee448b Merge branch 'master' of http://192.168.1.163:3000/Maxim/Airport46
# Conflicts:
#	Content/BP_Tools/BP_S3F1Exterior.uasset
#	Content/Levels/Environment.umap
2019-02-08 19:26:21 +05:00
Zheka3777123 6eac5dd9de тест 2019-02-08 19:25:28 +05:00
Zheka3777123 48a15796fd Изменены кубмапы 2019-02-08 19:23:32 +05:00
Lenta_Mebiusa d4b8c4d453 Merge branch 'master' of http://192.168.1.163:3000/Maxim/Airport46
# Conflicts:
#	Content/BP_Tools/BP_S3F1Exterior.uasset
#	Content/Levels/Environment.umap
#	Content/Meshes/Environment/SM_Grass_001.uasset
#	Content/Meshes/Environment/SM_Sidewalk.uasset
2019-02-08 18:47:56 +05:00
Lenta_Mebiusa 42fa410826 Редактирование внешки 2019-02-08 18:33:20 +05:00
Maxim 7901871ad7 Изменены кубмапы 2019-02-08 18:19:53 +05:00
Maxim 477b4f4b91 Merge branch 'master' of http://192.168.1.163:3000/Maxim/Airport46
# Conflicts:
#	Content/Levels/Turn2_Level2copy.umap
#	Content/Levels/Turn2_Level2copy_BuiltData.uasset
2019-02-08 17:51:59 +05:00
Maxim 54d9cdd6d2 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	Content/Levels/Environment.umap
2019-02-08 17:46:11 +05:00
Maxim 11b5c11b05 Разные правки 2019-02-08 17:41:20 +05:00
Zheka3777123 cc91a008da Merge branch 'master' of http://192.168.1.163:3000/Maxim/Airport46 2019-02-08 17:35:27 +05:00
Zheka3777123 96deb5a2e3 Добавлены кубмапы 2019-02-08 17:31:42 +05:00
Lenta_Mebiusa 55717bca1e Редактирование внешки 2019-02-08 13:23:30 +05:00
Maxim 83bd676768 Merge branch 'master' of http://192.168.1.163:3000/Maxim/Airport46 2019-02-08 11:19:26 +05:00
Maxim 801fd48eec Merge remote-tracking branch 'origin/master' 2019-02-08 11:19:03 +05:00
Lenta_Mebiusa e383c37b6f Merge branch 'master' of http://192.168.1.163:3000/Maxim/Airport46 2019-02-08 11:18:18 +05:00
Lenta_Mebiusa c30b3308f0 Изменение параметров у окон внешки 2019-02-08 11:17:57 +05:00
Maxim eedf30dd78 Удалены старые кубмапы 2019-02-08 11:17:44 +05:00
Zheka3777123 f929384431 Merge branch 'master' of http://192.168.1.163:3000/Maxim/Airport46 2019-02-08 10:40:30 +05:00
Zheka3777123 fae74f71d1 изменение лестниц 2019-02-08 10:37:39 +05:00
Lenta_Mebiusa 729ef53440 Merge branch 'master' of http://192.168.1.163:3000/Maxim/Airport46 2019-02-08 10:33:59 +05:00