EgorSuv/SibIntel1
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
304 Commits 4 Branches 2 Tags
9ffab13cff89fa4fe283b68e41d0e0d0324be2ff
Commit Graph

102 Commits

Author SHA1 Message Date
GRAFF 9ffab13cff Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-13 19:14:38 +05:00
GRAFF c472fb974e svet_potolokMopaFromF2toF3 2022-07-13 19:14:34 +05:00
JohnnyHatchet 18f21f70a2 Фейки поярчее 2022-07-13 17:29:20 +05:00
GRAFF 487e198aa3 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-13 17:11:41 +05:00
GRAFF f49c40ecd8 bp_tochannel2_someprobes_someshitaswell 2022-07-13 17:11:33 +05:00
JohnnyHatchet 231aab80ad равки по цветам матов на крыше + детская площадка 2022-07-13 16:53:30 +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 2d91b20b5b Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-12 17:05:48 +05:00
PC-G06 dd670a8749 S02_Wall_Mat 2022-07-12 17:05:41 +05:00
JohnnyHatchet c7266d640c Новые мафы 2022-07-12 16:43:32 +05:00
JohnnyHatchet d655d381ca Бордюры, фикс тройных деревьев, изменение в ярде 2022-07-12 15:55:20 +05:00
GRAFF 7a13be35ca уфффф 2022-07-12 05:34:44 +05:00
GRAFF 483eaeb472 уф 2022-07-12 04:43:38 +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
JohnnyHatchet 3bc6dcaaa0 Ночное освещение 2022-07-11 11:36:38 +05:00
JohnnyHatchet 435066c4a6 Декаль на внешку (пока 8к) , деревья внешка, выпилил пропсы с дорог (не видно их нифига) 2022-07-11 05:04:24 +05:00
JohnnyHatchet fc4d17a9b0 Decal outside all + foliage rework 2022-07-10 17:54:04 +05:00
GRAFF fb77d65acb Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer 
# Conflicts:
#	Content/Meshes/Interior/GP2/MOP/Elevator/SM_Elevator.uasset
 2022-07-10 12:46:37 +05:00
GRAFF 2f0730d3a8 еще пачка изменений, циферки, лифт, пиздюки, коллизии 2022-07-10 12:44:24 +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 1e4d6298c0 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-07 19:49:57 +05:00
GRAFF 27decfd074 подшаманил немного 2022-07-07 19:42:47 +05:00
GRAFF 7a0fd727f2 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-07 14:31:51 +05:00
GRAFF cc25272b39 ma baker 2022-07-07 14:31:47 +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
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
PC-G06 42cd458583 02A03/11/21/32_2 2022-07-04 19:05:28 +05:00
PC-G06 d7502b9410 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-04 13:48:37 +05:00
PC-G06 38db30ea48 Mat_Tex_Part_1 2022-07-04 13:48:33 +05:00
GRAFF 2dbf73ce3b Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 
# Conflicts:
#	Content/Meshes/Interior/GP2/SM_S02A07.uasset
 2022-07-04 13:09:26 +05:00
GRAFF 65fdaaa4f9 lightbps_testbake_windowsreimport 2022-07-04 13:08:46 +05:00