Commit Graph

69 Commits

Author SHA1 Message Date
GRAFF 29b26e20d0 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Maps/Interior/GP3/F19/S03F19A07.umap
#	Content/Maps/Interior/GP3/Walls/W_S03F05-06_A04.umap
#	Content/Maps/Interior/GP3/Walls/W_S03F05-06_A08.umap
#	Content/Maps/Interior/GP3/Walls/W_S03F07-08_A08.umap
#	Content/Maps/Interior/GP3/Walls/W_S03F09-10_A08.umap
#	Content/Meshes/Interior/GP3/Plinth/SM_S03A08_Plintuth.uasset
2022-08-29 14:18:46 +05:00
GRAFF 2b3dc3a2ac gp3_06-08 2022-08-29 14:18:02 +05:00
PC-G04 5a1c44b9d9 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-08-27 16:30:15 +05:00
PC-G04 f91c11767f ИРИНА 2022-08-27 16:29:54 +05:00
GRAFF ce11242e69 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-08-27 15:49:26 +05:00
GRAFF 637a9e8332 gp3 2022-08-27 15:48:58 +05:00
Igor 617b4a821c F_S03A10 F_S03A05 2022-08-26 18:42:40 +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-G12 77b659f1ff Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-08-25 19:59:09 +05:00
PC-G12 42835e69d7 MOPs 5 11 16 2022-08-25 19:59:00 +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 6195c4f638 tone 2022-08-22 18:13:36 +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 bff9ac53f4 smsht 2022-08-15 12:29:17 +05:00
GRAFF 46acf3dcbb еще гора исправлений 2022-08-01 03:27:16 +05:00
GRAFF 84a39b357e правка косячин и еще дополнения 2022-08-01 01:08:07 +05:00
GRAFF b91b531ea7 вход с 2 этажа, 2этажные переключения, всякое говно еще, тачки катают по светофорам, коллизии 2022-07-18 02:58:05 +05:00
GRAFF 26f9b1992c f2full+mops 2022-07-14 17:00:18 +05:00
GRAFF c472fb974e svet_potolokMopaFromF2toF3 2022-07-13 19:14:34 +05:00
GRAFF f49c40ecd8 bp_tochannel2_someprobes_someshitaswell 2022-07-13 17:11:33 +05:00
GRAFF 79ba064d8a Sveta 2022-07-13 14:55:57 +05:00
PC-G06 7154facfbb S02_Door_Lameli_Plintuth 2022-07-12 19:46:33 +05:00
PC-G06 dd670a8749 S02_Wall_Mat 2022-07-12 17:05:41 +05:00
GRAFF 7a13be35ca уфффф 2022-07-12 05:34:44 +05:00
GRAFF 9c1e45253d f1_koliz 2022-07-11 21:01:51 +05:00
PC-G06 5d2660acc2 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-11 20:02:59 +05:00
PC-G06 909a6bb4b9 S02F01_Mat 2022-07-11 20:02:55 +05:00
GRAFF 558981b84c 22 2022-07-11 18:50:45 +05:00
GRAFF c0dac5cc89 mops_F2-20 2022-07-11 17:55:05 +05:00
PC-G12 37d50e3fce Mops 2022-07-08 19:07:58 +05:00
GRAFF 47d640a706 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Maps/Interior/GP2/S02A30.umap
#	Content/Maps/Interior/GP2/S02A31.umap
#	Content/Maps/Interior/GP2/S02A47.umap
#	Content/Meshes/Interior/GP2/Plintuth/Plinth_Up/SM_S02A30_Plinth.uasset
#	Content/Meshes/Interior/GP2/SM_S02A30.uasset
2022-07-08 10:45:49 +05:00
GRAFF 325f4302a6 mama mama, ma baker 2022-07-08 10:45:33 +05:00
PC-G06 e4587618b5 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-07 20:14:45 +05:00
PC-G06 6cd8561207 S0_New_UV_Part_1 2022-07-07 20:14:42 +05:00
PC-G12 28c9d15314 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-07 20:09:15 +05:00
PC-G12 0c55ced6ec Mopz 2022-07-07 20:08:50 +05:00
GRAFF cc25272b39 ma baker 2022-07-07 14:31:47 +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
PC-G06 73052f0037 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-06 14:23:56 +05:00
PC-G06 789a5e121d S02A17 2022-07-06 14:23:51 +05:00
GRAFF d7c5b1ab11 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Furniture/Vol2_Unsorted/Unimodels_Department_Vol_1/Materials/MI_Plastic_002.uasset
#	Content/Materials/Masharov_Interior/Palette/MI_Floor_Ceramic_Mash.uasset
#	Content/Meshes/Interior/Furniture/Radiator/Materials/MI_Radiator_ORM.uasset
2022-07-06 12:27:07 +05:00
GRAFF d2bce4cf59 mops_baking 2022-07-06 12:26:16 +05:00
PC-G06 830c85a5dc S02_Ivan_2 2022-07-05 16:35:30 +05:00
PC-G06 58dda10d5d S02_Irina 2022-07-05 14:57:05 +05:00
PC-G06 8f8cad01f5 S02_Ivan 2022-07-04 19:44:50 +05:00