Commit Graph

21 Commits

Author SHA1 Message Date
GRAFF 04fa78ebdb Merge branch 'master' of http://192.168.1.163:3000/Dron/NorthBaniASS 2022-10-31 14:27:24 +05:00
GRAFF ee5fec8ee8 типа осталось интерьеры 2022-10-31 14:27:18 +05:00
Andrew 7375563b02 Окно About 2022-10-30 17:04:25 +05:00
GRAFF be630415bc инфраструктура ок 2022-10-30 02:04:37 +05:00
GRAFF 4f60bb96a5 Merge branch 'master' of http://192.168.1.163:3000/Dron/NorthBaniASS
# Conflicts:
#	Content/Blueprints/UI/Widgets/Submenu/Infrastruct.uasset
#	Content/Blueprints/UI/Widgets/Submenu/Search.uasset
2022-10-28 21:00:59 +05:00
GRAFF 6030d09a7a заебся 2022-10-28 20:53:28 +05:00
Andrew b71a0d865f Автопрез, мелкие фиксы 2022-10-28 20:52:10 +05:00
GRAFF 09de277dfb еще всякое 2022-10-28 19:05:00 +05:00
Andrew c9f256c2bf Merge remote-tracking branch 'origin/master'
# Conflicts:
#	Content/Blueprints/UI/Actors/InfraPoint.uasset
#	Content/Maps/Main.umap
#	Content/Maps/points/points.umap
2022-10-28 18:48:25 +05:00
Andrew 860ec414a8 Пойнты инфраструктуры 2022-10-28 18:46:38 +05:00
GRAFF 56ec4c2a62 Merge branch 'master' of http://192.168.1.163:3000/Dron/NorthBaniASS
# Conflicts:
#	Content/Blueprints/UI/Widgets/Elements/Compass.uasset
#	Content/Blueprints/UI/Widgets/Elements/MenuBtn.uasset
#	Content/Blueprints/UI/Widgets/Elements/styledText.uasset
#	Content/Blueprints/UI/Widgets/Marker/Point.uasset
#	Content/Blueprints/UI/Widgets/Submenu/Infrastruct.uasset
#	Content/Blueprints/UI/Widgets/menu/mainMenu.uasset
#	Content/Maps/Main.umap
2022-10-28 16:02:16 +05:00
GRAFF 4ffd553bf0 всякое 2022-10-28 16:01:33 +05:00
Andrew e84a14f3b4 Прекол пойнта 2022-10-28 14:56:53 +05:00
Andrew 9eb55f6a95 Дополнения интерфейса 2022-10-28 13:55:37 +05:00
GRAFF 2b948ad749 всякое 2022-10-27 23:16:46 +05:00
GRAFF e9b67ccba3 Merge branch 'master' of http://192.168.1.163:3000/Dron/NorthBaniASS
# Conflicts:
#	Content/Blueprints/UI/Widgets/menu/mainMenu.uasset
2022-10-27 20:34:56 +05:00
GRAFF a7fee139a0 всякое поднастроено, поинты расставлены вилл и кластеров 2022-10-27 20:34:32 +05:00
Andrew 19899cdb49 Интерфейс 2022-10-27 20:18:01 +05:00
Andrew c07625eda4 Интерфейс 2022-10-26 20:07:55 +05:00
Andrew 68aaa937ef Начало интерфеса (Маркеры готовы) 2022-10-22 19:02:53 +05:00
PC-G06 22a247287a Interior_Test _LVL 2022-10-17 15:08:25 +05:00