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

95 Commits

Author SHA1 Message Date
GRAFF ef43cd3d16 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-11 12:28:10 +05:00
GRAFF 9bf066c207 bake_pivotsingsov 2022-07-11 12:27:37 +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
GRAFF 88ea1d965e Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-08 20:11:29 +05:00
GRAFF 4c403a05f8 кнупки 2022-07-08 20:11:26 +05:00
PC-G12 bd4c5283ec Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 
# Conflicts:
#	Content/Meshes/Interior/GP2/MOP/HallDoor/SM_Door_Outer.uasset
 2022-07-08 19:10:31 +05:00
PC-G12 37d50e3fce Mops 2022-07-08 19:07:58 +05:00
GRAFF f4cff46e92 baker 2022-07-08 18:13:30 +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
PC-G06 6a5253fb87 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-07 18:04:58 +05:00
PC-G06 0924317541 S02_Mesh_18_20_27_28_52 2022-07-07 18:04:54 +05:00
GRAFF d0495811d1 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 
# Conflicts:
#	Content/Meshes/Interior/GP2/SM_S02A18.uasset
#	Content/Meshes/Interior/GP2/SM_S02A20.uasset
#	Content/Meshes/Interior/GP2/SM_S02A27.uasset
 2022-07-07 17:32:45 +05:00
GRAFF dcaaf47521 ma baker 2022-07-07 17:32:24 +05:00
PC-G06 f97f65c6bb S02_Door_Inner 2022-07-07 17:17:52 +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
PC-G12 6bd7faa5b0 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 
# Conflicts:
#	Content/Maps/Interior/GP2/S02F02.umap
 2022-07-07 12:12:50 +05:00
PC-G12 fb0dd38a36 MOPS 2022-07-07 12:10:33 +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 4355c94ebe S02_Larin_S 2022-07-06 19:18:00 +05:00
PC-G06 7249e84ffc S0_Danis 2022-07-06 15:57:10 +05:00
PC-G06 929264aa25 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-06 15:14:38 +05:00
Lenta_Mebiusa c4f876e285 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-06 15:10:33 +05:00
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