Commit Graph

96 Commits

Author SHA1 Message Date
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-G13 d801ace418 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-05 21:10:35 +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 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
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
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
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-G08 080f4951f3 MopsLightsDoors 2023-04-04 19:20:12 +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
DESKTOP-8J0BKKD\Admin d2338a1195 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-03 19:15:48 +05:00
DESKTOP-8J0BKKD\Admin 47b34b4a99 некоторые хаты из GP1 2023-04-03 19:15:45 +05:00
PC-G08 53c8aef926 Mops 2023-04-03 19:10:44 +05:00
PC-G12 07e1c32ce0 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-03 16:58:49 +05:00
PC-G12 9a62df9dec Parkng_wip 2023-04-03 16:58:42 +05:00
PC-G04 de34946a67 F_GP1_S01_A02
F_GP1_S01_A03
F_GP1_S02_A01
2023-04-03 16:34:57 +05:00
PC-G04 255d2b3f4d Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-01 17:48:20 +05:00
PC-G04 3559766369 Irina 2023-04-01 17:48:13 +05:00
DESKTOP-8J0BKKD\Admin 3a131c6797 GP1_S03_A00-A04 2023-04-01 17:37:44 +05:00
DESKTOP-8J0BKKD\Admin dc03071d72 Добавление мешей стен в леваки GP2 2023-03-31 19:49:47 +05:00
PC-G04 92b7d1e8b1 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
# Conflicts:
#	Content/Maps/Interior/GP1/Walls/F02/S04/W_GP1_S04_F02_A03.umap
2023-03-31 18:00:35 +05:00
PC-G04 e59e700294 F_GP1_S04_A03 2023-03-31 18:00:04 +05:00
DESKTOP-8J0BKKD\Admin e0616289b4 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
# Conflicts:
#	Content/Maps/Interior/GP1/Walls/F02/S03/W_GP1_S03_F02_A03.umap
2023-03-31 17:57:52 +05:00
DESKTOP-8J0BKKD\Admin 3319b38459 Закинут меши стен полков и полов в леваки 2023-03-31 17:52:11 +05:00
PC-G08 b390c1922a gp1gp2Mops 2023-03-31 17:51:07 +05:00
PC-G04 3d33af9286 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-03-31 17:16:43 +05:00
PC-G04 1e101eadca F_GP1_S03_A03 2023-03-31 17:16:37 +05:00