Commit Graph

473 Commits

Author SHA1 Message Date
Andrew_Jr 48afbb5d7c NoLogin 2023-06-16 17:36:21 +05:00
GRAFF 52c9389f7b фыв 2023-04-20 16:10:31 +05:00
PC-G12 5b81dadfbf Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-19 19:26:10 +05:00
PC-G12 bf70ec631a Shading2 2023-04-19 19:25:45 +05:00
GRAFF 4c2db96cd5 DA EBANIY KARAS 2023-04-19 19:24:22 +05:00
GRAFF b959e85134 DA SUKA BLYAT 2023-04-19 19:07:11 +05:00
GRAFF a01f81e1c7 фих 2023-04-19 18:31:40 +05:00
GRAFF 434dc2f95a Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-19 16:39:15 +05:00
GRAFF bdeeba47cd parking pointers, back btn fix 2023-04-19 16:39:03 +05:00
PRAyMU 34bdf465fb Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-19 16:31:43 +05:00
PRAyMU 07f7f4ffb3 Carpet_Test_P1 2023-04-19 16:21:13 +05:00
GRAFF db987207ef Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-19 15:43:25 +05:00
PC-G13 692cd6da8e гл асс 2023-04-19 15:42:50 +05:00
GRAFF dc44a50de3 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-19 15:37:44 +05:00
PC-G13 e916b456b3 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-19 15:25:32 +05:00
PC-G13 d5cf45c6a1 gp1(2) rename refl,rebakejustincase, i para hat 2023-04-19 15:23:32 +05:00
GRAFF d36a74969d houses 2023-04-19 15:17:25 +05:00
GRAFF c48b36bd88 Merge remote-tracking branch 'origin/master' 2023-04-19 14:55:05 +05:00
GRAFF 182935259b Багули 2023-04-19 14:51:35 +05:00
PC-G09 6fe2ad9d18 Grass remake massives 2023-04-19 14:47:29 +05:00
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