Commit Graph

71 Commits

Author SHA1 Message Date
GRAFF 5057a27337 наконец то v1.0 2023-03-06 14:24:39 +05:00
GRAFF f726464c5b крышки, меши 2023-03-06 14:07:55 +05:00
Andrew ee0a28a290 Нет инфы у 2 зон 2023-03-05 20:40:18 +05:00
GRAFF 6b3b59bf32 лучше клитор соленый лизать чем такое 2023-03-05 04:17:43 +05:00
GRAFF c65204b9e2 podzapek, pobedil ao,eshe chtoto 2023-03-05 00:20:48 +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 7719264dfd asd 2023-03-04 13:45:35 +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 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
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-G08 4c7f5510c0 SB1 and AHUetRoom Interiors 2023-03-03 19:12:00 +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
Andrew dc57f08da4 починил сабменю в 3д туре 2023-03-03 12:01:28 +05:00
GRAFF e0dde4bff4 asfc 2023-03-02 21:35:21 +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
Andrew b1b7c72a97 UI под новый стэйт 2023-03-02 16:30:44 +05:00
GRAFF eb5a754588 стрелки с материалом декали, этажи допил 2023-03-02 16:07:10 +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 afed5d7857 G-048 2023-03-02 15:37:18 +05:00
GRAFF 620efba508 машинки 2023-03-02 13:25:24 +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
Andrew 6f2772b70c Dragger in all window 2023-03-01 18:48:55 +05:00
GRAFF 96048d8773 dragger widget 2023-03-01 18:33:30 +05:00
Andrew 1046f0942a Новое сабменю 2023-03-01 11:49:43 +05:00
JohnnyHatchet 7bfb6ebda6 Drups, Mech4_6 2023-02-28 20:44:23 +05:00
JohnnyHatchet 0453895402 Irina 2023-02-28 16:35:09 +05:00
Andrew a46b1ad9c7 Icon, UI fix 2023-02-28 14:44:20 +05:00
Andrew 8e90ed6771 Submenu 2023-02-28 13:38:59 +05:00
PC-G04 c0c000d54b Prayer_room 2022-12-16 19:10:10 +05:00
PC-G04 246629ee58 Cafeteria 2022-12-13 18:46:03 +05:00
GRAFF 2039b7c670 пиупиу 2022-10-10 23:55:42 +05:00
Andrew a5c6d5d419 Фиксы UI 2022-10-10 21:00:45 +05:00