Commit Graph

13 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
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
GRAFF 492f546d2d уй блять ну и хуета с анрилом. работаем 2022-09-14 16:53:40 +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