Commit Graph

183 Commits

Author SHA1 Message Date
PC-G13 f7f30ddb2e gp2(1). refl, f09 2023-04-18 18:59:22 +05:00
DESKTOP-8J0BKKD\Admin ff03798fcf Окна на балкон 2023-04-17 18:39:39 +05:00
PC-G13 0c7030c262 tv 2023-04-14 20:13:00 +05:00
PC-G13 f75d64e791 bpdoor sign 2023-04-14 17:32:12 +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
GRAFF 16d6b4f4b0 фыв 2023-04-14 14:10:42 +05:00
PC-G13 41c6d29961 elevatoru. nomera dveri, nemnogokoliziu, meshi terras k fasady 2023-04-13 22:42:55 +05:00
PC-G13 bfd8b8c8e3 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
# Conflicts:
#	Content/Maps/Interior/GP2/MOP/S04/MOP_GP2_S04_F01.umap
2023-04-13 20:35:25 +05:00
PC-G13 db9e1ae5fe mops+volumetrics 2023-04-13 20:34:16 +05:00
PC-G04 b9b5457184 terrace 2023-04-13 19:53:05 +05:00
PC-G13 c9b5255164 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-13 16:46:53 +05:00
PC-G13 0d6e85d7c2 f09, svet, bp elevatora+meshes, parkingWIP, numbers meshes 2023-04-13 16:46:08 +05:00
DESKTOP-8J0BKKD\Admin 1c5ce702dc Мопы 2023-04-13 15:49:58 +05:00
PC-G13 c3c946b450 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
# Conflicts:
#	Content/Maps/Interior/GP1/MOP/S02/MOP_GP1_S02_F01.umap
#	Content/Maps/Interior/Parking/Parking_GP1.umap
#	Content/Maps/Interior/Parking/Parking_GP2.umap
2023-04-13 01:35:54 +05:00
PC-G13 ecbdca5039 smth 2023-04-13 01:33:46 +05:00
PRAyMU 8ff9627c0a Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-12 21:25:58 +05:00
PRAyMU fd9005cd2e S01_S02_F09 2023-04-12 21:25:49 +05:00
DESKTOP-8J0BKKD\Admin 6427c869f2 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-12 19:49:14 +05:00
DESKTOP-8J0BKKD\Admin 59543b5fd1 GP2_S02_A05 2023-04-12 19:49:10 +05:00
PC-G04 5eb1b72479 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-12 19:00:53 +05:00
PC-G04 277afb1de5 GP2_S01_A05 2023-04-12 19:00:45 +05:00
DESKTOP-8J0BKKD\Admin 65f1042aa1 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-12 18:40:39 +05:00
DESKTOP-8J0BKKD\Admin 932b36a06a GP1_S03_A15 2023-04-12 18:40:35 +05:00
PC-G04 04779d39cc Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
# Conflicts:
#	Content/Meshes/Interior/Gp2/Plinth/SM_GP2_F9_S01_A00_Plinth.uasset
2023-04-12 17:46:33 +05:00
PC-G04 f30f04749f GP2_S01_A05_F09 2023-04-12 17:44:00 +05:00
PC-G12 b6f68b8309 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-12 16:34:24 +05:00
PC-G12 f4722cea5e Comeat 2023-04-12 16:34:13 +05:00
PRAyMU f363f0b020 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-12 16:08:50 +05:00
PRAyMU d260207dde F09_Repair 2023-04-12 16:08:00 +05:00
DESKTOP-8J0BKKD\Admin 212fffcbe8 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-12 16:02:48 +05:00
DESKTOP-8J0BKKD\Admin 8cd8dea914 GP2_S04_SA06 2023-04-12 16:02:45 +05:00
PC-G08 d28b184bf4 GP2_S03_A05 2023-04-12 15:10:15 +05:00
Igor 765ff77c1f Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-11 20:17:59 +05:00
Igor ac2f84531d GP2_S02_A05 2023-04-11 20:17:30 +05:00
PC-G12 ac39c45b06 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-11 19:55:33 +05:00
PC-G12 2102cd7a23 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-11 19:52:00 +05:00
PC-G12 fe9a48b997 RM 2023-04-11 19:51:26 +05:00
DESKTOP-8J0BKKD\Admin 8dd9bb4020 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-11 19:50:47 +05:00
DESKTOP-8J0BKKD\Admin 2da5c911c6 GP2_S04_A06_F9 2023-04-11 19:50:43 +05:00
PC-G08 36e6c9715d GP02_S03_A04 inta 2023-04-11 18:46:14 +05:00
DESKTOP-8J0BKKD\Admin 6750271f76 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-11 18:25:59 +05:00
DESKTOP-8J0BKKD\Admin 5b3ff8ba51 GP2_S01_A004 2023-04-11 18:25:56 +05:00
PC-G13 b93abcd470 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
# Conflicts:
#	Content/Blueprints/Lamp/Interior_Konserva/BP_InteriorLamp_Lamp_1.uasset
#	Content/Blueprints/Lamp/Interior_Lounge/BP_InteriorLamp_Cylindr_Res.uasset
#	Content/Blueprints/Lamp/Interior_Minimalism/BP_InteriorLamp_Pendant_Crouise.uasset
#	Content/Furniture/Vol2_Unsorted/FurniturePack/Assets/Furniture/Lamps/WallLampsMaterial/MI_WallLamp.uasset
2023-04-11 16:27:29 +05:00
PC-G13 f70c9bb3e2 smth gp1 2023-04-11 16:26:45 +05:00
PRAyMU c828b24092 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-11 15:04:22 +05:00
PRAyMU 5f3b274d32 F09_A05_A06 2023-04-11 15:03:28 +05:00
Igor e2c2306e2a Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-11 14:58:16 +05:00
Igor be3e21c1af F_GP2_S04_A00 2023-04-11 14:58:11 +05:00
PC-G04 8abbf22eec Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-11 13:20:03 +05:00