Commit Graph

23 Commits

Author SHA1 Message Date
Andrew c2f5d4cb5d Фикс инфо 2022-10-07 15:43:34 +05:00
GRAFF 8b5196c5fd Merge branch 'master' of http://192.168.1.163:3000/Dron/EtisalatCOD
# Conflicts:
#	Content/Blueprints/UI/Widgets/Submenu/Info.uasset
2022-10-07 15:39:50 +05:00
GRAFF 94d016b64d еще подправил малость 2022-10-07 15:39:11 +05:00
Andrew 6ebc77a34d Фиксы 2022-10-07 15:37:09 +05:00
GRAFF a93fcc00a8 Merge branch 'master' of http://192.168.1.163:3000/Dron/EtisalatCOD 2022-10-07 13:43:08 +05:00
JohnnyHatchet 583a3c5b7c Говноделим 2022-10-07 10:43:33 +05:00
GRAFF 2a91d95554 Merge branch 'master' of http://192.168.1.163:3000/Dron/EtisalatCOD
# Conflicts:
#	Content/Blueprints/UI/Widgets/Elements/switch.uasset
#	Content/Blueprints/UI/Widgets/More/Settings.uasset
#	Content/Meshes/Exterior/SM_COD_Aim.uasset
2022-10-06 19:12:53 +05:00
GRAFF 30637ab97d ходилка 2022-10-06 19:12:16 +05:00
Andrew 64bb5dbc89 Фиксы интерфейса 2022-10-06 18:15:46 +05:00
Andrew 8a000c1534 Fix switch 2022-10-06 15:31:47 +05:00
Andrew 3de81dde3f Merge remote-tracking branch 'origin/master' 2022-10-06 14:54:32 +05:00
Andrew 5461f92eed Дополнение интерфейса 2022-10-06 14:54:20 +05:00
JohnnyHatchet 337f1aef09 Up 2022-10-06 14:32:18 +05:00
Andrew 5e10ed8b8d Доработка ползунка на автопрезентации 2022-10-06 11:29:14 +05:00
Andrew a9eb3ef083 Нормальный ползунок на слайдере автопрезентации 2022-10-06 11:19:09 +05:00
GRAFF 95511cbf2a dlss, интерфейс встроен, всё готово для показа 2022-10-06 02:23:33 +05:00
Andrew 6bb03cd1ae Merge remote-tracking branch 'origin/master'
# Conflicts:
#	Content/Blueprints/UI/Widgets/menu/mainMenu.uasset
2022-10-05 19:16:44 +05:00
Andrew 3fc35fa023 Интерфейс (немного недоделанный) 2022-10-05 19:06:41 +05:00
GRAFF ae4caac618 Merge branch 'master' of http://192.168.1.163:3000/Dron/EtisalatCOD 2022-10-05 17:57:39 +05:00
GRAFF 6fa9588896 sky, structs, pawn 2022-10-05 17:57:18 +05:00
JohnnyHatchet a8c2e6efc7 Поихали 2022-10-05 17:51:37 +05:00
GRAFF 0d720410d1 шрифты и пачка мигрейта 2022-10-03 18:40:42 +05:00
GRAFF 2be0f45413 نحن في القرف 2022-09-30 12:53:08 +05:00