Commit Graph

249 Commits

Author SHA1 Message Date
Dron 7f8f4702ab fasadhide fix 2023-08-24 19:53:37 +05:00
Dron 6fb9c64c7d ghoster fix, normals fix 2023-08-24 19:34:39 +05:00
Dron 7124170ce2 some ass 2023-08-24 13:12:30 +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-G13 280f8d04ff 1 2023-08-18 19:33:46 +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
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
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-G04 866d18c7c8 Окружение 2023-08-16 18:44:23 +05:00
PC-G04 dffb763caa bupsss 2023-08-16 14:51:51 +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-G04 2c2e32d23b GP2 2023-08-14 14:05:23 +05:00
PC-G04 9785953e5c Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-14 13:11:11 +05:00
PC-G04 da40027278 Всякая всячина, ещё не последний коммит 2023-08-14 13:10:57 +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-G09 fadd79d56f Nightlight 2023-08-14 09:36:01 +05:00
PC-G09 6272261224 GP_Near_mat 2023-08-14 08:35:45 +05:00
PC-G09 f599451c4c GP 2023-08-14 08:22:03 +05:00
PC-G09 298b950171 Roads + Roads decal 2023-08-14 02:08:08 +05:00
Dron 17024224d2 some shit 2023-08-13 23:34:59 +05:00
PC-G09 88f1b0d549 Outside foliage 2023-08-13 23:15:13 +05:00
PC-G13 990ddbf271 smth 2023-08-11 19:54:24 +05:00
PC-G13 14cb31ad7a Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-10 14:45:43 +05:00
PC-G13 d9fbe36281 mop, mats, 2023-08-10 14:45:33 +05:00
PC-G09 f8555e1cbc Roads 2023-08-10 07:22:55 +05:00
PC-G13 0a7ac85629 mafs 2023-08-09 18:20:57 +05:00
PC-G13 1b91b0cc69 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-09 16:18:00 +05:00
PC-G13 950ad8a726 genplan part1 2023-08-09 16:17:35 +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-G13 db0177582e se01 2023-08-08 18:41:17 +05:00
PC-G13 9d9831dcc4 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-08 12:25:07 +05:00
PC-G13 fa63b3ec23 daebanuifork 2023-08-08 12:24:32 +05:00
PC-G13 1dd7511264 se01 2023-08-08 12:23:52 +05:00
PC-G12 b6c7dad2a9 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-08 12:05:36 +05:00
PC-G12 3a6a1ce210 MOPs 2023-08-08 12:05:31 +05:00
PC-G09 7eb7c41767 Outside buildings re st1 + decal overall roofs 2023-08-08 07:33:58 +05:00
PC-G12 ff74922ea3 MOPs 2023-08-07 19:47:00 +05:00
PC-G12 801bba216e mps 2023-08-07 12:01:55 +05:00
PC-G12 61cd5d7d0e Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-04 18:37:55 +05:00
PC-G12 1a43b9b41a MPs 2023-08-04 18:37:50 +05:00
PC-G13 1ac8473f4a Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-04 12:43:50 +05:00
PC-G13 a166b556be s7s01 2023-08-04 12:43:47 +05:00
PC-G12 6aa727d36d MPS 2023-08-04 12:04:53 +05:00