Commit Graph

27 Commits

Author SHA1 Message Date
GRAFF 57d8381cea Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi
# Conflicts:
#	Content/Blueprints/UI/Widgets/Elements/MenuBtn.uasset
#	Content/Blueprints/UI/Widgets/Elements/styledText.uasset
#	Content/Maps/Main_Scene.umap
2022-09-15 12:11:03 +05:00
GRAFF b1e3b836f9 keep going 2022-09-15 12:10:08 +05:00
JohnnyHatchet 7b1917b023 Перенос основания в лэндскейп из мэйна 2022-09-15 12:07:49 +05:00
Andrew 5def011966 menuBtn 2022-09-15 11:31:48 +05:00
GRAFF 68768cbc20 Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2022-09-14 20:44:37 +05:00
GRAFF 44809840ef продолжаем UI 2022-09-14 20:44:13 +05:00
GRAFF ad44fea373 да ебана 2022-09-14 18:08:08 +05:00
Andrew 33fbcb4e46 Merge remote-tracking branch 'origin/master' 2022-09-14 18:06:46 +05:00
Andrew e036430e49 Немного виджетов 2022-09-14 18:01:11 +05:00
JohnnyHatchet 4a9151d9cd Цвет зон по брендбуку + корректировка края 2022-09-14 17:01:22 +05:00
GRAFF e9d3154351 Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2022-09-14 16:54:09 +05:00
GRAFF 492f546d2d уй блять ну и хуета с анрилом. работаем 2022-09-14 16:53:40 +05:00
JohnnyHatchet f2987eba37 Zones 2022-09-14 16:08:36 +05:00
GRAFF 523dccfef4 Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2022-09-14 14:36:45 +05:00
GRAFF 3b00f89ecf пачка всякого хлама, интерфейс 2022-09-14 14:36:37 +05:00
Andrew c123af2e88 add infrapoint on level 2022-09-14 13:01:51 +05:00
GRAFF c702af2067 infrapoint 2022-09-13 17:32:25 +05:00
JohnnyHatchet 09c2a6fda5 part 5 2022-09-12 07:12:36 +05:00
JohnnyHatchet d6192811f0 part 4 2022-09-12 07:12:13 +05:00
JohnnyHatchet d46613765b part 3 2022-09-12 07:11:01 +05:00
JohnnyHatchet 92453f1906 part 2 2022-09-12 07:08:45 +05:00
JohnnyHatchet 9e5f9551b8 part 1 2022-09-12 07:07:26 +05:00
JohnnyHatchet b2dbac7c3f Лэндскейп + вода 2022-09-09 21:09:02 +05:00
JohnnyHatchet 45f2a7c65d Water Color 2022-09-09 02:35:56 +05:00
JohnnyHatchet 707feadecb Водные танцы 2022-09-09 02:16:57 +05:00
JohnnyHatchet 2e7cc80801 Сбарка главной сцены (Лендскейп) 2022-09-08 20:19:56 +05:00
JohnnyHatchet b8fa19eb27 Ultra sky + water 2022-09-07 20:08:09 +05:00