Commit Graph

52 Commits

Author SHA1 Message Date
PC-G13 686e88cdeb rects 2024-06-04 17:59:30 +05:00
Dron 56400e90cd many stuff 2024-05-07 14:53:29 +05:00
PC-G13 5118b5099d Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Maps/Interior/GP7/Se03/F01-10/Furniture/S7_Se03_F02-08_A00_fur.umap
#	Content/Maps/Interior/GP7/Se03/F01-10/Furniture/S7_Se03_F02-08_A01_fur.umap
#	Content/Maps/Interior/GP7/Se03/F01-10/Furniture/S7_Se03_F02-10_A02_fur.umap
#	Content/Maps/Interior/GP7/Se03/F01-10/Furniture/S7_Se03_F02-10_A03_fur.umap
#	Content/Maps/Interior/GP7/Se03/F01-10/Furniture/S7_Se03_F02-10_A04_fur.umap
#	Content/Maps/Interior/GP7/Se03/F01-10/Furniture/S7_Se03_F02-10_A05_fur.umap
#	Content/Maps/Interior/GP7/Se03/F01-10/Furniture/S7_Se03_F02-10_A06_fur.umap
#	Content/Maps/Interior/GP7/Se03/F01-10/Furniture/S7_Se03_F09-10_A07_fur.umap
#	Content/Maps/Interior/GP7/Se03/F11-13/Furniture/S7_Se03_F11-12_A02_fur.umap
#	Content/Maps/Interior/GP7/Se03/F11-13/Furniture/S7_Se03_F11-12_A05_fur.umap
#	Content/Maps/Interior/GP7/Se03/F11-13/Furniture/S7_Se03_F11-12_A06_fur.umap
#	Content/Maps/Interior/GP7/Se03/F11-13/Furniture/S7_Se03_F11-12_A07_fur.umap
#	Content/Maps/Interior/GP7/Se03/F11-13/Furniture/S7_Se03_F11-13_A03_fur.umap
#	Content/Maps/Interior/GP7/Se03/F11-13/Furniture/S7_Se03_F11-13_A04_fur.umap
#	Content/Maps/Interior/GP7/Se03/F11-13/Furniture/S7_Se03_F13_A08_fur.umap
#	Content/Maps/Interior/GP7/Se03/F11-13/Furniture/S7_Se03_F13_A09_fur.umap
2024-04-19 19:12:11 +05:00
PC-G13 3d1f413931 forest_far 2024-04-19 19:11:32 +05:00
PC-G04 406529d54a Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Maps/Interior/GP7/Se01/F11-12/Walls/S7_Se01_F11-12_A00_walls.umap
#	Content/Maps/Interior/GP7/Se02/F01-10/Walls/S7_Se02_F02-05_A02_walls.umap
#	Content/Maps/Interior/GP7/Se02/F01-10/Walls/S7_Se02_F02-05_A10_walls.umap
#	Content/Maps/Interior/GP7/Se02/F01-10/Walls/S7_Se02_F02-10_A05_walls.umap
#	Content/Maps/Interior/GP7/Se02/F01-10/Walls/S7_Se02_F02-10_A06_walls.umap
#	Content/Maps/Interior/GP7/Se02/F01-10/Walls/S7_Se02_F02-10_A09_walls.umap
#	Content/Maps/Interior/GP7/Se02/F01-10/Walls/S7_Se02_F06-08_A07_walls.umap
#	Content/Maps/Interior/GP7/Se02/F01-10/Walls/S7_Se02_F06-08_A12_walls.umap
#	Content/Maps/Interior/GP7/Se02/F01-10/Walls/S7_Se02_F09-10_A08_walls.umap
#	Content/Maps/Interior/GP7/Se02/F01-10/Walls/S7_Se02_F09-10_A11_walls.umap
#	Content/Maps/Interior/GP7/Se03/F01-10/Walls/S7_Se03_F02-03_06-07_A05_walls.umap
#	Content/Maps/Interior/GP7/Se03/F01-10/Walls/S7_Se03_F02-03_A02_walls.umap
#	Content/Maps/Interior/GP7/Se03/F01-10/Walls/S7_Se03_F02-03_A03_walls.umap
#	Content/Maps/Interior/GP7/Se03/F01-10/Walls/S7_Se03_F02-03_A06_walls.umap
#	Content/Maps/Interior/GP7/Se03/F01-10/Walls/S7_Se03_F02-05_A00_walls.umap
#	Content/Maps/Interior/GP7/Se03/F01-10/Walls/S7_Se03_F02-08_A01_walls.umap
#	Content/Maps/Interior/GP7/Se03/F01-10/Walls/S7_Se03_F09_A07_walls.umap
#	Content/Maps/Interior/GP7/Se03/F11-13/Walls/S7_Se03_F11_A02_walls.umap
#	Content/Maps/Interior/GP7/Se03/F11-13/Walls/S7_Se03_F11_A03_walls.umap
#	Content/Maps/Interior/GP7/Se03/F11-13/Walls/S7_Se03_F11_A04_walls.umap
#	Content/Maps/Interior/GP7/Se03/F11-13/Walls/S7_Se03_F11_A05_walls.umap
#	Content/Maps/Interior/GP7/Se03/F11-13/Walls/S7_Se03_F11_A06_walls.umap
#	Content/Maps/Interior/GP7/Se03/F11-13/Walls/S7_Se03_F11_A07_walls.umap
#	Content/Maps/Interior/GP7/Se03/F11-13/Walls/S7_Se03_F13_A08_walls.umap
#	Content/Maps/Interior/GP7/Se03/F11-13/Walls/S7_Se03_F13_A09_walls.umap
2024-04-19 19:10:10 +05:00
PC-G04 c0cc21a0a9 коты/кошки и материал лендскейпа 2024-04-19 19:02:44 +05:00
PC-G13 af198e21a5 walls, mops, lamps 2024-04-19 15:05:13 +05:00
PC-G13 3ef5e68765 p1 2024-04-17 19:48:09 +05:00
Dron abcc890d6b lifts, someshit 2024-04-11 19:27:57 +05:00
Dron 5f6c8ff43f ФФФФФФФФВАААААААААА 2023-09-30 00:34:34 +05:00
Dron cdc4ff4fd3 asdASDADasd 2023-09-29 22:29:25 +05:00
Dron 9ecac316c6 pizda kak mnogo vsyakogo 2023-09-07 22:46:42 +05:00
PC-G04 61d9fb9312 МОПы ГП7, Здание Машарова ГП2 2023-09-07 17:57:08 +05:00
Dron 63aa07a8e8 refl n N 2023-09-07 16:07:49 +05:00
Dron 7e68062af5 caps, floor nums, some 2023-09-06 21:22:27 +05:00
PC-G13 8b47b2e32b mop meshes fix 2023-09-06 16:52:17 +05:00
PC-G13 f36cb3dce8 mops f01 againg bake 2023-09-06 12:59:39 +05:00
Dron 4acafd03eb paralaxes fix, caps fixes, else 2023-09-05 22:29:31 +05:00
PC-G04 33e7943fac Ярд блдингс руф 2023-09-05 20:40:49 +05:00
Dron d7bcbc28a4 vsyakoe 2023-09-05 18:57:10 +05:00
PC-G04 46b4c9eaf0 Фасад ГП7с2, Крышка в ГП2 на 1 этаже, Крышки в ГП7 на 1 этаже, генплан 2023-09-05 11:55:27 +05:00
Dron ce922967f8 da hvatit uje 2023-08-31 06:11:23 +05:00
Dron 4904a5e578 full parallax, search, points 2023-08-30 17:24:44 +05:00
Dron ea65261f93 mops and prlx 2023-08-29 18:08:26 +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 503162a6ad int fixes 2023-08-17 13:59:58 +05:00
PC-G12 882c4cc7f4 mps 2023-08-14 19:39:15 +05:00
PC-G12 d622542fc6 mps 2023-08-14 13:53: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-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 9586ccdded MPs 2023-08-11 11:49:03 +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-G04 303a7df9b6 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-10 14:41:37 +05:00
PC-G04 1bbdf3b1e0 Se03 interiors 2023-08-10 14:39:19 +05:00
PC-G12 0f0e201769 MPs 2023-08-09 18:45:42 +05:00
PC-G04 163232aed9 Окно и интерьеры 3 секции 2023-08-07 18:11:48 +05:00
PC-G04 c568a88da8 Windows 2023-08-07 16:19:12 +05:00
PC-G04 3fc987b596 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-07 16:00:15 +05:00
PC-G04 1abe54dcdd Se03_F02-08_A01 2023-08-07 15:59:37 +05:00
PC-G08 08416ff541 S7_Se03_A00 2023-08-07 14:58:12 +05:00
PC-G04 8af0f9f8d1 Se03 2023-08-07 11:57:40 +05:00
PC-G08 52093523d7 S7_Se03_F02-08_A00 2023-08-04 19:01:38 +05:00