Commit Graph

210 Commits

Author SHA1 Message Date
PC-G12 3e9a50d8e8 MOPs 2023-08-08 19:53:40 +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
PC-G12 5d33714450 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-03 19:48:27 +05:00
PC-G12 2829c5f913 MPS 2023-08-03 19:48:13 +05:00
PC-G13 85eac5b9a5 int 2023-08-03 17:02:37 +05:00
PC-G13 d1c3aeed57 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-03 13:03:46 +05:00
PC-G13 5ff6e4a94e int 2023-08-03 13:03:28 +05:00
PC-G12 b618e5b966 mps 2023-08-03 12:07:04 +05:00
PC-G12 ad30910f2d Mps 2023-08-02 19:33:02 +05:00
PC-G12 a15df65f11 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-02 17:38:29 +05:00
PC-G12 5085b12913 MPS 2023-08-02 17:38:20 +05:00
PC-G13 18ffd8376c Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-02 12:24:22 +05:00
PC-G13 ea574ab63e int tweaks 2023-08-02 12:24:17 +05:00
PC-G12 6a9ca54634 mps 2023-08-02 12:00:28 +05:00
PC-G12 bc3e492d8b Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-01 19:47:01 +05:00
PC-G12 9d06c8fd7d MPS2 2023-08-01 19:46:57 +05:00
PRAyMU 071796360c Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Materials/Masharov_Interior/Palette/MI_Wall_Bedroom_Matte_Bordo_Plintus.uasset
2023-08-01 19:01:09 +05:00
PC-G12 8420055699 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-01 18:56:25 +05:00
PC-G12 450e12ded3 mps 2023-08-01 18:54:56 +05:00
PRAyMU 5f31e90b82 Test_Room_GP3_Part_1 2023-08-01 18:53:07 +05:00
PC-G13 50758401b5 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-01 14:51:34 +05:00
PC-G13 b714583c2b fasades 2023-08-01 14:50:57 +05:00
PC-G12 f7f866a4d2 qwerty 2023-08-01 14:34:17 +05:00
PC-G12 11c67ae985 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-01 13:20:45 +05:00
PC-G12 29b5221ca0 MPS 2023-08-01 13:20:38 +05:00
PC-G13 4e8b0e7a9d pr.kucha 2023-08-01 13:15:39 +05:00
GRAFF 6bb34197d0 интерьеры новые встроены 2023-03-22 12:39:43 +05:00
PC-G13 58e206ddb8 masharov F2-4 2023-03-10 19:42:43 +05:00
PC-G13 1940b9155a Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Maps/Masharov_Yard.umap
2022-10-03 15:43:17 +05:00
PC-G13 bb1207898e smth 2022-10-03 15:40:14 +05:00
GRAFF 7ac752e46a Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Maps/Interior/Parking/Parking.umap
#	Content/Maps/Masharov_Yard.umap
2022-10-02 23:03:23 +05:00
GRAFF 20c96b9743 тёлки кофий пьют, еще пачка багов, еще паркинг, еще хуйня какая то 2022-10-02 22:58:42 +05:00
PC-G13 404c84bf16 parking, outside garage door 2022-09-30 16:33:28 +05:00
PC-G13 07d07d3e1c parking 2022-09-27 18:49:35 +05:00
GRAFF 12e1fc4869 паркингхуяркинг 2022-09-20 15:45:00 +05:00
GRAFF dfbb6bfc5a паркинг всякий 2022-09-20 13:31:42 +05:00
GRAFF 1c06aa5181 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer
# Conflicts:
#	Content/Materials/Instances/Asphalt/MI_Asphalt.uasset
#	Content/Materials/Instances/Bricks/MI_Bricks_Gray11.uasset
#	Content/Materials/Instances/Concrete/MI_Concrete_BrightGray.uasset
#	Content/Materials/Instances/Concrete/MI_Concrete_DarkGray.uasset
#	Content/Materials/Instances/Metal/MI_Metal_Black.uasset
#	Content/Materials/Masharov_Interior/Palette/MI_Emissive_0_Power_Warm.uasset
2022-09-19 20:28:47 +05:00
GRAFF 5fd52aa5f2 minusPP_fromparking 2022-09-19 19:51:07 +05:00
GRAFF d6cb448d25 parking 2022-09-19 19:41:24 +05:00
GRAFF b0e2fbbf49 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer
# Conflicts:
#	Content/Maps/Masharov_Yard.umap
#	Content/Maps/mainScene.umap
2022-09-16 20:49:59 +05:00
GRAFF e743e43179 pointFade, переклепал текстуры в который раз, гора косяков 2022-09-16 20:49:06 +05:00