Commit Graph

1110 Commits

Author SHA1 Message Date
Dron c56b2b536a Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-09-08 18:12:46 +05:00
Dron cabcfa0b93 asd 2023-09-08 18:12:41 +05:00
PC-G04 f0110ccb25 Текстура на дверях в ГП2-ГП3 2023-09-08 17:57:46 +05:00
PC-G04 d1e42ec76d Светильники в парке Shadow setting 2023-09-08 11:55:04 +05:00
Dron 969830e63d jujh 2023-09-07 23:07:22 +05:00
Dron 9ecac316c6 pizda kak mnogo vsyakogo 2023-09-07 22:46:42 +05:00
PC-G04 0898cb4fb4 6 2023-09-07 18:20:25 +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-G04 daf124d33b Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-09-06 20:57:08 +05:00
PC-G04 6eaf50a80e Кэпы ГП7 в фасады 2023-09-06 20:57:01 +05:00
Dron d6176e3f8f Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-09-06 20:33:27 +05:00
Dron dece865481 liftrefl, door N 2023-09-06 20:33:23 +05:00
PC-G13 720082d047 parking gp7, building gp2 2023-09-06 20:00:16 +05:00
PC-G04 11c0dce684 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-09-06 19:33:06 +05:00
PC-G04 f5fbe4df3d Паркинг ГП7 2023-09-06 19:32:57 +05:00
Dron a4f4b01b18 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Maps/Masharov_Yard.umap
2023-09-06 18:55:55 +05:00
Dron bb344e95e8 asdas 2023-09-06 18:55:23 +05:00
PC-G04 e916daa480 под ГП7 2023-09-06 18:02:18 +05:00
PC-G04 02e89593a4 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Maps/Landscape_Remake.umap
#	Content/Maps/Masharov_Yard.umap
2023-09-06 17:46:13 +05:00
PC-G04 c7b3c86cd0 Под ГП7 2023-09-06 17:45:52 +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 c0b7809a31 yard, landscape 2023-09-06 16:47:30 +05:00
PC-G13 83f0940d3a parking 2023-09-06 15:18:01 +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
PC-G04 310d447f6e Паркинг ГП1 2023-09-06 12:49:41 +05:00
PC-G04 2a599e0364 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-09-06 12:33:24 +05:00
PC-G04 8c5db7fb6d parking GP7 2023-09-06 12:33:15 +05:00
Dmitry eab90944a7 FixPoint 2023-09-06 12:22:22 +05:00
Dmitry db3ee09388 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Maps/Interior/GP7/Se01/Points/S07_Se01_F12P.umap
#	Content/Maps/Interior/GP7/Se03/Points/S07_Se03_F09-12P.umap
2023-09-06 12:08:00 +05:00
Dmitry c81ea99cf9 FixPoints 2023-09-05 22:48:42 +05:00
Dron 85dc2977ab Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-09-05 22:29:48 +05:00
Dron 4acafd03eb paralaxes fix, caps fixes, else 2023-09-05 22:29:31 +05:00
PC-G04 4aa58832b4 Ярд карс 2023-09-05 22:05:57 +05:00
PC-G04 e916085456 Крышка гп 7 3 секция 9 этаж, ярд 2023-09-05 21:26:07 +05:00
PC-G04 33e7943fac Ярд блдингс руф 2023-09-05 20:40:49 +05:00
PC-G13 4bd4d1c1fc Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-09-05 19:51:54 +05:00
PC-G13 9d7e7405c2 mats replace p2, vsrataya rainsewer, yard buildings 2023-09-05 19:51:51 +05:00
PC-G04 332459b4ec Люди в парке 2023-09-05 19:15:33 +05:00
PC-G04 cfe3253e24 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-09-05 18:57:52 +05:00
PC-G04 a6d332ae0a Заборчик напротив ГП7 2023-09-05 18:57:25 +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 dd29d3fca6 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-09-05 18:24:48 +05:00
PC-G13 2e5965e8e5 buidings,yard mat replacment p1, fulyaga, se03 a02 walls rebake 2023-09-05 18:24:26 +05:00
PC-G08 34cf1fe9a7 addNewMaterialsExteriors 2023-09-05 18:21:10 +05:00
PC-G13 c90ef9302a Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Blueprints/Lamp/BP_streetLamp_Tree_canopy_Half.uasset
#	Content/Maps/Masharov_Yard.umap
2023-09-05 14:27:58 +05:00