Dron/lifeResidence
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
423 Commits 3 Branches 1 Tag
2f00a69449c0cbcb4e30c2ef43aaaef2d46e7e6d
Commit Graph

82 Commits

Author SHA1 Message Date
GRAFF 2f00a69449 settings fix 2023-04-17 17:07:24 +05:00
GRAFF 3b97d8cc6d screenshot 2023-04-17 17:00: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 98c1c297e7 Несломанный фэйд 2023-04-15 04:57:06 +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 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 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 a492b2b3a1 UI 2023-04-14 11:52:00 +05:00
GRAFF a8650d5c6b Карта двери 2023-04-14 08:26:43 +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 0d79764d99 Паркинг норм, пойнт начала 2023-04-14 02:09:37 +05:00
GRAFF 2d6cd94b34 Пойнты комнат 2023-04-14 01:39:10 +05:00
GRAFF 06c39e6cb4 Пойнт инфра 2023-04-14 00:16:04 +05:00
GRAFF 5ac0c6757d Всякое 2023-04-14 00:02:23 +05:00
GRAFF f1bbb6ee2d Расположение на этаже 2023-04-13 22:40:36 +05:00
GRAFF 2ecf5d7dca elev 2023-04-13 21:29:33 +05:00
GRAFF 4d07e8fa46 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 
# Conflicts:
#	Content/Blueprints/UI/Widgets/KPWidget.uasset
 2023-04-13 20:21:34 +05:00
GRAFF 143f36bc4b asd 2023-04-13 20:21:04 +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 9e2be0ce6f tags 2023-04-13 13:45:00 +05:00
GRAFF 19c3a0990b Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 
# Conflicts:
#	Content/Blueprints/UI/Widgets/KPWidget.uasset
 2023-04-12 21:20:30 +05:00
GRAFF 2bb2b0a84e some 2023-04-12 21:20:02 +05:00
GRAFF f7e86141e8 Половина КП сверстано, сеттер в пойнте 2023-04-12 18:54:44 +05:00
GRAFF d16ceac50f UI: картинки и данные 2023-04-12 15:41:48 +05:00
GRAFF 0fced1917a async loading plans 2023-04-11 20:59:31 +05:00
GRAFF cfd05910ae xml continue 2023-04-11 20:29:27 +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 de12f57cd1 Очередной юай фихс 2023-04-07 18:50:51 +05:00