154 Commits

Author SHA1 Message Date
GRAFF 4236965491 asd 2023-03-22 16:44:35 +05:00
JohnnyHatchet 1d29bcfb94 Merge branch 'master' of http://192.168.1.163:3000/Dron/EtisalatCOD 2023-03-06 19:25:22 +05:00
JohnnyHatchet d4f8e9b183 CrashRoom исправила запечку на нормальную 2023-03-06 19:25:18 +05:00
GRAFF 59b6bfb255 вот теперь точно v1.0 2023-03-06 17:49:17 +05:00
JohnnyHatchet d31f6e5c42 Исправила каки всякие 2023-03-06 16:36:16 +05:00
PC-G10 68d31748a0 potolok G001 2023-03-06 15:45:33 +05:00
GRAFF 5057a27337 наконец то v1.0 2023-03-06 14:24:39 +05:00
GRAFF f726464c5b крышки, меши 2023-03-06 14:07:55 +05:00
PC-G10 ca89107928 CapWall SB1 F1 2023-03-06 12:01:04 +05:00
Andrew ee0a28a290 Нет инфы у 2 зон 2023-03-05 20:40:18 +05:00
PC-G10 213e4343c1 kpp outside 2023-03-05 13:45:02 +05:00
GRAFF 6b3b59bf32 лучше клитор соленый лизать чем такое 2023-03-05 04:17:43 +05:00
GRAFF c82fbc0327 Merge branch 'master' of http://192.168.1.163:3000/Dron/EtisalatCOD 2023-03-05 00:20:50 +05:00
GRAFF c65204b9e2 podzapek, pobedil ao,eshe chtoto 2023-03-05 00:20:48 +05:00
JohnnyHatchet 6a4baa21f7 bake 2023-03-05 00:13:26 +05:00
PC-G10 c83203db7d GR 2023-03-04 23:47:29 +05:00
JohnnyHatchet 87b46ddd4b Generator room 2023-03-04 23:04:50 +05:00
JohnnyHatchet 723fb22669 Merge branch 'master' of http://192.168.1.163:3000/Dron/EtisalatCOD 2023-03-04 22:43:23 +05:00
JohnnyHatchet a722d84573 Половина запечки, Gas room на месте 2023-03-04 22:43:17 +05:00
GRAFF af3a381410 Merge branch 'master' of http://192.168.1.163:3000/Dron/EtisalatCOD
# Conflicts:
#	Content/Maps/Interiors/COD_G-001.umap
#	Content/Maps/Interiors/Cafeteria.umap
2023-03-04 22:26:10 +05:00
GRAFF 422f28acbd фыв 2023-03-04 22:25:01 +05:00
JohnnyHatchet f928df4560 Merge branch 'master' of http://192.168.1.163:3000/Dron/EtisalatCOD 2023-03-04 21:03:51 +05:00
JohnnyHatchet dfab0330d3 пше 2023-03-04 21:03:44 +05:00
GRAFF bac010736c Merge branch 'master' of http://192.168.1.163:3000/Dron/EtisalatCOD 2023-03-04 20:47:49 +05:00
GRAFF ddaeb1a8cd фпф 2023-03-04 20:47:46 +05:00
JohnnyHatchet a9540493ed Gas_Cylinder_room 2023-03-04 15:21:42 +05:00
GRAFF 7703ba249b Merge branch 'master' of http://192.168.1.163:3000/Dron/EtisalatCOD 2023-03-04 13:45:56 +05:00
GRAFF 7719264dfd asd 2023-03-04 13:45:35 +05:00
JohnnyHatchet 6f713e5bff Merge branch 'master' of http://192.168.1.163:3000/Dron/EtisalatCOD
# Conflicts:
#	Content/Maps/Interiors/Gas_Cylinder_Room_1.umap
2023-03-04 13:20:19 +05:00
JohnnyHatchet 0657073a8f Gas 2023-03-04 13:19:48 +05:00
GRAFF 093dc4992e Merge branch 'master' of http://192.168.1.163:3000/Dron/EtisalatCOD
# Conflicts:
#	Content/Meshes/Interior/Gas_Cylinder_Room/Meshes/SM_GCR_Communications.uasset
#	Content/Meshes/Interior/Generator_Room/Meshes/SM_Generator_Room.uasset
#	Content/Meshes/Interior/MAIN_LV_ROOM/Meshes/SM_Main_LV_Room.uasset
#	Content/Meshes/Interior/MAIN_LV_ROOM/Meshes/sm_power_left.uasset
#	Content/Meshes/Interior/MAIN_LV_ROOM/Meshes/sm_power_right.uasset
2023-03-04 01:37:42 +05:00
GRAFF 36a89acde3 хобот у слона, но вагина то у овцы. у меня всё готово 2023-03-04 01:32:28 +05:00
JohnnyHatchet ae27be30ae Всё запеклось, кроме Generator Room, коллизии исправила какие нашла 2023-03-04 01:25:51 +05:00
JohnnyHatchet 9679c5d711 000 2023-03-03 23:50:51 +05:00
JohnnyHatchet a774e9e507 Merge branch 'master' of http://192.168.1.163:3000/Dron/EtisalatCOD 2023-03-03 23:48:29 +05:00
JohnnyHatchet 3a554fc27d Edit More Levels 2023-03-03 23:45:37 +05:00
GRAFF 4c5a39a7b9 Merge branch 'master' of http://192.168.1.163:3000/Dron/EtisalatCOD
# Conflicts:
#	Content/Blueprints/UI/Widgets/Submenu/Submenu_PointOfInterest.uasset
2023-03-03 21:55:25 +05:00
GRAFF 3ad7737bc5 aa 2023-03-03 21:54:28 +05:00
FavoredBag ef4feaf9c0 Merge branch 'master' of http://192.168.1.163:3000/Dron/EtisalatCOD 2023-03-03 21:46:19 +05:00
FavoredBag 3e6f7b785b LV Room 2023-03-03 21:46:15 +05:00
JohnnyHatchet 19bfd7291b Merge branch 'master' of http://192.168.1.163:3000/Dron/EtisalatCOD 2023-03-03 21:25:03 +05:00
JohnnyHatchet 4d5686f372 ИРИНА 2023-03-03 21:24:28 +05:00
PC-G10 d033d1663a Generator Room 2023-03-03 21:10:04 +05:00
JohnnyHatchet 882fdaf325 Fire_Pump 2023-03-03 20:50:26 +05:00
JohnnyHatchet 0ad4fbadb3 Merge branch 'master' of http://192.168.1.163:3000/Dron/EtisalatCOD
# Conflicts:
#	Content/Meshes/Interior/Gas_Cylinder_Room/Meshes/SM_GCR_Communications.uasset
#	Content/Meshes/Interior/Gas_Cylinder_Room/Meshes/SM_GCR_Cylinders.uasset
#	Content/Meshes/Interior/Gas_Cylinder_Room/Meshes/SM_GCR_Room.uasset
2023-03-03 19:31:50 +05:00
JohnnyHatchet 04b1db8188 OpenOffice,Mechanical4,Firepump,GasCylinder 2023-03-03 19:30:49 +05:00
PC-G10 b4b32cb5b2 SCR P2 2023-03-03 19:29:56 +05:00
PC-G08 4c7f5510c0 SB1 and AHUetRoom Interiors 2023-03-03 19:12:00 +05:00
PC-G10 5a9c457e18 reception eb ego rot 2023-03-03 19:02:11 +05:00
PC-G10 efa961a1cd GCR P1 2023-03-03 18:31:08 +05:00