Commit Graph

130 Commits

Author SHA1 Message Date
PC-G04 a89c0fd890 Открыла двери в ГП1, в "уютном минимализме",все этажи, кроме 9 2023-04-17 16:58:20 +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 c3b6f86c03 kryshki 2023-04-15 03:41:55 +05:00
GRAFF 40c9442e72 Навигация 2023-04-15 01:16:09 +05:00
PC-G13 a43158969d Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-14 21:05:29 +05:00
PC-G13 1287a8f4bf oboi v odnoi kv 2023-04-14 21:05:24 +05:00
GRAFF 7cc2c0aaeb flat recognize, some stuff, floor highlight, hide shit, reaneme 2023-04-14 20:18:23 +05:00
PC-G13 15e85320ba двери в мопах подвинуты 2023-04-14 17:03:27 +05:00
PC-G13 566846a81f probe gp2s03a03 2023-04-14 16:17:44 +05:00
PC-G13 c917638ab9 fade dveri 2023-04-14 15:39:06 +05:00
PC-G13 7ad0ff0502 коллизии, немного пробок, пара шейдеров, 2023-04-14 15:10:13 +05:00
GRAFF c54dc89044 лифты, двери, еще чето 2023-04-14 03:36:15 +05:00
GRAFF 2d6cd94b34 Пойнты комнат 2023-04-14 01:39:10 +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
GRAFF 20058a48be Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-13 17:42:25 +05:00
GRAFF 4674c8106c points 2023-04-13 17:42:15 +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
PC-G12 889031c223 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-12 19:55:17 +05:00
PC-G12 1f4aadfa11 GreatestMops_Vol1 2023-04-12 19:55:12 +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
GRAFF 666cf634d3 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-12 17:23:38 +05:00
GRAFF 486c8f48ec points, parking 2023-04-12 17:23:26 +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 8cd8dea914 GP2_S04_SA06 2023-04-12 16:02:45 +05:00
GRAFF 8bfc9489f1 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-11 20:29:29 +05:00
GRAFF cfd05910ae xml continue 2023-04-11 20:29:27 +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
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
PC-G04 8abbf22eec Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-11 13:20:03 +05:00
PC-G04 2b88950464 GP1_S04_A05_F09 2023-04-11 13:19:56 +05:00
PC-G12 ca0a4a2dda Come eat_01 2023-04-11 12:18:50 +05:00
PC-G12 94033d8c01 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-10 19:51:33 +05:00
PC-G12 bc3ca3131b 0609 2023-04-10 19:51:06 +05:00