Commit Graph

76 Commits

Author SHA1 Message Date
PC-G13 48b33afbca cuminas 2023-08-28 20:10:50 +05:00
Dron 7f8f4702ab fasadhide fix 2023-08-24 19:53:37 +05:00
PC-G13 44ea14ab1d int 2023-08-23 16:41:51 +05:00
PC-G13 e2467e08dc pravkiinterior 2023-08-21 19:50:31 +05:00
PC-G13 4dd33bc0b2 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-11 15:27:43 +05:00
PC-G13 4795f77d71 se03a07 and someintfixes 2023-08-11 15:27:36 +05:00
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-G04 303a7df9b6 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-10 14:41:37 +05:00
PC-G04 1bbdf3b1e0 Se03 interiors 2023-08-10 14:39:19 +05:00
PC-G13 950ad8a726 genplan part1 2023-08-09 16:17:35 +05:00
PC-G13 db0177582e se01 2023-08-08 18:41:17 +05:00
PC-G13 fa63b3ec23 daebanuifork 2023-08-08 12:24:32 +05:00
PC-G13 1dd7511264 se01 2023-08-08 12:23:52 +05:00
PC-G13 85eac5b9a5 int 2023-08-03 17:02:37 +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
PC-G13 07d07d3e1c parking 2022-09-27 18:49:35 +05:00
GRAFF 12e1fc4869 паркингхуяркинг 2022-09-20 15:45:00 +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 d6cb448d25 parking 2022-09-19 19:41:24 +05:00
GRAFF fd6c048677 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-09-19 14:29:49 +05:00
GRAFF 4a59caea76 s 2022-09-19 14:29:46 +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
PC-G12 b08d12254c Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-09-16 19:06:47 +05:00
PC-G12 0b89e97f1a Parking_WIP1 2022-09-16 19:06:09 +05:00
GRAFF d580c52ea8 smt 2022-09-16 17:42:10 +05:00
PC-G06 ad61431ebf Main_Building_Furniture 2022-09-14 16:19:14 +05:00
GRAFF 738da108c1 gp3 2022-09-12 19:38:47 +05:00
GRAFF 1512444078 gp3_check_gp2baketocheck 2022-09-12 13:25:19 +05:00
GRAFF ffeb51dd98 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-09-07 18:12:40 +05:00
GRAFF 3ab5e34064 a00,a06, lamps 2022-09-07 18:12:38 +05:00
PC-G06 09b699c35c GP_2_Interior_Repair 2022-09-07 18:03:45 +05:00
GRAFF 48a4625dba 060705 2022-08-29 17:05:23 +05:00
PC-G12 24c7efc671 11 2022-08-28 15:05:30 +05:00
GRAFF 637a9e8332 gp3 2022-08-27 15:48:58 +05:00
GRAFF 756e6af75d Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Maps/Interior/GP3/Walls/W_S03F05-06_A06.umap
2022-08-26 14:48:47 +05:00
GRAFF 84f5ef6d28 GP3_mats,a06 2022-08-26 14:48:23 +05:00
PC-G06 2b68221bf4 S03A02_Interior 2022-08-25 17:59:43 +05:00
GRAFF 6922c73378 gp3 2022-08-24 18:24:33 +05:00
GRAFF e1f75b852a interiormats, GP2 Mops + volumetric rebaked 2022-08-24 12:41:02 +05:00
GRAFF 69e06fe92d gp3_tr 2022-08-22 15:49:43 +05:00
GRAFF 593042a336 GP3_Interior 2022-08-22 14:59:53 +05:00
GRAFF b91b531ea7 вход с 2 этажа, 2этажные переключения, всякое говно еще, тачки катают по светофорам, коллизии 2022-07-18 02:58:05 +05:00
GRAFF e925269d96 Revert "S02_Collision"
This reverts commit 7c07922e99.
2022-07-13 22:21:26 +05:00