Commit Graph

335 Commits

Author SHA1 Message Date
GRAFF 021f17ec14 подсказки для дэбилов, динамическая занятость паркинга 2023-04-18 23:54:16 +05:00
GRAFF ad09afdd07 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-18 19:48:02 +05:00
GRAFF 0592a75fd1 crm 2023-04-18 19:47:15 +05:00
PC-G13 08f876253f волюмы +- в парковке 2023-04-18 19:18:38 +05:00
PC-G13 2a16cb21b2 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-18 18:59:26 +05:00
PC-G13 f7f30ddb2e gp2(1). refl, f09 2023-04-18 18:59:22 +05:00
PC-G12 3dacd83855 Gar_Age_Vol_Metric 2023-04-18 17:16:14 +05:00
GRAFF 293b1fd603 Передвинутые таблички хат 2023-04-18 12:31:20 +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-G12 b18ce1310e CM1 2023-04-17 20:09:55 +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
DESKTOP-8J0BKKD\Admin a45e5bec93 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-17 18:39:44 +05:00
DESKTOP-8J0BKKD\Admin ff03798fcf Окна на балкон 2023-04-17 18:39:39 +05:00
PC-G04 54f600be32 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-17 17:42:52 +05:00
PC-G04 8a20648ad1 Двери в минимализме 6-7 этаж 2023-04-17 17:42:46 +05:00
GRAFF 2f00a69449 settings fix 2023-04-17 17:07:24 +05:00
PC-G04 0aaad79018 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-17 16:58:29 +05:00
PC-G04 a89c0fd890 Открыла двери в ГП1, в "уютном минимализме",все этажи, кроме 9 2023-04-17 16:58:20 +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
PC-G13 d6c1a82858 фыв 2023-04-17 14:29:43 +05:00
GRAFF d096264ebd PENISSSS 2023-04-15 05:42:46 +05:00
GRAFF b4c1cbba0e vbg 2023-04-15 04:45:52 +05:00
GRAFF 47b7b9cf2d Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-15 03:42:01 +05:00
GRAFF c3b6f86c03 kryshki 2023-04-15 03:41:55 +05:00
PC-G09 cbe7b65046 ГОРКА ЕБОБАНАЯ ДА 2023-04-15 03:12:51 +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 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
PC-G09 41ef8c98f0 Fasade lightning 2023-04-15 01:40:49 +05:00
GRAFF 40c9442e72 Навигация 2023-04-15 01:16:09 +05:00
GRAFF 49c38ab317 eads 2023-04-14 22:12:09 +05:00
PC-G09 9dda2cd2cf Nightlight 2023-04-14 21:24:06 +05:00
PC-G13 a43158969d Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-14 21:05:29 +05:00
PC-G13 1287a8f4bf oboi v odnoi kv 2023-04-14 21:05:24 +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 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 15e85320ba двери в мопах подвинуты 2023-04-14 17:03:27 +05:00
PC-G13 566846a81f probe gp2s03a03 2023-04-14 16:17:44 +05:00
PC-G13 c917638ab9 fade dveri 2023-04-14 15:39:06 +05:00
PC-G13 d51c9bdb51 fadesu 2023-04-14 15:19:19 +05:00
PC-G13 a14beaea09 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-14 15:10:31 +05:00
PC-G13 7ad0ff0502 коллизии, немного пробок, пара шейдеров, 2023-04-14 15:10:13 +05:00