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

211 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
GRAFF 27decfd074 подшаманил немного 2022-07-07 19:42:47 +05:00
GRAFF fda80f0b65 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer 
# Conflicts:
#	Config/DefaultEngine.ini
#	Config/DefaultGame.ini
#	Content/Blueprints/Lamp/BP_InteriorLamp_CylLamp.uasset
#	Content/Blueprints/Lamp/BP_streetLamp.uasset
#	Content/Blueprints/Lamp/BP_streetLamp_Child_6m.uasset
#	Content/Blueprints/Player/GI.uasset
#	Content/Blueprints/Player/MathAndConvertFns.uasset
#	Content/Blueprints/Player/MyPawn.uasset
#	Content/Blueprints/Player/WalkingPawn.uasset
#	Content/Blueprints/Player/myGM.uasset
#	Content/Blueprints/UI/Actors/InfraPoint.uasset
#	Content/Blueprints/UI/Actors/KPmaker.uasset
#	Content/Blueprints/UI/Others/FlatData.uasset
#	Content/Blueprints/UI/Others/clientData.uasset
#	Content/Blueprints/UI/WBPS/Elements/MenuBtn.uasset
#	Content/Blueprints/UI/WBPS/KPWidget.uasset
#	Content/Blueprints/UI/WBPS/Menu/InfoPanel.uasset
#	Content/Blueprints/UI/WBPS/Menu/MainMenu.uasset
#	Content/Blueprints/UI/WBPS/Menu/bottomMenu.uasset
#	Content/Blueprints/UI/WBPS/Menu/flatInfoBig.uasset
#	Content/Blueprints/UI/WBPS/Menu/floorInfo.uasset
#	Content/Blueprints/UI/WBPS/Menu/houseInfo.uasset
#	Content/Blueprints/UI/WBPS/Menu/saveData.uasset
#	Content/Blueprints/UI/WBPS/Menu/welcomeData.uasset
#	Content/Blueprints/UI/WBPS/filter/Filter.uasset
#	Content/Blueprints/UI/WBPS/filter/FlatCard.uasset
#	Content/Blueprints/UI/WBPS/filter/FlatCardBig.uasset
#	Content/Blueprints/UI/WBPS/widgetActions.uasset
#	Content/Maps/Interior/GP2/S02A17.umap
#	Content/Maps/Interior/GP2/S02F02.umap
#	Content/Maps/Interior/GP2/S02F03-12.umap
#	Content/Maps/Interior/GP2/S02F13-16.umap
#	Content/Maps/Interior/GP2/S02F17-18.umap
#	Content/Maps/Interior/GP2/S02F19.umap
#	Content/Maps/Interior/GP2/S02F20.umap
#	Content/Maps/Interior/L_Test_Room.umap
#	Content/Maps/Masharov_Buildings.umap
#	Content/Maps/Masharov_Landscape.umap
#	Content/Maps/Masharov_Yard.umap
#	Content/Maps/mainScene.umap
#	Content/Maps/test1.umap
#	Content/Materials/Masharov_Interior/Palette/MI_Emissive_2_Mash.uasset
#	Content/Materials/Masharov_Interior/Palette/MI_Emissive_Mash.uasset
#	Content/Meshes/Exterior/Main/SM_Masharov_GP3_pos.uasset
#	Content/Meshes/Interior/Furniture/Kitchen/Modular/SM_Down_Locker_With_Sink.uasset
#	Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_Chandelier_1.uasset
#	Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_Chandelier_2.uasset
#	Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_Chandelier_Lamp_2_V2.uasset
#	Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_Chandelier_Lamp_V2.uasset
#	Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_Torchere_2.uasset
#	Content/Meshes/Interior/Furniture/Other/SM_Door_Invis.uasset
#	Masharov.uproject
 2022-07-07 12:23:47 +05:00
GRAFF 7edddefceb всякие правки 2022-07-07 12:11:07 +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 b2bfa0b9a3 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-06 19:18:03 +05:00
PC-G06 4355c94ebe S02_Larin_S 2022-07-06 19:18:00 +05:00
GRAFF bf557cb75c Девчата + отключенный плагин 2022-07-06 19:00:06 +05:00
PC-G10 34646dbf5d S02A01 09 19 30 44 2022-07-06 16:26:19 +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-G10 4df629b727 S02A01 09 19 30 44 2022-07-06 15:00:53 +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 84d45e20ac Revert "Revert "8 мужиков и две бабёнки"" 
This reverts commit 8b8dfdbe81.
 2022-07-06 13:06:01 +05:00
GRAFF 8b8dfdbe81 Revert "8 мужиков и две бабёнки" 
This reverts commit a88dece67d.
 2022-07-06 12:46:09 +05:00
GRAFF cac0fda5f9 Revert "Что то с плагинами" 
This reverts commit 89868049c8.
 2022-07-06 12:46:00 +05:00
Lenta_Mebiusa 6ccd82a770 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-06 12:30:21 +05:00
Lenta_Mebiusa 89868049c8 Что то с плагинами 2022-07-06 12:29:59 +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
GRAFF a88dece67d 8 мужиков и две бабёнки 2022-07-05 17:51:33 +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
Igor 87e2e31d23 LVL_02_10_12_20_22_31_33_45_47 2022-07-05 15:50:13 +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-G03 b1e40d3d0c S02A(05 15 25 26 35 36) 2022-07-05 13:38:20 +05:00
DESKTOP-8J0BKKD\Admin 12e2a02b2e S02A06/13/16/23/27/37/40/42/49/51 правки 2022-07-05 12:33:31 +05:00
PC-G04 c533b262e8 Irina-Plintuth 2022-07-05 11:36:57 +05:00
PC-G06 e8cbea661f S0_Nikita 2022-07-04 20:01:28 +05:00
PC-G06 c7e702ee81 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-04 19:45:03 +05:00
PC-G06 8f8cad01f5 S02_Ivan 2022-07-04 19:44:50 +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
DESKTOP-8J0BKKD\Admin caadc7d533 S02A06/13/16/23/27/37/40/42/49/51 2022-07-04 18:35:29 +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