Commit Graph

373 Commits

Author SHA1 Message Date
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
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 7f8f4702ab fasadhide fix 2023-08-24 19:53:37 +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
PC-G04 1eb72e4eeb Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-18 13:36:22 +05:00
PC-G04 6928253b85 Yard 2023-08-18 13:36:14 +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-G12 ef1a6662b6 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-14 12:19:59 +05:00
PC-G12 cd90017bfb mps 2023-08-14 12:16:24 +05:00
PC-G04 f8188e7592 КЭПы 2023-08-12 19:20:19 +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-G13 db1d946faa Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-11 19:31:26 +05:00
PC-G13 9acd0ee966 a09, baked mops se01 2023-08-11 19:31:07 +05:00
PC-G04 ec84251111 Дверные проёмы для МОПов 2023-08-11 19:27:48 +05:00
PC-G04 987451aaa2 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Maps/Interior/GP7/Se03/F01-10/Walls/S7_Se03_F02-08_A01_walls.umap
2023-08-11 18:10:39 +05:00
PC-G04 db0e645956 Se03 Interiors 2023-08-11 18:01:34 +05:00
PC-G13 4dd33bc0b2 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-11 15:27:43 +05:00
PC-G13 4795f77d71 se03a07 and someintfixes 2023-08-11 15:27:36 +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