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

95 Commits

Author SHA1 Message Date
Lenta_Mebiusa 6f0c16e37f S02A43 2022-07-06 15:10:23 +05:00
PC-G12 6acb6e9515 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-06 14:51:24 +05:00
PC-G12 87f154ebea MOPs_Change 2022-07-06 14:51:15 +05:00
PC-G06 2fc5d6b021 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-06 14:37:26 +05:00
PC-G08 e89010d9af S02A03/39/41/48/50_Ladders 2022-07-06 14:36:22 +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
Lenta_Mebiusa aeba9d9075 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-06 12:01:52 +05:00
Lenta_Mebiusa 203ebbc0e8 Правки S02A43, S02A29, S02A18, S02A08, S02A00 2022-07-06 12:01:35 +05:00
PC-G08 ff298d685b Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 
# Conflicts:
#	Content/Maps/Interior/GP2/S02A39.umap
#	Content/Maps/Interior/GP2/S02A41.umap
#	Content/Maps/Interior/GP2/S02A48.umap
#	Content/Meshes/Interior/GP2/Plintuth/Plinth_Up/SM_S02A39_Plinth.uasset
#	Content/Meshes/Interior/GP2/Plintuth/Plinth_Up/SM_S02A41_Plinth.uasset
#	Content/Meshes/Interior/GP2/Plintuth/SM_S02A48_Plintuth.uasset
 2022-07-05 18:56:09 +05:00
PC-G08 9b5ed647c3 S02A03/11/21/32/39/41/46/48/50_Ladders_Plinths 2022-07-05 18:46:53 +05:00
PC-G10 0df2395d06 S02A01 S02A09 S02A19 S02A30 S02A44 SM_S02A01 2022-07-05 16:56:15 +05:00
PC-G06 830c85a5dc S02_Ivan_2 2022-07-05 16:35:30 +05:00
PC-G06 cdcef95694 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 
# Conflicts:
#	Content/Maps/Interior/GP2/S02A04.umap
#	Content/Maps/Interior/GP2/S02A14.umap
#	Content/Maps/Interior/GP2/S02A24.umap
#	Content/Maps/Interior/GP2/S02A34.umap
#	Content/Maps/Interior/GP2/S02A39.umap
#	Content/Maps/Interior/GP2/S02A41.umap
#	Content/Maps/Interior/GP2/S02A53.umap
#	Content/Meshes/Interior/GP2/Plintuth/Plinth_Up/SM_S02A41_Plinth.uasset
#	Content/Meshes/Interior/GP2/Plintuth/Plinth_Up/SM_S02A53_Plinth.uasset
 2022-07-05 14:57:45 +05:00
PC-G06 58dda10d5d S02_Irina 2022-07-05 14:57:05 +05:00
PC-G04 c533b262e8 Irina-Plintuth 2022-07-05 11:36:57 +05:00
PC-G10 98f812fe3f S02A01 S02A09 S02A19 S02A30 S02A44 SM_S02A19 2022-07-04 19:37:56 +05:00
Igor a64581eef1 LVL_02_10_12_20_22_31_33_45_47_Plinth_20_31_45_47_Plintuth_31 2022-07-04 19:16:23 +05:00
PC-G06 42cd458583 02A03/11/21/32_2 2022-07-04 19:05:28 +05:00
PC-G08 2b9f770f50 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-04 18:10:55 +05:00
PC-G08 e4cb5b968c 02A03/11/21/32 2022-07-04 18:10:36 +05:00
PC-G04 1128bcb715 S02A04/14/24/34/39/41/48/53 2022-07-04 17:58:26 +05:00
DESKTOP-8J0BKKD\Admin 9701348b16 S02A06/13/16/23/27/37/40/42/49/51 2022-07-04 17:24:41 +05:00
PC-G06 4f36660ec7 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-04 14:24:21 +05:00
PC-G06 9de580f1e9 S02_03 2022-07-04 14:24:15 +05:00
Igor 1d726b4721 LVL_02_10_12_Plintuth_ID 2022-07-04 14:19:12 +05:00
PC-G08 c0ea0612fb Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-04 14:07:45 +05:00
PC-G08 9fd7ff3c28 GP2A03_A11_A21_A32_A46 2022-07-04 14:07:06 +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
Igor cd4d0e6939 LVL_02_10_12_20_22_31_33_45_47_Plinth_ID 2022-07-04 13:00:45 +05:00
PC-G04 57bc3094ab S02A04\14\24\34\41 2022-07-03 17:01:20 +05:00
Lenta_Mebiusa cfc6026ae2 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-01 20:59:51 +05:00
Lenta_Mebiusa 4f74a08599 Правки 2022-07-01 20:59:44 +05:00
Igor 4f96a95d0e lvl_02_10_12_20_22_31_33_kv02_22_02_kv02_33 2022-07-01 17:26:35 +05:00
Lenta_Mebiusa bc5f8af1aa Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 
# Conflicts:
#	Content/Meshes/Interior/GP2/Plintuth/Plinth_Up/SM_S02A00_Plinth.uasset
#	Content/Meshes/Interior/GP2/Plintuth/Plinth_Up/SM_S02A08_Plinth.uasset
#	Content/Meshes/Interior/GP2/Plintuth/Plinth_Up/SM_S02A18_Plinth.uasset
#	Content/Meshes/Interior/GP2/Plintuth/Plinth_Up/SM_S02A29_Plinth.uasset
#	Content/Meshes/Interior/GP2/Plintuth/SM_S02A00_Plintuth.uasset
#	Content/Meshes/Interior/GP2/Plintuth/SM_S02A08_Plintuth.uasset
#	Content/Meshes/Interior/GP2/Plintuth/SM_S02A18_Plintuth.uasset
#	Content/Meshes/Interior/GP2/Plintuth/SM_S02A29_Plintuth.uasset
 2022-07-01 16:53:59 +05:00
Lenta_Mebiusa c4972421f1 Плинтуса UV 2022-07-01 16:50:58 +05:00
PC-G06 a01456669b ID_Plinth_Room 2022-07-01 16:26:42 +05:00
PC-G06 f0c6e8f2c0 Interior_Plinth_Up 2022-06-29 16:12:10 +05:00
PC-G12 2a0387d5e1 Flat_Levels 2022-06-27 16:31:15 +05:00
PC-G12 19b1740315 S02A46 2022-06-22 19:35:27 +05:00
PC-G12 d178690c3a Fast_Materials 2022-06-22 15:01:28 +05:00
GRAFF 3e7ff77933 over9000 интерфейса и этажи 2022-05-26 11:55:51 +05:00