diff --git a/data_from_portwine/changelog b/data_from_portwine/changelog index 5da46dbf..e2444b00 100644 --- a/data_from_portwine/changelog +++ b/data_from_portwine/changelog @@ -10,6 +10,10 @@ * добавить комментарии описывающие функционал скриптов * заниматься только развитием проекта за счет вашей подписки на https://boosty.to/portwine-linux.ru ----------------------------------------- +###Scripts version 2010### +* FIX - исправлено управление мышкой в Overwatch и рекомендованы пар-ры запуска DXVK + PROTON_GE +* добавлены все предустановленные шейдеры в vkBasalt.conf + ###Scripts version 2009### * FIX - исправлен перезапуск редактора db файлов при первом включении PW_GUI_DISABLED_CS (отключение запуска GUI) diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 92fc5bbd..a54101fd 100644 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -472,7 +472,7 @@ pw_update_notifier () { read current_ver < "${PORT_WINE_TMP_PATH}/${portname}_cur_ver" try_remove_file "${PORT_WINE_TMP_PATH}/${portname}_cur_ver" if [ ! -z "${current_ver}" ] && [ "${current_ver}" -gt "${install_ver}" ] ; then - xsd=`zenity --title "${port_upd1}" --text "${port_upd2}" --list --radiolist --height=230 --column="${inst_set}" --column "${port_upd3}" \ + xsd=`zenity --title "${port_upd1}" --text "${port_upd2}" --list --radiolist --height=240 --column="${inst_set}" --column "${port_upd3}" \ TRUE "${port_upd4}" \ FALSE "${port_upd5}" \ FALSE "${port_upd6}" ` @@ -534,7 +534,7 @@ pw_scripts_update () { echo "Scripts version in github = ${scripts_current_ver}" echo "Scripts version local = ${scripts_install_ver}" if [ ! -z "${scripts_current_ver}" ] && [ "${scripts_current_ver}" -gt "${scripts_install_ver}" ] ; then - xcsd=`zenity --title "${scripts_upd1}" --text "${scripts_upd2}" --list --radiolist --height=230 --column="${inst_set}" --column "${scripts_upd3}" \ + xcsd=`zenity --title "${scripts_upd1}" --text "${scripts_upd2}" --list --radiolist --height=240 --column="${inst_set}" --column "${scripts_upd3}" \ TRUE "${scripts_upd4}" \ FALSE "${scripts_upd5}" \ FALSE "${scripts_upd6}"` diff --git a/data_from_portwine/scripts/portwine_db/Battle.net_Launcher b/data_from_portwine/scripts/portwine_db/Battle.net_Launcher index dc0bda0e..dff121fd 100644 --- a/data_from_portwine/scripts/portwine_db/Battle.net_Launcher +++ b/data_from_portwine/scripts/portwine_db/Battle.net_Launcher @@ -5,7 +5,9 @@ #Battle.net.exe #Rating=5 ################################################ -##export PW_VULKAN_USE=dxvk +export PW_COMMENT_DB="We recommend using PROTON_GE + DXVK!" +export PW_WINE_USE=proton_ge +export PW_VULKAN_USE=dxvk export LAUNCH_PARAMETERS="" export WINEDLLOVERRIDES="locationapi=" export PW_DLL_INSTALL="vcrun2019 d3dx11_42 d3dx11_43" @@ -17,4 +19,5 @@ add_in_start_portwine () { rm -fr "${PORT_WINE_PATH}/data/pfx/drive_c/users/${USER}/Blizzard Entertainment/Battle.net/Cache" rm -fr "${PORT_WINE_PATH}/data/pfx/drive_c/users/Public/Blizzard Entertainment/Battle.net/Cache" try_remove_file "${PORT_WINE_PATH}/data/pfx/drive_c/windows/Fonts/sourcehansans.ttc" + sed -i 's/"GrabFullscreen"="Y"/"GrabFullscreen"="N"/' "${WINEPREFIX}/user.reg" } diff --git a/data_from_portwine/scripts/portwine_db/witcher3 b/data_from_portwine/scripts/portwine_db/witcher3 index dfc1e118..833ca399 100755 --- a/data_from_portwine/scripts/portwine_db/witcher3 +++ b/data_from_portwine/scripts/portwine_db/witcher3 @@ -7,7 +7,7 @@ export PW_VULKAN_USE=dxvk #####################examples########################### ##export PW_COMMENT_DB="blablabla" ##export PW_WINDOWS_VER=10 # Set windows version 10, 7 or XP -##export PW_DLL_INSTALL="vcrun2017" # Install DDL in port prefix (used winetricks) +##export PW_DLL_INSTALL="vcrun2017" # Install DDL in port prefix (used winetricks) ##export WINEDLLOVERRIDES="blabla=n,b" ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options ##export PW_VULKAN_USE=dxvk # dxvk, vkd3d or 0 for OpenGL diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index e282c53b..f903561a 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -1,6 +1,6 @@ #!/bin/bash #Author: Castro-Fidel (PortWINE-Linux.ru) -#SCRIPTS_NEXT_VERSION=2009 +#SCRIPTS_NEXT_VERSION=2010 ######################################################################## export PW_MANGOHUD=1 export MANGOHUD_CONFIG=font_size=24,position=top-left,toggle_hud=Shift_R+F12,no_display,resolution,wine,gpu_name,vulkan_driver,gpu_stats,vkbasalt diff --git a/data_from_portwine/vkBasalt.conf b/data_from_portwine/vkBasalt.conf index bc56d3f2..cd574637 100644 --- a/data_from_portwine/vkBasalt.conf +++ b/data_from_portwine/vkBasalt.conf @@ -1,21 +1,78 @@ reshadeTexturePath = /usr/local/share/reshade/textures reshadeIncludePath = /usr/local/share/reshade/ +3DFX = /usr/local/share/reshade/shaders/3DFX.fx +AdaptiveFog = /usr/local/share/reshade/shaders/AdaptiveFog.fx +AdaptiveSharpen = /usr/local/share/reshade/shaders/AdaptiveSharpen.fx +AmbientLight = /usr/local/share/reshade/shaders/AmbientLight.fx +ASCII = /usr/local/share/reshade/shaders/ASCII.fx +AspectRatio = /usr/local/share/reshade/shaders/AspectRatio.fx +Bloom = /usr/local/share/reshade/shaders/Bloom.fx +Border = /usr/local/share/reshade/shaders/Border.fx +Cartoon = /usr/local/share/reshade/shaders/Cartoon.fx +ChromaKey = /usr/local/share/reshade/shaders/ChromaKey.fx +ChromaticAberration = /usr/local/share/reshade/shaders/ChromaticAberration.fx +CinematicDOF = /usr/local/share/reshade/shaders/CinematicDOF.fx +Clarity = /usr/local/share/reshade/shaders/Clarity.fx +ColorMatrix = /usr/local/share/reshade/shaders/ColorMatrix.fx +Colourfulness = /usr/local/share/reshade/shaders/Colourfulness.fx +CRT = /usr/local/share/reshade/shaders/CRT.fx +Curves = /usr/local/share/reshade/shaders/Curves.fx +Daltonize = /usr/local/share/reshade/shaders/Daltonize.fx +Deband = /usr/local/share/reshade/shaders/Deband.fx +Denoise = /usr/local/share/reshade/shaders/Denoise.fx +Depth3D = /usr/local/share/reshade/shaders/Depth3D.fx +Dephhaze = /usr/local/share/reshade/shaders/Dephhaze.fx +DisplayDepth = /usr/local/share/reshade/shaders/DisplayDepth.fx +DOF = /usr/local/share/reshade/shaders/DOF.fx +DPX = /usr/local/share/reshade/shaders/DPX.fx +Emphasize = /usr/local/share/reshade/shaders/Emphasize.fx +EyeAdaption = /usr/local/share/reshade/shaders/EyeAdaption.fx +FakeHDR = /usr/local/share/reshade/shaders/FakeHDR.fx FakeMotionBlur = /usr/local/share/reshade/shaders/FakeMotionBlur.fx +FilmGrain = /usr/local/share/reshade/shaders/FilmGrain.fx +FilmGrain2 = /usr/local/share/reshade/shaders/FilmGrain2.fx +FilmicAnamorphSharpen = /usr/local/share/reshade/shaders/FilmicAnamorphSharpen.fx +FilmicPass = /usr/local/share/reshade/shaders/FilmicPass.fx +FineSharp = /usr/local/share/reshade/shaders/FineSharp.fx FXAA = /usr/local/share/reshade/shaders/FXAA.fx GaussianBlur = /usr/local/share/reshade/shaders/GaussianBlur.fx +Glitch = /usr/local/share/reshade/shaders/Glitch.fx +HighPassSharpen = /usr/local/share/reshade/shaders/HighPassSharpen.fx HQ4X = /usr/local/share/reshade/shaders/HQ4X.fx +HSLShift = /usr/local/share/reshade/shaders/HSLShift.fx Layer = /usr/local/share/reshade/shaders/Layer.fx +Levels = /usr/local/share/reshade/shaders/Levels.fx LevelsPlus = /usr/local/share/reshade/shaders/LevelsPlus.fx +LiftGammaGain = /usr/local/share/reshade/shaders/LiftGammaGain.fx +LightDoF = /usr/local/share/reshade/shaders/LightDoF.fx +LumaSharpen = /usr/local/share/reshade/shaders/LumaSharpen.fx +LUT = /usr/local/share/reshade/shaders/LUT.fx MagicBloom = /usr/local/share/reshade/shaders/MagicBloom.fx +Monochrome = /usr/local/share/reshade/shaders/Monochrome.fx +MultiLUT = /usr/local/share/reshade/shaders/MultiLUT.fx +MXAO = /usr/local/share/reshade/shaders/MXAO.fx +NightVision = /usr/local/share/reshade/shaders/NightVision.fx +Nostalgia = /usr/local/share/reshade/shaders/Nostalgia.fx +PerfectPerspective = /usr/local/share/reshade/shaders/PerfectPerspective.fx +PPFX_Bloom = /usr/local/share/reshade/shaders/PPFX_Bloom.fx +PPFX_Godrays = /usr/local/share/reshade/shaders/PPFX_Godrays.fx +Prism = /usr/local/share/reshade/shaders/Prism.fx ReflectiveBumpMapping = /usr/local/share/reshade/shaders/ReflectiveBumpMapping.fx +Sepia = /usr/local/share/reshade/shaders/Sepia.fx SMAA = /usr/local/share/reshade/shaders/SMAA.fx +Splitscreen = /usr/local/share/reshade/shaders/Splitscreen.fx +StageDepth = /usr/local/share/reshade/shaders/StageDepth.fx +SurfaceBlur = /usr/local/share/reshade/shaders/SurfaceBlur.fx +Technicolor = /usr/local/share/reshade/shaders/Technicolor.fx +Technicolor2 = /usr/local/share/reshade/shaders/Technicolor2.fx +TiltShift = /usr/local/share/reshade/shaders/TiltShift.fx Tonemap = /usr/local/share/reshade/shaders/Tonemap.fx +TriDither = /usr/local/share/reshade/shaders/TriDither.fx +UIDetect = /usr/local/share/reshade/shaders/UIDetect.fx +UIMask = /usr/local/share/reshade/shaders/UIMask.fx +Vibrance = /usr/local/share/reshade/shaders/Vibrance.fx Vignette = /usr/local/share/reshade/shaders/Vignette.fx -Curves = /usr/local/share/reshade/shaders/Curves.fx -FakeHDR = /usr/local/share/reshade/shaders/FakeHDR.fx -AdaptiveSharpen = /usr/local/share/reshade/shaders/AdaptiveSharpen.fx -FilmGrain2 = /usr/local/share/reshade/shaders/FilmGrain2.fx -casSharpness = 0.7 +casSharpness=0.7 toggleKey = Home effects = FakeHDR:cas