Commit Graph

364 Commits

Author SHA1 Message Date
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-G04 d3b1017a7a Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-03 18:54:51 +05:00
PC-G04 23aa52b1c2 MAF 2023-08-03 18:54:40 +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 74d95748e4 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-02 19:33:08 +05:00
PC-G12 ad30910f2d Mps 2023-08-02 19:33:02 +05:00
PC-G04 5a8e668e74 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Maps/Interior/GP7/Se01/F02-10/MOPs/S7_Se01_F01_mops.umap
2023-08-02 19:31:53 +05:00
PC-G04 fd6202ca74 Правки по левелам 2023-08-02 19:29:10 +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 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-G04 11d8190864 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-01 18:04:46 +05:00
PC-G04 9419683203 dodelki 1 sekciya 7GP 2023-08-01 18:02:33 +05:00
PC-G09 d73304a055 Landscape remake 2023-08-01 16:43:58 +05:00
PC-G13 86ae3bca6a 1 2023-08-01 15:14:28 +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-G04 620ec34045 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Maps/Interior/GP7/Se01/MOPs/S7_Se01_F01_mops.umap
2023-08-01 14:09:28 +05:00
PC-G04 4f95d27d81 S07 и все секции с внутрянкой с настроенными коллизиями 2023-08-01 13:58:28 +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
PC-G04 3fb7ce32ad TestRoomGP7 2023-07-25 14:24:38 +05:00
GRAFF 6bb34197d0 интерьеры новые встроены 2023-03-22 12:39:43 +05:00
PC-G13 6843ba5897 krishka 2023-03-15 21:50:13 +05:00
PC-G13 58e206ddb8 masharov F2-4 2023-03-10 19:42:43 +05:00
GRAFF 525bdc653d этакое всякое 2022-10-07 17:22:19 +05:00
GRAFF c368f1067c еще чуть фикс 2022-10-03 16:08:41 +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 a94de0d836 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-09-30 16:33:30 +05:00
PC-G13 404c84bf16 parking, outside garage door 2022-09-30 16:33:28 +05:00
GRAFF ad2298956a Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Maps/Interior/Parking/Parking.umap
2022-09-28 17:49:18 +05:00
GRAFF 137ed09681 чет менялось 2022-09-28 17:04:04 +05:00
PC-G13 07d07d3e1c parking 2022-09-27 18:49:35 +05:00
GRAFF 12e1fc4869 паркингхуяркинг 2022-09-20 15:45:00 +05:00