Commit Graph

58 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
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 82aff8c323 inter 2023-08-25 19:57:21 +05:00
PC-G13 e2467e08dc pravkiinterior 2023-08-21 19:50:31 +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
PC-G06 e92399698c S7_Se02_F11-12 Хаты 2023-08-15 18:31:55 +05:00
PC-G04 e8dfb34174 и 2023-08-15 12:19:34 +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-G04 5f67aece39 айдишник гп3, говно в мопах и шкафы в квартире удалила 2023-08-13 22:07:48 +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
PC-G06 f8d628753a Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-11 15:34:26 +05:00
PC-G06 a063206afa S7_Se02 Хаты 2023-08-11 15:33:04 +05:00
PC-G12 ddf6334527 mps 2023-08-11 12:12:52 +05:00
PC-G12 f0bc6ffe6c Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-11 11:49:18 +05:00
PC-G12 9586ccdded MPs 2023-08-11 11:49:03 +05:00
PRAyMU 7e6b8a87b5 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-10 22:11:10 +05:00
PRAyMU 6b82e3f74c S7_Se02_F12_A14 2023-08-10 22:03:56 +05:00
PC-G12 c9aea0040d Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-10 20:06:31 +05:00
PC-G12 db4eecb4b9 MOPs 2023-08-10 20:06:25 +05:00
PC-G06 32e19857a6 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-10 19:50:51 +05:00
PC-G06 1bcb2a9156 S7_Se02 Хаты 2023-08-10 19:50:43 +05:00
PC-G12 67c27aef8e Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-09 18:45:50 +05:00
PC-G12 0f0e201769 MPs 2023-08-09 18:45:42 +05:00
PC-G06 b0f1772ea4 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-09 18:31:45 +05:00
PC-G06 7665efd4d8 S7_se02_F02-10_A05/F11_A05
S7_Se02_F02-10_A06/F11-F12_A06
Хаты
2023-08-09 18:31:38 +05:00
PC-G12 992dc469c7 MOPs 2023-08-09 17:12:20 +05:00
PC-G12 72a045a81a Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-09 11:58:30 +05:00
PC-G12 725477c220 MOPs 2023-08-09 11:58:24 +05:00
PC-G06 a47aebc51b Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-09 11:36:11 +05:00
PC-G06 80965ef42d S7_Se02 Dodelki 2023-08-09 11:35:52 +05:00
PC-G12 ba644c3845 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-08 19:53:48 +05:00
PC-G12 3e9a50d8e8 MOPs 2023-08-08 19:53:40 +05:00
PC-G06 c09e414d17 S7_Se02_F12_A03/A04 2023-08-08 19:40:05 +05:00
PC-G06 3554a25afd S7_Se02_F02-05_A01/A02
S7_Se02_F02-10_A00/F11_A00
Pravki
2023-08-08 14:56:06 +05:00