Commit Graph

104 Commits

Author SHA1 Message Date
JohnnyHatchet 6cfdf81c3c Всякое 2022-07-31 16:21:28 +05:00
GRAFF 446a9658e4 уцуцуцуцуц 2022-07-31 15:09:08 +05:00
GRAFF 4253659d38 пиздец конечно 2022-07-30 21:28:19 +05:00
GRAFF d7a68e4db5 Merge branch 'master' of http://192.168.1.163:3000/Dron/GefestMskZdrav 2022-07-30 20:04:30 +05:00
GRAFF a6c5f83185 пздц 2022-07-30 20:04:24 +05:00
JohnnyHatchet fdabaaf5fa Филатова, цвета насыщеней 2022-07-30 18:37:58 +05:00
JohnnyHatchet a59730979c Вороновское деревья 2022-07-30 18:34:51 +05:00
JohnnyHatchet b50c9499a8 Направление воды ИКБ 2022-07-30 18:02:30 +05:00
GRAFF a734715319 АААААААААААААААААААААА 2022-07-30 17:19:31 +05:00
GRAFF 7786c5e50b Merge branch 'master' of http://192.168.1.163:3000/Dron/GefestMskZdrav 2022-07-30 09:12:12 +05:00
GRAFF 75dc0c1872 FFFFFFFFAAAAAAAAAAAAA 2022-07-30 09:12:03 +05:00
JohnnyHatchet 18e31501b6 Ходилка Логинова + фикс зфайта склиф 2022-07-30 05:37:48 +05:00
GRAFF 3e43d41291 Merge branch 'master' of http://192.168.1.163:3000/Dron/GefestMskZdrav 2022-07-30 04:42:25 +05:00
JohnnyHatchet acc591b171 Починил альфу + цветки 2022-07-30 04:35:59 +05:00
GRAFF 8e045f3b59 Merge branch 'master' of http://192.168.1.163:3000/Dron/GefestMskZdrav 2022-07-30 04:02:48 +05:00
GRAFF 5111ad255d ety 2022-07-30 04:02:43 +05:00
JohnnyHatchet dd89f815be Логинова фикс 2022-07-30 03:53:54 +05:00
GRAFF ee177206f2 Merge branch 'master' of http://192.168.1.163:3000/Dron/GefestMskZdrav
# Conflicts:
#	Content/Maps/SSK_Skif/Interior/SSK_Skif_Interior_02.umap
2022-07-30 02:09:45 +05:00
GRAFF 73cce5661d adasd 2022-07-30 02:09:28 +05:00
JohnnyHatchet 7adfbf26f2 Печка + постпроцессы в интерьеры 2022-07-30 02:08:49 +05:00
GRAFF 664aae8347 AAAAAA BLYAT 2022-07-30 01:11:20 +05:00
GRAFF 50d812b420 Merge branch 'master' of http://192.168.1.163:3000/Dron/GefestMskZdrav into developer 2022-07-30 01:01:26 +05:00
GRAFF 464fe81f7c AAAAAAAAAA 2022-07-30 01:01:18 +05:00
JohnnyHatchet 9e55b415e3 Points + Placers 2022-07-30 00:42:44 +05:00
GRAFF dfbf30d810 Merge branch 'master' of http://192.168.1.163:3000/Dron/GefestMskZdrav 2022-07-29 21:35:59 +05:00
GRAFF f5e5686fc9 ads 2022-07-29 21:33:45 +05:00
JohnnyHatchet 4473dc58ab Вороновское коллизии 2022-07-29 21:22:23 +05:00
GRAFF bcd5b5207d Merge branch 'master' of http://192.168.1.163:3000/Dron/GefestMskZdrav into developer 2022-07-29 20:30:19 +05:00
GRAFF c7e8810099 разъебал корявые текстуры 2022-07-29 20:29:44 +05:00
PC-G06 bff5a9ae84 Merge branch 'master' of http://192.168.1.163:3000/Dron/GefestMskZdrav
# Conflicts:
#	Content/Meshes/Voronovskoe/Exterior/Mat/MI_Glass_Clear_TS.uasset
2022-07-29 20:22:31 +05:00
PC-G06 032edfb74f Voronovskoe_Ext 2022-07-29 20:20:34 +05:00
JohnnyHatchet 0a3850264a Коллизии в интерьеры 2022-07-29 20:11:16 +05:00
JohnnyHatchet 909ac3b9c4 Выпилил херню дома с мойна + коллизии в экстерьерах 2022-07-29 18:40:53 +05:00
GRAFF 83bdb4ba0a Merge branch 'master' of http://192.168.1.163:3000/Dron/GefestMskZdrav into developer
# Conflicts:
#	Content/Maps/IKB_1/Exterior/IKB_1_Exterior.umap
#	Content/Maps/Loginova/Exterior/Loginova_Exterior.umap
#	Content/Maps/SSK_Filatova/Exterior/SSK_Filatova_Exterior.umap
#	Content/Maps/SSK_Skif/Exterior/SSK_Skif_Exterior.umap
2022-07-29 17:54:10 +05:00
GRAFF 4802912c68 АУФ блять дохуя чего 2022-07-29 17:53:18 +05:00
JohnnyHatchet 411259a893 OSM fix 2022-07-29 14:39:15 +05:00
GRAFF d29dc1b0e0 Merge branch 'master' of http://192.168.1.163:3000/Dron/GefestMskZdrav into developer
# Conflicts:
#	Content/Maps/SSK_Botkina/Interior/SSK_Botkina_Interior_01.umap
#	Content/Maps/SSK_Botkina/Interior/SSK_Botkina_Interior_02.umap
2022-07-29 14:09:22 +05:00
PC-G06 01f31f98ee Voronovskoe 2022-07-29 12:39:41 +05:00
JohnnyHatchet 294309c4f2 Texture 2022-07-29 11:42:52 +05:00
JohnnyHatchet 9e30ffbf81 HDRI 2022-07-29 11:29:46 +05:00
GRAFF fe242b9d5c Merge branch 'master' of http://192.168.1.163:3000/Dron/GefestMskZdrav into developer 2022-07-29 11:27:50 +05:00
JohnnyHatchet 892f115488 Склифосовский 2й интереьер 2022-07-29 09:47:31 +05:00
GRAFF af0dec9ba4 Merge branch 'master' of http://192.168.1.163:3000/Dron/GefestMskZdrav into developer 2022-07-28 23:07:35 +05:00
GRAFF 224361c3f2 добавил длсс, весь интерфейс кажется готов. 2022-07-28 23:06:46 +05:00
JohnnyHatchet 95b59ccb5f hui 2022-07-28 21:10:22 +05:00
JohnnyHatchet f3367a1942 Светяхи 2022-07-28 20:49:49 +05:00
JohnnyHatchet b4fd35362b Позиции на карте 2022-07-28 19:20:38 +05:00
PC-G06 939ae472b7 Voronovskoe_Land 2022-07-28 18:30:06 +05:00
DESKTOP-8J0BKKD\Admin 5e0a6e616b Dmitrovskoe_Exterier 2022-07-28 17:31:39 +05:00
GRAFF fe431ecd12 Log_Levelsmerge 2022-07-28 17:05:28 +05:00