Commit Graph

451 Commits

Author SHA1 Message Date
PC-G12 5224a15578 Shading 2023-04-19 13:51:26 +05:00
GRAFF 0ea116fe1c Фикс пойнта 2023-04-19 12:52:35 +05:00
GRAFF 121029d384 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-18 23:55:03 +05:00
GRAFF 021f17ec14 подсказки для дэбилов, динамическая занятость паркинга 2023-04-18 23:54:16 +05:00
PC-G12 da1518e1ff Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-18 19:58:12 +05:00
PC-G12 3502a681fd 2 2023-04-18 19:58:05 +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
PC-G12 a069c8ac5e Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-18 14:37:23 +05:00
PC-G12 8956ceada9 С2 2023-04-18 14:37:16 +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-G12 68090f1d7a Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
# Conflicts:
#	Content/Maps/MainBuildings.umap
#	Content/Meshes/MainBuildings/SM_GP1_S01.uasset
#	Content/Meshes/MainBuildings/SM_GP1_S02.uasset
#	Content/Meshes/MainBuildings/SM_GP1_S03.uasset
#	Content/Meshes/MainBuildings/SM_GP1_S04.uasset
#	Content/Meshes/MainBuildings/SM_GP2_S1.uasset
#	Content/Meshes/MainBuildings/SM_GP2_S2.uasset
#	Content/Meshes/MainBuildings/SM_GP2_S3.uasset
#	Content/Meshes/MainBuildings/SM_GP2_S4.uasset
2023-04-17 20:08:47 +05:00
PC-G12 957196479d CM 2023-04-17 20:02:53 +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
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
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
PC-G09 fe6c356a18 Test lighten foliage 2023-04-17 17:18:52 +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-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
GRAFF efd86d0535 Merge remote-tracking branch 'origin/master' 2023-04-17 15:28:38 +05:00
GRAFF 12f8dc045b Doorcard 2023-04-17 15:28:16 +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 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 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