Commit Graph

174 Commits

Author SHA1 Message Date
GRAFF bdeeba47cd parking pointers, back btn fix 2023-04-19 16:39:03 +05:00
GRAFF d36a74969d houses 2023-04-19 15:17:25 +05:00
GRAFF 0ea116fe1c Фикс пойнта 2023-04-19 12:52:35 +05:00
GRAFF 021f17ec14 подсказки для дэбилов, динамическая занятость паркинга 2023-04-18 23:54:16 +05:00
GRAFF 0592a75fd1 crm 2023-04-18 19:47:15 +05:00
GRAFF 2fb17b19c4 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
# Conflicts:
#	Content/Maps/MainBuildings.umap
2023-04-18 00:30:39 +05:00
GRAFF 6d51d79d1a navigation, managers 2023-04-18 00:28:40 +05:00
PC-G13 739ede701b Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-17 19:39:37 +05:00
PC-G13 ddbbe039eb gp2(1) 2023-04-17 19:39:29 +05:00
GRAFF 80c4f59bab Пойнт для мопов 2023-04-17 18:08:16 +05:00
GRAFF 75b7e77d0a Merge remote-tracking branch 'origin/master' 2023-04-17 17:49:03 +05:00
GRAFF d3455dce85 Попытка с менеджерами 2023-04-17 17:48:50 +05:00
GRAFF 2f00a69449 settings fix 2023-04-17 17:07:24 +05:00
GRAFF 62485be625 Merge remote-tracking branch 'origin/master' 2023-04-17 17:00:31 +05:00
GRAFF 3b97d8cc6d screenshot 2023-04-17 17:00:08 +05:00
PC-G09 a619cbf5e5 Fix lightning 2023-04-17 16:52:08 +05:00
GRAFF b0fdee419f Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-17 16:08:08 +05:00
GRAFF 18d2ac6a2b light empruve 2023-04-17 16:08:02 +05:00
GRAFF 12f8dc045b Doorcard 2023-04-17 15:28:16 +05:00
GRAFF d096264ebd PENISSSS 2023-04-15 05:42:46 +05:00
GRAFF 772898ef13 Merge remote-tracking branch 'origin/master' 2023-04-15 04:57:45 +05:00
GRAFF 98c1c297e7 Несломанный фэйд 2023-04-15 04:57:06 +05:00
GRAFF b4c1cbba0e vbg 2023-04-15 04:45:52 +05:00
GRAFF 65a7ff26cd Managerы 2023-04-15 04:28:51 +05:00
GRAFF 804809c05c Merge remote-tracking branch 'origin/master'
# Conflicts:
#	Content/Blueprints/UI/Widgets/SubMenu/Submenu.uasset
2023-04-15 04:11:37 +05:00
GRAFF a1b6d018ab аааа 2023-04-15 04:10:26 +05:00
GRAFF c3b6f86c03 kryshki 2023-04-15 03:41:55 +05:00
GRAFF 3109c53ab7 FFFFUUUU and fasad emiss 2023-04-15 03:07:22 +05:00
GRAFF 5b855b5620 sad 2023-04-15 02:38:58 +05:00
GRAFF 3aae119e82 Norm cylinder 2023-04-15 02:32:05 +05:00
GRAFF 51e1b41035 no drdrdrdr 2023-04-15 02:22:22 +05:00
GRAFF a4887d4313 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
# Conflicts:
#	Content/Blueprints/UI/Widgets/Menu/mainMenu.uasset
#	Content/Blueprints/UI/Widgets/Search/Search.uasset
#	Content/Blueprints/UI/Widgets/SubMenu/Submenu.uasset
#	Content/Maps/MainBuildings.umap
#	Content/Maps/NightLight.umap
#	Content/Maps/Points.umap
#	Content/Maps/mainScene.umap
2023-04-15 01:55:00 +05:00
GRAFF c6895d99a7 HUY 2023-04-15 01:52:21 +05:00
GRAFF d10cbd0325 Фикс слайдерв 2023-04-15 01:25:22 +05:00
GRAFF 40c9442e72 Навигация 2023-04-15 01:16:09 +05:00
GRAFF eac1cdc57f Merge remote-tracking branch 'origin/master' 2023-04-14 22:14:00 +05:00
GRAFF 8af34d71da Прощальное окно 2023-04-14 22:13:40 +05:00
GRAFF 49c38ab317 eads 2023-04-14 22:12:09 +05:00
PC-G09 fd2cb665c1 Nightlight 2023-04-14 20:49:55 +05:00
GRAFF 661f5d60b3 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
# Conflicts:
#	Content/Blueprints/UI/Widgets/Elements/flatMapWithNavi.uasset
2023-04-14 20:19:05 +05:00
GRAFF 56cc7aac7b blyat 2023-04-14 20:18:41 +05:00
GRAFF 7cc2c0aaeb flat recognize, some stuff, floor highlight, hide shit, reaneme 2023-04-14 20:18:23 +05:00
GRAFF 3209d09300 Infra 2023-04-14 20:09:20 +05:00
PC-G09 5e1203da25 Nightlight yard 2023-04-14 18:53:26 +05:00
PC-G13 604c026bd3 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-14 17:33:13 +05:00
PC-G13 f75d64e791 bpdoor sign 2023-04-14 17:32:12 +05:00
GRAFF e05184f603 аааААААА 2023-04-14 17:30:08 +05:00
PC-G13 f0bdf06d13 streetlamp BP 2023-04-14 16:36:00 +05:00
GRAFF 16d6b4f4b0 фыв 2023-04-14 14:10:42 +05:00
GRAFF a492b2b3a1 UI 2023-04-14 11:52:00 +05:00