177 Commits

Author SHA1 Message Date
Dron 105d5fb007 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Maps/Interior/GP9/F03-20_22/Furniture/S9_Se01_F03-19_A03_fur.umap
2024-06-04 23:51:37 +05:00
Dron 48996c64e2 гора багов, интерьерный свет, лифты, уи 2024-06-04 23:51:22 +05:00
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 20849d7f63 fix parking, udate a09 2023-12-29 21:40:43 +05:00
PC-G04 3804dedfdd Квартира А09 в 3 секции, терассса, фасады 2023-12-29 17:59:08 +05:00
Dmitry 7d5ef88cab Fix_NaviPoints 2023-11-10 13:48:00 +05:00
Dron 5f6c8ff43f ФФФФФФФФВАААААААААА 2023-09-30 00:34:34 +05:00
Dron cdc4ff4fd3 asdASDADasd 2023-09-29 22:29:25 +05:00
PC-G13 408887feaa fork ydobui pizdec 2023-09-08 18:49:57 +05:00
PC-G13 58743c3a01 mesh channels again 2023-09-08 18:48:48 +05:00
PC-G13 1f808f7da1 int fixes 2023-09-08 18:26:42 +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
Dron dece865481 liftrefl, door N 2023-09-06 20:33:23 +05:00
Dron bb344e95e8 asdas 2023-09-06 18:55:23 +05:00
PC-G13 ffc920bad3 small int fixes 2023-09-06 17:26:31 +05:00
PC-G13 8b47b2e32b mop meshes fix 2023-09-06 16:52:17 +05:00
PC-G13 8d6b3dd134 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-09-06 12:59:43 +05:00
PC-G13 f36cb3dce8 mops f01 againg bake 2023-09-06 12:59:39 +05:00
Dmitry eab90944a7 FixPoint 2023-09-06 12:22:22 +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 58a8851e2c Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-09-05 18:57:11 +05:00
Dron d7bcbc28a4 vsyakoe 2023-09-05 18:57:10 +05:00
PC-G13 2e5965e8e5 buidings,yard mat replacment p1, fulyaga, se03 a02 walls rebake 2023-09-05 18:24:26 +05:00
PC-G04 8eda7e3f30 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-09-05 11:55:42 +05:00
PC-G04 46b4c9eaf0 Фасад ГП7с2, Крышка в ГП2 на 1 этаже, Крышки в ГП7 на 1 этаже, генплан 2023-09-05 11:55:27 +05:00
Dron d63198aad9 много фиксов
сменен компресс уи текстур
подмонд ламп и освещения чтоб не засвечивать траву
скорректировано солнце
скорректирован постпроцесс
статичная навигация
обнова коллизий навигации
еще там мелочи
2023-09-04 20:43:14 +05:00
PC-G13 7ee2a1223d fire replace 2023-09-01 19:27:24 +05:00
Dmitry 8976466c93 Fix_FlatPoints 2023-08-31 17:16:07 +05:00
Dron ce922967f8 da hvatit uje 2023-08-31 06:11:23 +05:00
Dron a306cd52dc points, shoesfix, some else 2023-08-31 04:51:34 +05:00
Dron 8643ca91e2 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-31 01:43:46 +05:00
Dron bf6d377abf ввв 2023-08-31 01:43:40 +05:00
PC-G04 da99f1ef5b пипл, лендскейп(у театра подняла скамейки с людьми), коллизии в двух хатах 2023-08-31 01:11:40 +05:00
Dron 1201b80310 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-30 17:24:46 +05:00
Dron 4904a5e578 full parallax, search, points 2023-08-30 17:24:44 +05:00
Dmitry da59b01412 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Maps/Interior/GP7/Se03/Points/S07_Se03_F2-12P.umap
#	Content/Maps/Interior/GP7/Se03/Points/S07_Se03_F2-8P.umap
#	Content/Maps/Interior/GP7/Se03/Points/S07_Se03_F9-12P.umap
2023-08-30 15:24:21 +05:00
Dmitry 039ea20627 Fix_Point_Se03 2023-08-30 15:23:09 +05:00
Dron cf7a5f6fb7 aaa 2023-08-30 15:18:55 +05:00