Commit Graph

522 Commits

Author SHA1 Message Date
Dron ea65261f93 mops and prlx 2023-08-29 18:08:26 +05:00
PC-G13 943aa63d90 eshe kaminov, bake, parking gp7 bake, krushki vozmojno 2023-08-29 15:57:43 +05:00
Dron 60c3f27033 navi, parallax se1, bugs, new search 2023-08-29 01:21:40 +05:00
PRAyMU 14ababcfc2 L_Flame_Test 2023-08-28 23:32:29 +05:00
PRAyMU 9b2ad3975e Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Maps/Interior/GP7/Se02/F11-12/Furniture/S7_Se02_F12_A14_fur.umap
2023-08-28 23:19:21 +05:00
PRAyMU 710e2f5a9b BP_Flame_Biocamine 2023-08-28 23:18:32 +05:00
PC-G13 48b33afbca cuminas 2023-08-28 20:10:50 +05:00
Dmitry 2b9a52c44e Fix_PointMapsPosition 2023-08-28 14:25:41 +05:00
Dmitry 745b67aed0 FixUpRedirectors 2023-08-28 14:08:45 +05:00
Dmitry 8744badcb6 Rename_PointsMap 2023-08-28 14:03:06 +05:00
Dmitry 1ae04b3067 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Blueprints/UI/Actors/FlatPoint.uasset
2023-08-25 20:03:07 +05:00
Dmitry 81760752bd FlatAndNaviPoints 2023-08-25 20:01:02 +05:00
PC-G13 af6eb89f1a Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Maps/Interior/Parking/Parking_GP7.umap
2023-08-25 19:58:44 +05:00
PC-G13 82aff8c323 inter 2023-08-25 19:57:21 +05:00
Dron 5d68813fe9 parking points 2023-08-25 14:14:13 +05:00
PC-G13 44ea14ab1d int 2023-08-23 16:41:51 +05:00
PC-G13 e2467e08dc pravkiinterior 2023-08-21 19:50:31 +05:00
Omar 16e2c81876 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-18 18:47:29 +05:00
Omar bd0865e87c Parking GP7 2023-08-18 18:47:22 +05:00
PC-G13 bc9b7b6e69 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-18 17:11:05 +05:00
PC-G13 218b9ee2e0 mastermat 2023-08-18 17:11:02 +05:00
Omar f511a97e5b Parking GP7 2023-08-18 16:58:48 +05:00
Omar e00811d54e Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-18 11:59:35 +05:00
Omar 04a1e26abe Parking GP7 2023-08-18 11:59:27 +05:00
PC-G13 489876b0b4 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Maps/Interior/GP7/Se02/F11-12/Furniture/S7_Se02_F11-12_A06_fur.umap
#	Content/Maps/Interior/GP7/Se02/F11-12/Furniture/S7_Se02_F11_A00_fur.umap
#	Content/Maps/Interior/GP7/Se02/F11-12/Furniture/S7_Se02_F11_A05_fur.umap
#	Content/Maps/Interior/GP7/Se02/F11-12/Furniture/S7_Se02_F11_A08_fur.umap
#	Content/Maps/Interior/GP7/Se02/F11-12/Furniture/S7_Se02_F11_A09_fur.umap
#	Content/Maps/Interior/GP7/Se02/F11-12/Furniture/S7_Se02_F11_A11_fur.umap
#	Content/Maps/Interior/GP7/Se02/F11-12/Furniture/S7_Se02_F12_A03_fur.umap
#	Content/Maps/Interior/GP7/Se02/F11-12/Furniture/S7_Se02_F12_A04_fur.umap
#	Content/Maps/Interior/GP7/Se02/F11-12/Furniture/S7_Se02_F12_A13_fur.umap
#	Content/Maps/Interior/GP7/Se02/F11-12/Walls/S7_Se02_F11-12_A06_walls.umap
#	Content/Maps/Interior/GP7/Se02/F11-12/Walls/S7_Se02_F11_A00_walls.umap
#	Content/Maps/Interior/GP7/Se02/F11-12/Walls/S7_Se02_F11_A05_walls.umap
#	Content/Maps/Interior/GP7/Se02/F11-12/Walls/S7_Se02_F11_A08_walls.umap
#	Content/Maps/Interior/GP7/Se02/F11-12/Walls/S7_Se02_F11_A09_walls.umap
#	Content/Maps/Interior/GP7/Se02/F11-12/Walls/S7_Se02_F12_A04_walls.umap
#	Content/Maps/Interior/GP7/Se02/F11-12/Walls/S7_Se02_F12_A13_walls.umap
2023-08-17 14:01:08 +05:00
PC-G13 503162a6ad int fixes 2023-08-17 13:59:58 +05:00
Omar 0bdcbbce1e Parking GP7 2023-08-17 12:15:58 +05:00
Omar a722c0f881 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-16 11:40:55 +05:00
Omar 982a2a1ae1 Parking GP7 2023-08-16 11:40:46 +05:00
PC-G06 e92399698c S7_Se02_F11-12 Хаты 2023-08-15 18:31:55 +05:00
PC-G04 1ca26f47c2 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-15 12:19:40 +05:00
PC-G04 e8dfb34174 и 2023-08-15 12:19:34 +05:00
Omar 416a26c087 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-15 11:53:01 +05:00
Omar cf1ebdbe80 Parking GP7 2023-08-15 11:52:53 +05:00
PRAyMU cbefec3873 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Maps/Interior/GP7/Se02/F11-12/Furniture/S7_Se02_F12_A14_fur.umap
2023-08-14 21:31:37 +05:00
PRAyMU 910e8bda5b S7_Se02_F12_A13 2023-08-14 21:19:27 +05:00
PC-G12 03fddaabe7 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-14 19:39:21 +05:00
PC-G12 882c4cc7f4 mps 2023-08-14 19:39:15 +05:00
PC-G06 b6cb55ce7e Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-14 17:25:37 +05:00
PC-G06 a5f289a5e2 S7_Se02 Хаты 2023-08-14 17:25:30 +05:00
PC-G13 1d0c2e851b Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-14 15:22:46 +05:00
PC-G13 d84da5b7d6 a09se03 2023-08-14 15:22:41 +05:00
PC-G12 d622542fc6 mps 2023-08-14 13:53:29 +05:00
Dron 17024224d2 some shit 2023-08-13 23:34:59 +05:00
PC-G04 5f67aece39 айдишник гп3, говно в мопах и шкафы в квартире удалила 2023-08-13 22:07:48 +05:00
PC-G04 7c6212d7b6 Назначила материалы
Проверила МОП1 секции
2023-08-12 19:55:28 +05:00
PC-G06 53067b1a60 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-11 19:52:43 +05:00
PC-G06 132ecdee01 S7_Se02 Хаты A10-A11 2023-08-11 19:52:29 +05:00
PC-G12 7f1f45fac4 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Maps/Interior/GP7/Se03/F01-10/Walls/S7_Se03_F02-03_A03_walls.umap
2023-08-11 19:44:50 +05:00
PC-G12 473ea6fcce MPs 2023-08-11 19:44:10 +05:00