483 Commits

Author SHA1 Message Date
PC-G13 5f2f615bd3 svet 2023-04-06 00:19:39 +05:00
PC-G13 ddf8ac22ca Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
# Conflicts:
#	Content/Maps/Interior/GP1/MOP/S01/MOP_GP1_S01_F02-08.umap
#	Content/Maps/Interior/GP1/MOP/S01/MOP_GP1_S01_F02.umap
#	Content/Maps/Interior/GP1/MOP/S02/MOP_GP1_S02_F02-08.umap
#	Content/Maps/Interior/GP1/MOP/S02/MOP_GP1_S02_F02.umap
#	Content/Maps/Interior/GP1/MOP/S03/MOP_GP1_S03_F02-08.umap
#	Content/Maps/Interior/GP1/MOP/S03/MOP_GP1_S03_F02.umap
#	Content/Maps/Interior/GP1/MOP/S04/MOP_GP1_S04_F02-08.umap
#	Content/Maps/Interior/GP1/MOP/S04/MOP_GP1_S04_F02.umap
#	Content/Maps/Interior/GP2/MOP/S01/MOP_GP2_S01_F02-08.umap
#	Content/Maps/Interior/GP2/MOP/S01/MOP_GP2_S01_F02.umap
#	Content/Maps/Interior/GP2/MOP/S02/MOP_GP2_S02_F02-08.umap
#	Content/Maps/Interior/GP2/MOP/S02/MOP_GP2_S02_F02.umap
#	Content/Maps/Interior/GP2/MOP/S03/MOP_GP2_S03_F02-08.umap
#	Content/Maps/Interior/GP2/MOP/S03/MOP_GP2_S03_F02.umap
#	Content/Maps/Interior/GP2/MOP/S04/MOP_GP2_S04_F02-08.umap
#	Content/Maps/Interior/GP2/MOP/S04/MOP_GP2_S04_F02.umap
2023-04-06 00:15:35 +05:00
PC-G13 12910a7cb5 мопснейм 2023-04-06 00:14:32 +05:00
GRAFF 88f371b950 ales 2023-04-05 23:33:53 +05:00
GRAFF 1b81e3ef0b RENAMING, highlights mats, loading shits 2023-04-05 23:31:22 +05:00
PC-G13 d50e9650ff Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-05 21:52:33 +05:00
PC-G13 fe625b0cb8 GP1_S01_A01,A02,A04 2023-04-05 21:52:29 +05:00
GRAFF 3845cff740 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-05 21:44:09 +05:00
GRAFF fc107fafaa поинты, загрузка леваков 2023-04-05 21:44:07 +05:00
PC-G09 b528c870e2 Съезд, скамейки, урны, пешики в генплан 2023-04-05 21:17:47 +05:00
PC-G12 01479c0c53 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-05 21:11:03 +05:00
PC-G12 cd9a426769 4_4 2023-04-05 21:10:46 +05:00
PC-G13 d801ace418 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-05 21:10:35 +05:00
PC-G13 d8ece8e3c0 sm 2023-04-05 21:10:32 +05:00
PC-G04 b9d9e7283c Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-05 20:43:59 +05:00
PC-G04 29a05b2f35 BP_Lamp_KoservaTism 2023-04-05 20:43:43 +05:00
GRAFF 5b0e4a7016 Merge remote-tracking branch 'origin/master' 2023-04-05 20:38:40 +05:00
GRAFF 2a28f7ed55 Fix ui 2023-04-05 20:38:20 +05:00
PC-G13 06a71d96a3 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-05 20:12:07 +05:00
PC-G13 f2130fa05f mops 2023-04-05 20:12:00 +05:00
GRAFF 70e2bd61eb Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-05 19:41:53 +05:00
GRAFF 315130da3e data 2023-04-05 19:41:46 +05:00
PC-G09 08c2678901 Тачки в Айваз 2023-04-05 19:33:56 +05:00
DESKTOP-8J0BKKD\Admin a8ad099c61 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-05 18:38:24 +05:00
DESKTOP-8J0BKKD\Admin 33d1ce886b GP1_S01_A00 2023-04-05 18:38:20 +05:00
PC-G09 d06b634ccf Внешка (Дома фикс, тратуар, бордюры , тачки на парковке Айваза) 2023-04-05 18:24:24 +05:00
GRAFF 9e520cbbcc Navigation 2023-04-05 17:56:37 +05:00
DESKTOP-8J0BKKD\Admin 6340329e55 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-05 17:12:26 +05:00
DESKTOP-8J0BKKD\Admin cb1a270010 GP1_S01_A04 2023-04-05 17:12:23 +05:00
PC-G08 1d2bd21cd7 MOPbl 2023-04-05 14:32:15 +05:00
PC-G12 a70a61ee5b Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-05 14:20:09 +05:00
PC-G12 bf358be6be Parking 2023-04-05 14:17:52 +05:00
PC-G04 3eb39b4c4f Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-05 13:01:11 +05:00
PC-G04 0d431cc716 Lamps_Lounge
Interiors
2023-04-05 12:57:01 +05:00
PC-G09 de97cf28c1 Фуляга 2023-04-05 08:17:11 +05:00
PC-G09 5cc5a84967 Фуляга 2023-04-05 05:10:59 +05:00
GRAFF 6989443365 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-04 20:51:36 +05:00
GRAFF 9b9102a9a8 люди, тачки 2023-04-04 20:51:17 +05:00
PC-G08 080f4951f3 MopsLightsDoors 2023-04-04 19:20:12 +05:00
maximpkt 7af66401d8 MopDoorBP 2023-04-04 19:15:47 +05:00
GRAFF 1f27bd9e7f UI fix 2023-04-04 19:08:36 +05:00
PC-G13 ce17fc6fab andabitagain 2023-04-04 15:44:18 +05:00
PC-G13 fc899fdfc6 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
# Conflicts:
#	Content/Maps/MainBuildings.umap
2023-04-04 15:07:47 +05:00
PC-G13 219be8cfc0 fasades 2023-04-04 15:07:24 +05:00
PC-G08 499a487fec mopDoorLvlsLamp 2023-04-04 14:52:33 +05:00
DESKTOP-8J0BKKD\Admin 65cce63b94 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-04 13:11:49 +05:00
DESKTOP-8J0BKKD\Admin 7497b7f070 GP1_S03_A02 2023-04-04 13:11:44 +05:00
PC-G04 e7ff409578 Плинтуса ГП2 2023-04-04 12:53:54 +05:00
PC-G04 29fdbb3d74 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-04 12:05:00 +05:00
PC-G04 20195aeb4a BP_Lamps,Interiors 2023-04-04 12:04:38 +05:00