Commit Graph

80 Commits

Author SHA1 Message Date
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
JohnnyHatchet a6864b33f5 Merge branch 'master' of http://192.168.1.163:3000/Dron/EtisalatCOD 2023-03-03 13:39:14 +05:00
JohnnyHatchet ebb7282ae4 Office 2023-03-03 13:38:57 +05:00
GRAFF fc0d761c55 Merge branch 'master' of http://192.168.1.163:3000/Dron/EtisalatCOD 2023-03-02 21:35:31 +05:00
GRAFF e0dde4bff4 asfc 2023-03-02 21:35:21 +05:00
PC-G10 760bef231c FuelPumpRoom 2023-03-02 20:03:19 +05:00
GRAFF 671314d82f Merge branch 'master' of http://192.168.1.163:3000/Dron/EtisalatCOD
# Conflicts:
#	Content/Blueprints/UI/Widgets/More/dragger.uasset
#	Content/Blueprints/UI/Widgets/Submenu/Submenu_PointOfInterest.uasset
#	Content/Blueprints/UI/Widgets/menu/mainMenu.uasset
#	Content/Maps/COD_Buildings.umap
2023-03-02 19:46:42 +05:00
GRAFF afa3cebec2 vsakoe 2023-03-02 19:45:47 +05:00
PC-G09 0df1e2f07f Фасады 2023-03-02 18:30:52 +05:00
JohnnyHatchet 3e63b05234 Merge branch 'master' of http://192.168.1.163:3000/Dron/EtisalatCOD 2023-03-02 16:59:57 +05:00
JohnnyHatchet 785e8de395 G046,G036,G074,Drups,Crash(CRUH) 2023-03-02 16:59:50 +05:00
GRAFF 1c20ecf9a2 Merge branch 'master' of http://192.168.1.163:3000/Dron/EtisalatCOD 2023-03-02 16:07:14 +05:00
GRAFF eb5a754588 стрелки с материалом декали, этажи допил 2023-03-02 16:07:10 +05:00
PC-G10 d9d35ddf7a Etisalat Equipment Room 2023-03-02 16:05:15 +05:00
JohnnyHatchet 830f8cacd3 Merge branch 'master' of http://192.168.1.163:3000/Dron/EtisalatCOD 2023-03-02 16:04:46 +05:00
JohnnyHatchet 0f1a11d5f1 GSM_Room 2023-03-02 16:04:39 +05:00
GRAFF 118294c96d Merge branch 'master' of http://192.168.1.163:3000/Dron/EtisalatCOD
# Conflicts:
#	Content/Maps/COD_Buildings.umap
2023-03-02 15:57:57 +05:00
GRAFF 229e50a71f добавил стейт новый и поинт этажей 2023-03-02 15:57:31 +05:00
JohnnyHatchet e50049daf8 Merge branch 'master' of http://192.168.1.163:3000/Dron/EtisalatCOD 2023-03-02 15:57:23 +05:00
JohnnyHatchet b725d780cd Domestic_Water_Pump_Room 2023-03-02 15:57:18 +05:00
PC-G09 2828566d3a Окно, генплан 2023-03-02 15:38:52 +05:00
JohnnyHatchet 8f97fb3326 Merge branch 'master' of http://192.168.1.163:3000/Dron/EtisalatCOD 2023-03-02 15:37:25 +05:00
JohnnyHatchet afed5d7857 G-048 2023-03-02 15:37:18 +05:00
PC-G09 1e2a223ca7 Тачки на парковку 2023-03-02 14:26:15 +05:00
JohnnyHatchet 3d94443f0b PrayerRoom_Domestic 2023-03-02 14:17:36 +05:00
PC-G09 3a6bed5408 приперчил немног домов + подсолил декаль 2023-03-02 08:11:24 +05:00
PC-G09 64bd543c32 New landscape + decal 2023-03-02 06:34:10 +05:00
JohnnyHatchet 16123c3fbb Merge branch 'master' of http://192.168.1.163:3000/Dron/EtisalatCOD
# Conflicts:
#	Content/Maps/Interiors/Domestic_Water_Pump_Room.umap
2023-03-01 20:27:27 +05:00
JohnnyHatchet 091256ad65 Edit Levels 2023-03-01 20:26:46 +05:00
PC-G08 01f60d9170 SB1GroundFloor_Interiror 2023-03-01 20:05:13 +05:00
PC-G10 b9f644c2ad Main_LV_Room 2023-03-01 18:45:55 +05:00
PC-G10 b2ba20f530 DWPR FPR Opusheni 2023-03-01 16:11:40 +05:00
JohnnyHatchet 7bfb6ebda6 Drups, Mech4_6 2023-02-28 20:44:23 +05:00
PC-G08 96efd6f023 SB1GroundFloor interior 2023-02-28 17:08:15 +05:00
JohnnyHatchet 0453895402 Irina 2023-02-28 16:35:09 +05:00
Andrew a579db96c8 Merge remote-tracking branch 'origin/master' 2023-02-28 13:39:18 +05:00
Andrew 8e90ed6771 Submenu 2023-02-28 13:38:59 +05:00
PC-G10 6861e0bdbe FPR EER M_LV_R 2023-02-27 18:30:06 +05:00
PC-G10 ca3e75c755 G_001 Fuel_Pump_Room Open_office Consumer_MV_Switchgear_Room 2023-02-21 18:49:26 +05:00
PC-G10 2e93498423 MR 4 6 GSMR G001 2023-01-30 20:04:48 +05:00
PC-G10 2455e330ca Mechanical_Room_4 6 and Domestic_Water_Pump_Room SM and T 2023-01-24 17:24:36 +05:00
PC-G10 330b60ba2b Open Office P3 2023-01-13 21:00:43 +05:00
PC-G10 7d770dcda2 Open Office P2 2022-12-30 13:11:01 +05:00