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

217 Commits

Author SHA1 Message Date
GRAFF 4c403a05f8 кнупки 2022-07-08 20:11:26 +05:00
GRAFF 41f8ab658b Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-08 18:13:33 +05:00
GRAFF f4cff46e92 baker 2022-07-08 18:13:30 +05:00
GRAFF 2a4b767589 Детишки + ЛОДы + удаление пустых карт 2022-07-08 16:59:47 +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
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
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
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
GRAFF 7edddefceb всякие правки 2022-07-07 12:11:07 +05:00
PC-G12 fb0dd38a36 MOPS 2022-07-07 12:10:33 +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 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