Commit Graph

38 Commits

Author SHA1 Message Date
GRAFF d36a74969d houses 2023-04-19 15:17:25 +05:00
GRAFF 0592a75fd1 crm 2023-04-18 19:47:15 +05:00
GRAFF 6d51d79d1a navigation, managers 2023-04-18 00:28:40 +05:00
GRAFF 65a7ff26cd Managerы 2023-04-15 04:28:51 +05:00
GRAFF a1b6d018ab аааа 2023-04-15 04:10:26 +05:00
GRAFF d10cbd0325 Фикс слайдерв 2023-04-15 01:25:22 +05:00
GRAFF 40c9442e72 Навигация 2023-04-15 01:16:09 +05:00
GRAFF 8af34d71da Прощальное окно 2023-04-14 22:13:40 +05:00
GRAFF 3209d09300 Infra 2023-04-14 20:09:20 +05:00
GRAFF e05184f603 аааААААА 2023-04-14 17:30:08 +05:00
GRAFF be06323bbc нет дерганьям! 2023-04-14 03:04:00 +05:00
GRAFF cb4166b402 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
# Conflicts:
#	Content/Maps/Points.umap
2023-04-14 02:39:29 +05:00
GRAFF f9df855339 someShitElse, dragfix 2023-04-14 02:38:55 +05:00
GRAFF 5ac0c6757d Всякое 2023-04-14 00:02:23 +05:00
GRAFF f1bbb6ee2d Расположение на этаже 2023-04-13 22:40:36 +05:00
GRAFF 1177bb7012 Отправка говна в конце сеанса, картинки планов, сало, мёд, говно и гвозди 2023-04-13 19:37:23 +05:00
GRAFF 35a1ab2a5d Паркинг, пойнты, свободные места, менеджеры 2023-04-13 18:13:15 +05:00
GRAFF 279fc14b8b КП, УТП 2023-04-13 15:25:31 +05:00
GRAFF d16ceac50f UI: картинки и данные 2023-04-12 15:41:48 +05:00
GRAFF 09fb067dc0 UI 2023-04-11 18:09:27 +05:00
GRAFF f0f5417bd3 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	Content/Blueprints/UI/Widgets/Point/Marker.uasset
2023-04-10 18:56:33 +05:00
GRAFF bdb454fd74 Очередной юай 2023-04-10 18:53:53 +05:00
GRAFF 860bc35dae Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
# Conflicts:
#	Content/Blueprints/Lamp/Interior_Konserva/BP_InteriorLamp_FloorLamp_1.uasset
#	Content/Blueprints/Lamp/Interior_Konserva/BP_InteriorLamp_Lamp_1.uasset
#	Content/Blueprints/Lamp/Interior_Konserva/BP_InteriorLamp_Lamp_2.uasset
#	Content/Blueprints/Lamp/Interior_Konserva/BP_InteriorLamp_Lamp_3.uasset
#	Content/Blueprints/Lamp/Interior_Konserva/BP_InteriorLamp_Lamp_4.uasset
#	Content/Blueprints/Lamp/Interior_Konserva/BP_InteriorLamp_Pedant_light_013.uasset
#	Content/Blueprints/Lamp/Interior_Lounge/BP_InteriorLamp_Aplomb_Large.uasset
#	Content/Blueprints/Lamp/Interior_Lounge/BP_InteriorLamp_Chandelier_Modo.uasset
#	Content/Blueprints/Lamp/Interior_Lounge/BP_InteriorLamp_Cyl_Lounge.uasset
#	Content/Blueprints/Lamp/Interior_Lounge/BP_InteriorLamp_Cylindr_Res.uasset
#	Content/Blueprints/Lamp/Interior_Lounge/BP_InteriorLamp_bedroom_LR.uasset
#	Content/Blueprints/Lamp/Interior_Minimalism/BP_InteriorLamp_1_minimalism.uasset
#	Content/Blueprints/Lamp/Interior_Minimalism/BP_InteriorLamp_2_Minimal.uasset
#	Content/Blueprints/Lamp/Interior_Minimalism/BP_InteriorLamp_Bathroom_Minimal.uasset
#	Content/Blueprints/Lamp/Interior_Minimalism/BP_InteriorLamp_Chicago.uasset
#	Content/Blueprints/Lamp/Interior_Minimalism/BP_InteriorLamp_Cyl_Minimal.uasset
#	Content/Blueprints/Lamp/Interior_Minimalism/BP_InteriorLamp_Pendant_Crouise.uasset
#	Content/Blueprints/UI/Widgets/Search/Search.uasset
#	Content/Materials/Interior/MI_Door_Res.uasset
2023-04-10 17:15:30 +05:00
GRAFF c8e761042f источники света, людишки, тачилки, правки мастермата и эмиссив 2023-04-10 17:14:08 +05:00
GRAFF 815a35b3a2 UI fix 2023-04-06 17:25:15 +05:00
GRAFF 9e520cbbcc Navigation 2023-04-05 17:56:37 +05:00
GRAFF 1f27bd9e7f UI fix 2023-04-04 19:08:36 +05:00
GRAFF 156c25d7d9 infra 2023-03-30 18:49:40 +05:00
GRAFF 7086d62b62 UI косяки 2023-03-15 15:31:47 +05:00
GRAFF ec6ba9f009 Косяки 2023-03-14 13:47:27 +05:00
GRAFF 07ab032280 UI 2023-03-13 18:51:21 +05:00
Andrew 9189422494 UI почти полность рабочий поиск 2023-03-03 18:42:45 +05:00
Andrew db80853699 UI 2023-03-02 12:39:03 +05:00
Andrew 62bec319cd Some UI shit 2023-02-13 18:51:28 +05:00
Andrew 4f5cdf9372 Interface fixs 2023-01-17 14:51:01 +05:00
Andrew 648d23c1a6 Interface 2023-01-16 15:28:17 +05:00
PC-G09 25bd1cb25f Куча 2023-01-16 13:47:19 +05:00
GRAFF b51aec9480 LEtsGOOOOOO 2023-01-16 13:17:51 +05:00