Commit Graph

822 Commits

Author SHA1 Message Date
PC-G04 22ff65b730 landscape,yard.buildings 2023-08-25 20:01:56 +05:00
PC-G04 e82ad66f06 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Maps/Masharov_Yard.umap
2023-08-25 12:11:52 +05:00
PC-G04 9c7ef5f6ec Yard 2023-08-25 12:06:23 +05:00
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-G04 b54be07191 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-24 12:38:39 +05:00
PC-G04 f8d3250b27 лендскейп, ярд. буилдинг 2023-08-24 12:38:20 +05:00
PC-G13 ad63324961 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-23 16:41:56 +05:00
PC-G13 44ea14ab1d int 2023-08-23 16:41:51 +05:00
Dron 97ca5ceb33 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-22 22:13:27 +05:00
Dron 8f6e9cde87 fixed level loading, nav optimization 2023-08-22 22:13:15 +05:00
PC-G04 132b8f56a2 ярд буилдингс 2023-08-22 19:57:47 +05:00
PC-G04 42c001189d Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-21 19:53:20 +05:00
PC-G04 46652085b7 ярд и билдингс 2023-08-21 19:53:14 +05:00
PC-G13 e2467e08dc pravkiinterior 2023-08-21 19:50:31 +05:00
PC-G04 a263953b7d Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-21 13:23:54 +05:00
PC-G04 60d8ab9e9f YARD 2023-08-21 13:23:49 +05:00
PC-G13 f1b41285ee Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-18 19:33:59 +05:00
PC-G13 280f8d04ff 1 2023-08-18 19:33:46 +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 1ea57b1356 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-18 16:58:58 +05:00
Omar f511a97e5b Parking GP7 2023-08-18 16:58:48 +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 5641a491c5 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-17 12:16:09 +05:00
Omar 0bdcbbce1e Parking GP7 2023-08-17 12:15:58 +05:00
PC-G04 866d18c7c8 Окружение 2023-08-16 18:44:23 +05:00
PC-G04 81172d110c Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-16 14:51:56 +05:00
PC-G04 dffb763caa bupsss 2023-08-16 14:51:51 +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