20 Commits

Author SHA1 Message Date
Dron 42c4b73a6a удалил кучу лишней хуйни 2019-12-18 21:37:13 +05:00
AndreiZaitsev 3837234a5d убрал подвалы 2019-12-07 18:55:40 +05:00
AndreiZaitsev d455ad6297 правки домов и пристроев 2019-12-05 04:47:24 +05:00
Zheka3777123 6bcfed71c7 настроил материалы стен 2019-10-28 22:04:29 +05:00
AndreiZaitsev 93af700ee6 крыши 2019-10-28 17:49:16 +05:00
Dron c0c3c30243 триллион правок 2019-10-28 00:20:34 +05:00
Dron 20203463d2 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA
# Conflicts:
#	Content/Level/Building1.umap
#	Content/Level/Environment.umap
#	Content/Level/Index.umap
#	Content/Level/S2F1.umap
#	Content/Level/S2F2.umap
#	Content/Meshes/Building_3/SM_Bld4_Anex_Windows.uasset
#	Content/Meshes/Building_3/SM_S01_F01_Windows.uasset
#	Content/Meshes/Building_3/SM_S02_F01_Outside.uasset
#	Content/Meshes/Building_3/SM_S02_F01_Windows.uasset
#	Content/Meshes/Building_3/SM_S02_F02_Outside.uasset
#	Content/Meshes/Building_3/SM_S02_F03_Outside.uasset
#	Content/Meshes/Building_3/SM_S03_F01_Outside.uasset
#	Content/Meshes/Building_3/SM_S03_F01_Windows.uasset
#	Content/Meshes/Building_3/SM_S03_F02_Outside.uasset
#	Content/Meshes/Building_3/SM_S03_F03_Outside.uasset
#	Content/Meshes/Building_3/SM_S03_F03_Windows.uasset
#	Content/Meshes/interior/SM_S2_F1_Corridor_Door.uasset
#	Content/Meshes/interior/SM_S2_F1_Corridor_Door001.uasset
2019-10-27 22:54:04 +05:00
Dron b0bdc055da дохуя всего, рабочий интерфейс 2019-10-27 22:52:15 +05:00
Zheka3777123 c6b2a7e75a добавил домики 2019-10-27 16:23:43 +05:00
Zheka3777123 2c60240a17 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA
# Conflicts:
#	Content/Level/Building_2.umap
#	Content/Meshes/Building2/SM_S02_Outside.uasset
#	Content/Meshes/Building2/SM_S03_Outside.uasset
2019-10-27 11:51:28 +05:00
Zheka3777123 b9c0aa1ebe получаю 2019-10-27 11:50:47 +05:00
AndreiZaitsev 87d10ed223 Дома, дома, дома 2019-10-27 04:34:15 +05:00
AndreiZaitsev aa4784994a Допилка 3го дома 2019-10-26 21:25:35 +05:00
AndreiZaitsev f1c739b326 Настройка текстур дома 2019-10-26 16:45:06 +05:00
AndreiZaitsev 4a09a47cc8 ДОм, дом, дом 2019-10-25 21:05:59 +05:00
AndreiZaitsev 81e0bbfb96 Настройка дома 2019-10-25 19:59:37 +05:00
AndreiZaitsev 689eb2cc44 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA
# Conflicts:
#	Content/Level/Building_3.umap
#	Content/Level/Lights.umap
2019-10-25 17:49:47 +05:00
AndreiZaitsev 12dde15389 Поправил развертку 2019-10-25 17:49:09 +05:00
Zheka3777123 e12796a179 добавил мебель в S2F2 2019-10-25 15:27:11 +05:00
AndreiZaitsev 1d8285baf2 Добавил 3 дом 2019-10-25 04:00:03 +05:00