Commit Graph

76 Commits

Author SHA1 Message Date
JohnnyHatchet 4473dc58ab Вороновское коллизии 2022-07-29 21:22:23 +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
GRAFF 131d7156ea Merge branch 'master' of http://192.168.1.163:3000/Dron/GefestMskZdrav into developer
# Conflicts:
#	Content/Maps/MainScene.umap
2022-07-28 13:15:34 +05:00
GRAFF d3b2c50c65 хуй 2022-07-28 13:07:40 +05:00
JohnnyHatchet b5023923fb cor 2022-07-28 13:06:38 +05:00
DESKTOP-8J0BKKD\Admin 53fcb9ab13 Loginovo_Exterior 2022-07-28 12:59:39 +05:00
JohnnyHatchet 1a8a94f960 Main Scene colors 2022-07-28 12:55:47 +05:00
JohnnyHatchet 12cac1cd4b Склифосовский 2022-07-28 11:37:18 +05:00
PC-G06 f0f71d0d7c Merge branch 'master' of http://192.168.1.163:3000/Dron/GefestMskZdrav
# Conflicts:
#	Content/Maps/Voronovskoe/Exterior/Voronovskoe_Exterior.umap
2022-07-27 20:58:14 +05:00
PC-G06 1f72610461 SSK_Sklif_and_Voronoskoe 2022-07-27 20:44:29 +05:00
GRAFF 388dee1f60 Merge branch 'master' of http://192.168.1.163:3000/Dron/GefestMskZdrav 2022-07-27 20:31:34 +05:00
GRAFF 0ef4837a10 folyaga_Loginova 2022-07-27 20:31:31 +05:00
DESKTOP-8J0BKKD\Admin 9514bfbc8d Loginova_Exterior 2022-07-27 19:45:31 +05:00
DESKTOP-8J0BKKD\Admin 78519152dd Merge branch 'master' of http://192.168.1.163:3000/Dron/GefestMskZdrav
# Conflicts:
#	Content/Maps/Loginova/Exterior/Loginova_Exterior.umap
2022-07-27 16:20:02 +05:00
DESKTOP-8J0BKKD\Admin 67b9a5fc5e Loginova_Exterior 2022-07-27 16:18:31 +05:00
PC-G12 677ad47e80 Plants_FN_fix 2022-07-27 16:07:54 +05:00
PC-G12 62a9b54e98 Plants_05 2022-07-27 16:00:11 +05:00
PC-G12 ce414d6bc8 Merge branch 'master' of http://192.168.1.163:3000/Dron/GefestMskZdrav 2022-07-27 15:58:27 +05:00
PC-G12 8074ebfd9f Plants_04 2022-07-27 15:55:40 +05:00
GRAFF be2ffdcd06 Merge branch 'master' of http://192.168.1.163:3000/Dron/GefestMskZdrav 2022-07-27 15:37:15 +05:00
GRAFF cd7c215c9a log_int 2022-07-27 15:35:17 +05:00
PC-G12 3ce56aee7f Plants_03 2022-07-27 15:34:35 +05:00
PC-G12 fe657edb0e Plants_02 2022-07-27 15:31:41 +05:00
PC-G12 fed16868a9 Plants_01 2022-07-27 15:29:27 +05:00
GRAFF 7001c494b1 Merge branch 'master' of http://192.168.1.163:3000/Dron/GefestMskZdrav into developer 2022-07-27 14:15:20 +05:00
GRAFF e25c2cc5cd до 3д всё работает 2022-07-27 14:13:46 +05:00
JohnnyHatchet 9a9576eeff Немножк 2022-07-27 09:02:52 +05:00
JohnnyHatchet b4f823ccc6 Дмитровское интерьеры 2022-07-27 08:06:42 +05:00
GRAFF ae849b805c еще всякого 2022-07-26 19:46:48 +05:00
JohnnyHatchet e3c828cd53 Всякое хуякое 2022-07-26 19:41:07 +05:00