Commit Graph

72 Commits

Author SHA1 Message Date
PRAyMU 7e6b8a87b5 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-10 22:11:10 +05:00
PRAyMU 6b82e3f74c S7_Se02_F12_A14 2023-08-10 22:03:56 +05:00
PC-G13 db0177582e se01 2023-08-08 18:41:17 +05:00
PC-G13 9d9831dcc4 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-08 12:25:07 +05:00
PC-G13 fa63b3ec23 daebanuifork 2023-08-08 12:24:32 +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 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 5ff6e4a94e int 2023-08-03 13:03:28 +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
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
PRAyMU 5f31e90b82 Test_Room_GP3_Part_1 2023-08-01 18:53:07 +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
GRAFF 525bdc653d этакое всякое 2022-10-07 17:22:19 +05:00
GRAFF d4308eee55 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Maps/Masharov_Yard.umap
#	Content/Materials/Instances/Metal/MI_Metal_RAL_7016.uasset
2022-10-03 16:10:18 +05:00
GRAFF c368f1067c еще чуть фикс 2022-10-03 16:08:41 +05:00
PC-G01 9a60b1d7c8 Больше людей расселось 2022-10-03 14:31:16 +05:00
GRAFF e743e43179 pointFade, переклепал текстуры в который раз, гора косяков 2022-09-16 20:49:06 +05:00
GRAFF f9374aa4dc Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer
# Conflicts:
#	Content/Maps/Interior/GP2/S02F03-12.umap
#	Content/Maps/mainScene.umap
2022-09-15 17:57:58 +05:00
GRAFF b92f221b5e ?? 2022-09-15 17:55:33 +05:00
PC-G06 ad61431ebf Main_Building_Furniture 2022-09-14 16:19:14 +05:00
PC-G06 09b699c35c GP_2_Interior_Repair 2022-09-07 18:03:45 +05:00
GRAFF c418221cf9 миллиард говна 2022-09-01 05:09:34 +05:00
GRAFF e932338ee9 новые звуки, лифты, анимБПхи новые 2022-08-31 13:49:12 +05:00
GRAFF 84f5ef6d28 GP3_mats,a06 2022-08-26 14:48:23 +05:00
GRAFF 7430813cb7 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Maps/Interior/GP3/Furniture/F_S03A00.umap
2022-08-24 18:25:08 +05:00
GRAFF 6922c73378 gp3 2022-08-24 18:24:33 +05:00
GRAFF a141f94272 всякое 2022-08-24 15:07:07 +05:00
GRAFF 593042a336 GP3_Interior 2022-08-22 14:59:53 +05:00
GRAFF 8cf2b4eb37 много всякого КАЛАА 2022-07-19 04:08:57 +05:00
GRAFF b91b531ea7 вход с 2 этажа, 2этажные переключения, всякое говно еще, тачки катают по светофорам, коллизии 2022-07-18 02:58:05 +05:00
GRAFF aeb09be06a Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer
# Conflicts:
#	Content/Maps/Interior/GP2/S02F01.umap
#	Content/Maps/Masharov_cars.umap
2022-07-15 15:14:19 +05:00
GRAFF b26775b64c УФФФ 2022-07-15 15:12:09 +05:00
GRAFF 345bee16cc lsofa_01 2022-07-13 22:24:17 +05:00
GRAFF e925269d96 Revert "S02_Collision"
This reverts commit 7c07922e99.
2022-07-13 22:21:26 +05:00
GRAFF 1db9b2e327 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer 2022-07-13 21:17:34 +05:00
PC-G06 7c07922e99 S02_Collision 2022-07-13 20:29:20 +05:00
GRAFF 777d3030a3 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer
# Conflicts:
#	Content/Maps/Masharov_Buildings.umap
#	Content/Maps/Masharov_Landscape.umap
#	Content/Maps/Masharov_Yard.umap
#	Content/Maps/mainScene.umap
2022-07-13 17:53:53 +05:00
GRAFF 56c014b2e2 коллизии всякие, интерфейс, косячки 2022-07-13 17:52:29 +05:00
GRAFF f49c40ecd8 bp_tochannel2_someprobes_someshitaswell 2022-07-13 17:11:33 +05:00
GRAFF 7a13be35ca уфффф 2022-07-12 05:34:44 +05:00
PC-G06 909a6bb4b9 S02F01_Mat 2022-07-11 20:02:55 +05:00
JohnnyHatchet 3bc6dcaaa0 Ночное освещение 2022-07-11 11:36:38 +05:00
PC-G12 0c55ced6ec Mopz 2022-07-07 20:08:50 +05:00
JohnnyHatchet 5af77f839c Правки 2022-07-07 07:30:44 +05:00
GRAFF 81adb1c8cf Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Maps/Interior/GP2/S02A01.umap
#	Content/Meshes/Interior/Window/SM__GP2_Windows_8.uasset
2022-07-06 19:19:23 +05:00
GRAFF b3f52b0654 baking_mops 2022-07-06 19:18:33 +05:00