From d982c8fab31256d3f3ace0fce2d3eaa098e34a6c Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Mon, 15 May 2023 02:19:05 +0300 Subject: [PATCH] Scripts version 2183 --- data_from_portwine/changelog_eng | 9 +++- data_from_portwine/changelog_rus | 7 +++ data_from_portwine/dxvk.conf | 8 +-- data_from_portwine/scripts/functions_helper | 10 ++-- data_from_portwine/scripts/lang | 5 +- .../scripts/portwine_db/EALauncher | 10 ++-- data_from_portwine/scripts/portwine_db/Icarus | 10 ++++ .../scripts/pw_autoinstall/PW_EAAPP | 9 ++-- data_from_portwine/scripts/runlib | 49 +++++++++---------- data_from_portwine/scripts/start.sh | 2 +- data_from_portwine/scripts/var | 8 +-- data_from_portwine/scripts/zen_yad_gui | 3 +- 12 files changed, 77 insertions(+), 53 deletions(-) create mode 100644 data_from_portwine/scripts/portwine_db/Icarus diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index 9cbcab6..00538d4 100755 --- a/data_from_portwine/changelog_eng +++ b/data_from_portwine/changelog_eng @@ -2,12 +2,17 @@ You can help us in the development of the project on the website: boosty.to/linu ----------------------------------------- Changelog: -###Scripts version 2181### +###Scripts version 2183### +* minor fixes +* updated versions: + DXVK_GIT_VER="2.2-1" + VKD3D_GIT_VER="1.1-3414" + +###Scripts version 2182### * updated versions: PROTON_GE="8-3" DXVK_GIT_VER="2.1-85" VKD3D_GIT_VER="1.1-3413" -* удалена устаревшая функция определения видеокарты от NVIDIA ###Scripts version 2181### * updated versions: diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index c8a92ad..9782f6a 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,6 +2,13 @@ ----------------------------------------- История изменений: +###Scripts version 2183### +* небольшие изменения функции скачивания +* добавлен экспериментальный префикс PROGRAMS +* обновлены версии (исправлен запуск BattleNET и vkPlay на новейших версиях DXVK и VKD3D): + DXVK_GIT_VER="2.2-1" + VKD3D_GIT_VER="1.1-3414" + ###Scripts version 2182### * обновлены версии: PROTON_GE="8-3" diff --git a/data_from_portwine/dxvk.conf b/data_from_portwine/dxvk.conf index 7299839..8a6e232 100755 --- a/data_from_portwine/dxvk.conf +++ b/data_from_portwine/dxvk.conf @@ -24,8 +24,8 @@ # # Supported values : Any non-negative integer -# dxgi.maxFrameRate = 0 -# d3d9.maxFrameRate = 0 +dxgi.maxFrameRate = 240 +d3d9.maxFrameRate = 240 # Override PCI vendor and device IDs reported to the application. Can @@ -84,8 +84,8 @@ dxgi.customVendorId = 10de # # Supported values: Any non-negative number -# dxgi.syncInterval = -1 -# d3d9.presentInterval = -1 +# dxgi.syncInterval = 0 +# d3d9.presentInterval = 0 # True enables the mailbox present mode in case regular Vsync is disabled. diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index ee8cd2e..c805b96 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -105,7 +105,7 @@ export -f check_process try_download () { PW_DOWNLOAD_FILE_NAME="$(basename $1)" set -o pipefail - wget -O "$2" --read-timeout 300 --retry-connrefused --timeout 15 --tries 2 \ + wget -O "$2" --read-timeout 300 --retry-connrefused --timeout 4 --tries 2 --no-dns-cache --no-cache \ --user-agent="Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" "${1}" 2>&1 | \ tr '\r' '\n' | sed -u 's/.* \([0-9]\+%\)\ \+\([0-9,.]\+.\) \(.*\)/\1\n#Downloading at \1\/, \2\/s, ETA \3/; s/^20[0-9][0-9].*/#Done./' | \ zenity --progress --percentage=0 --title="Download ${PW_DOWNLOAD_FILE_NAME}" --text=Starting... --auto-close --width=500 --height=90 @@ -113,10 +113,10 @@ try_download () { print_error "Failed to download ${PW_DOWNLOAD_FILE_NAME} from GitHub." print_info "Try download ${PW_DOWNLOAD_FILE_NAME} from FTP" try_remove_file "$2" - wget -O "$2" --read-timeout 300 --retry-connrefused --timeout 15 --tries 2 \ + wget -O "$2" --read-timeout 300 --retry-connrefused --timeout 4 --tries 2 --no-dns-cache --no-cache \ --user-agent="Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" --ftp-user=anonymous "ftp://171.22.215.18/archives/${PW_DOWNLOAD_FILE_NAME}" 2>&1 | \ tr '\r' '\n' | sed -u 's/.* \([0-9]\+%\)\ \+\([0-9,.]\+.\) \(.*\)/\1\n#Downloading at \1\/, \2\/s, ETA \3/; s/^20[0-9][0-9].*/#Done./' | \ - zenity --progress --percentage=0 --title="Download ${PW_DOWNLOAD_FILE_NAME}" --text=Starting... --auto-close --width=500 --height=90 + zenity --progress --percentage=0 --title="Try download ${PW_DOWNLOAD_FILE_NAME} from FTP" --text=Starting... --auto-close --width=500 --height=90 if [ "${PIPESTATUS[0]}" != 0 ] ; then print_error "Failed to download ${PW_DOWNLOAD_FILE_NAME} from FTP." try_remove_file "$2" @@ -129,7 +129,7 @@ try_download () { try_download_to_path () { set -o pipefail - wget --directory-prefix="$2" --read-timeout 300 --retry-connrefused --timeout 15 --tries 3 \ + wget --directory-prefix="$2" --read-timeout 300 --retry-connrefused --timeout 4 --tries 2 --no-dns-cache --no-cache \ --user-agent="Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" "$1" 2>&1 | \ tr '\r' '\n' | sed -u 's/.* \([0-9]\+%\)\ \+\([0-9,.]\+.\) \(.*\)/\1\n#Downloading at \1\/, \2\/s, ETA \3/; s/^20[0-9][0-9].*/#Done./' | \ zenity --progress --percentage=0 --title="Download $(basename $1)" --text=Starting... --auto-close --width=500 --height=90 @@ -142,7 +142,7 @@ try_download_to_path () { } try_download_silent () { - wget -O "$2" --read-timeout 300 --retry-connrefused --timeout 15 --tries 3 \ + wget -O "$2" --read-timeout 300 --retry-connrefused --timeout 4 --tries 2 --no-dns-cache --no-cache \ --user-agent="Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" "$1" if [ "${PIPESTATUS[0]}" != 0 ] ; then print_error "Failed to download $1. Skipping." diff --git a/data_from_portwine/scripts/lang b/data_from_portwine/scripts/lang index b67d701..be4ce74 100755 --- a/data_from_portwine/scripts/lang +++ b/data_from_portwine/scripts/lang @@ -88,8 +88,7 @@ then export ENABLE_VKBASALT_INFO='Включить vkBasalt по умолчанию для улучшение графики в играх работающих под Vulkan. (Горячая клавиша HOME отключает vkbasalt)' export PW_NO_ESYNC_INFO='Не использовать примитивы внутрипроцессной синхронизации на основе eventfd. (Рекомендуется не изменять значение)' export PW_NO_FSYNC_INFO='Не использовать примитивы внутрипроцессной синхронизации на основе фьютексов. (Автоматически отключается в системах без FUTEX_WAIT_MULTIPLE поддержки) (Рекомендуется не изменять значение)' - export PW_USE_DXR10_INFO='Включить поддержку Ray Tracing v.1.0' - export PW_USE_DXR11_INFO='Включить поддержку Ray Tracing v.1.1 (бета)' + export PW_USE_RAY_TRACING_INFO='Включить поддержку vkd3d - Ray Tracing' export PW_FIX_VIDEO_IN_GAME_INFO='Требуется для воспроизведения видео в некоторых играх, чтобы оно не было искажено (обычно окрашено в розовый цвет)' export PW_VULKAN_NO_ASYNC_INFO='Выключить асинхронные вызовы для режимов VULKAN и DXVK' export PW_USE_NVAPI_AND_DLSS_INFO='Включить DLSS на поддерживаемых видеокартах NVIDIA' @@ -146,7 +145,7 @@ then export loc_gui_create_shortcut_for_exe="Выберите .exe файл для которого необходимо создать ярлык и нажмите ОК.\n" export loc_gui_error='Ошибка.' - export loc_gui_error_download="Проверьте интернет соединение и\nнажмите OK для повторной попытки скачивания" + export loc_gui_error_download="Проверьте интернет соединение и\nнажмите Repeat для повторной попытки скачивания" export loc_gui_settings="Пожалуйста подождите." export loc_gui_sett_info="Обновление конфигурации PortProton..." export loc_gui_edit_db="Изменение файла настроек для:" diff --git a/data_from_portwine/scripts/portwine_db/EALauncher b/data_from_portwine/scripts/portwine_db/EALauncher index d9ee5a4..23b7c33 100755 --- a/data_from_portwine/scripts/portwine_db/EALauncher +++ b/data_from_portwine/scripts/portwine_db/EALauncher @@ -7,8 +7,10 @@ # export PW_DLL_INSTALL="vcrun2022" # Install DDL in port prefix (used winetricks) export PW_VULKAN_USE=1 # dxvk, vkd3d or 0 for OpenGL # export PW_USE_TERMINAL="1" -export PW_MUST_HAVE_DLL="" -export PW_PREFIX_NAME="EA_APP" -# export PW_WINE_USE="WINE-8.2-STAGING-TKG-AMD64" -# gui_proton_downloader silent "WINE-8.2-STAGING-TKG-AMD64" export DISABLE_CP_DEFPFX=1 +export PW_USE_D3D_EXTRAS=0 +export PW_MUST_HAVE_DLL="d3dx9 d3dcompiler_43 d3dcompiler_47" +export PW_PREFIX_NAME="EA_APP" +export WINEDLLOVERRIDES="winemenubuilder=d" +# export PW_WINE_USE="WINE-8.8-STAGING-AMD64" +# gui_proton_downloader silent "WINE-8.8-STAGING-AMD64" diff --git a/data_from_portwine/scripts/portwine_db/Icarus b/data_from_portwine/scripts/portwine_db/Icarus new file mode 100644 index 0000000..b1ec3cb --- /dev/null +++ b/data_from_portwine/scripts/portwine_db/Icarus @@ -0,0 +1,10 @@ +#!/usr/bin/env bash +#Author: fidel +#Icarus.exe +#Rating=1-5 +#####################examples########################### +##export PW_COMMENT_DB="blablabla" +export PW_WINDOWS_VER="10" +export WINEDLLOVERRIDES="" +export LAUNCH_PARAMETERS="-dx12" +export PW_USE_EAC_AND_BE="0" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_EAAPP b/data_from_portwine/scripts/pw_autoinstall/PW_EAAPP index 45c3193..4db6f24 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_EAAPP +++ b/data_from_portwine/scripts/pw_autoinstall/PW_EAAPP @@ -5,12 +5,13 @@ export LAUNCH_PARAMETERS=("/silent" "/repair" ) export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/EAappInstaller.exe" export PW_DLL_INSTALL="" # Install DDL in port prefix (used winetricks) export PW_VULKAN_USE=1 -export PW_MUST_HAVE_DLL="" +export PW_MUST_HAVE_DLL="d3dx9 d3dcompiler_43 d3dcompiler_47" export PW_PREFIX_NAME="EA_APP" export DISABLE_CP_DEFPFX=1 -# export WINEDLLOVERRIDES="mscoree,mshtml=b" -# export PW_WINE_USE="WINE-8.2-STAGING-TKG-AMD64" -# gui_proton_downloader silent "WINE-8.2-STAGING-TKG-AMD64" +export PW_USE_D3D_EXTRAS=0 +export WINEDLLOVERRIDES="winemenubuilder=d" +# export PW_WINE_USE="WINE-8.8-STAGING-AMD64" +# gui_proton_downloader silent "WINE-8.8-STAGING-AMD64" start_portwine if try_download "origin-a.akamaihd.net/EA-Desktop-Client-Download/installer-releases/EAappInstaller.exe" "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index a4611bb..048aa27 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -124,7 +124,6 @@ start_portwine () { try_force_link_file "${PW_PLUGINS_PATH}/fake_dlss/${PW_FAKE_DLSS_VER}/nvngx.dll" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/" try_force_link_file "${PW_PLUGINS_PATH}/fake_dlss/${PW_FAKE_DLSS_VER}/nvngx.ini" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/" enabled_fake_nvidia_videocard 1 - export DXVK_NVAPIHACK=0 export DXVK_ENABLE_NVAPI=1 export WINE_HIDE_NVIDIA_GPU=0 elif [[ ! -z "${PW_USE_NVAPI_AND_DLSS}" && "${PW_USE_NVAPI_AND_DLSS}" == 1 ]] && [[ -d "${WINEDIR}/lib/wine/nvapi/" ]] @@ -144,13 +143,11 @@ start_portwine () { # echo "Try link nvml.dll.so to prefix" try_force_link_file "${PW_PLUGINS_PATH}"/nvml/lib/wine/nvml.dll.so "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/syswow64/nvml.dll" try_force_link_file "${PW_PLUGINS_PATH}"/nvml/lib64/wine/nvml.dll.so "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/nvml.dll" - export DXVK_NVAPIHACK=0 export DXVK_ENABLE_NVAPI=1 export WINE_HIDE_NVIDIA_GPU=0 enabled_fake_nvidia_videocard 0 else enabled_fake_nvidia_videocard 0 - export DXVK_NVAPIHACK=1 export DXVK_ENABLE_NVAPI=0 export WINE_HIDE_NVIDIA_GPU=1 fi @@ -173,14 +170,10 @@ start_portwine () { fi [[ ! -z "${PW_MANGOHUD_USER_CONF}" && "${PW_MANGOHUD_USER_CONF}" != 0 ]] && unset MANGOHUD_CONFIG - if [[ ! -z "${PW_USE_DXR11}" && "${PW_USE_DXR11}" != 0 ]] ; then - var_vkd3d_config_update dxr11 + if [[ "${PW_USE_DXR11}" == 1 ]] || [[ "${PW_USE_DXR10}" == 1 ]] || [[ "${PW_USE_RAY_TRACING}" == 1 ]]; then + var_vkd3d_config_update dxr10 var_radv_perftest_config_update rt,gpl - export VKD3D_FEATURE_LEVEL=12_1 - elif [[ ! -z "${PW_USE_DXR10}" && "${PW_USE_DXR10}" != 0 ]] ; then - var_vkd3d_config_update dxr - var_radv_perftest_config_update rt,gpl - export VKD3D_FEATURE_LEVEL=12_1 + # export VKD3D_FEATURE_LEVEL=12_1 fi export optirun_on="" @@ -239,9 +232,21 @@ start_portwine () { try_force_link_file "${WINEDIR}/share/wine/fonts/"tahoma.ttf "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/Fonts/"tahoma.ttf } + PROGPFX_URL="github.com/Castro-Fidel/PortWINE/releases/download/progpfx${DEFPFX_VER}/progpfx${DEFPFX_VER}.tar.xz" + if [[ "${PW_PREFIX_NAME}" == "PROGRAMS" && ! -f "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}"/.progpfx ]] ; then + print_info "Download and install PROGRAMS pfx..." + if try_download "${PROGPFX_URL}" "${PORT_WINE_PATH}/data/tmp/progpfx.tar.xz" ; then + unpack_tar_xz "${PORT_WINE_PATH}/data/tmp/progpfx.tar.xz" "${PORT_WINE_PATH}/data/prefixes/" + try_remove_file "${PORT_WINE_PATH}/data/tmp/progpfx.tar.xz" + else + try_remove_file "${PORT_WINE_PATH}/data/tmp/progpfx.tar.xz" + zenity_error_download && exit 1 + fi + fi + DOTPFX_URL="github.com/Castro-Fidel/PortWINE/releases/download/dotpfx${DOTPFX_VER}/dotpfx${DOTPFX_VER}.tar.xz" - if [[ "${update_loc}" == "RUS" && "${PW_PREFIX_NAME}" == "DOTNET" && ! -f "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}"/.dotnet48 ]] ; then - print_info "Download and install DOTNET..." + if [[ "${PW_PREFIX_NAME}" == "DOTNET" && ! -f "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}"/.dotnet48 ]] ; then + print_info "Download and install DOTNET pfx..." if try_download "${DOTPFX_URL}" "${PORT_WINE_PATH}/data/tmp/dotpfx.tar.xz" ; then unpack_tar_xz "${PORT_WINE_PATH}/data/tmp/dotpfx.tar.xz" "${PORT_WINE_PATH}/data/prefixes/" try_remove_file "${PORT_WINE_PATH}/data/tmp/dotpfx.tar.xz" @@ -295,6 +300,9 @@ start_portwine () { then PATH_TO_D3DEXTRAS="${PW_PLUGINS_PATH}/d3d_extras" else PATH_TO_D3DEXTRAS="${PW_WINELIB}/d3d_extras" fi + if [[ -z "`grep d3dx9 "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/winetricks.log"`" ]] ; then + echo "d3dx9" >> "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/winetricks.log" + fi for d3d_extras_from_plugins in d3dcompiler_33 d3dcompiler_34 d3dcompiler_35 d3dcompiler_36 d3dcompiler_37 \ d3dcompiler_38 d3dcompiler_39 d3dcompiler_40 d3dcompiler_41 d3dcompiler_42 d3dcompiler_43 d3dcompiler_46 \ d3dcompiler_47 d3dx10_33 d3dx10_34 d3dx10_35 d3dx10_36 d3dx10_37 d3dx10_38 d3dx10_39 d3dx10_40 d3dx10_41 \ @@ -304,24 +312,12 @@ start_portwine () { if [[ "${PW_USE_D3D_EXTRAS}" == 1 ]] ; then try_force_link_file "${PATH_TO_D3DEXTRAS}/x64/${d3d_extras_from_plugins}.dll" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/" try_force_link_file "${PATH_TO_D3DEXTRAS}/x32/${d3d_extras_from_plugins}.dll" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/syswow64/" - var_winedlloverride_update "${d3d_extras_from_plugins}=n,b" - else - if ! try_force_link_file "${WINEDIR}"/lib/wine/fakedlls/${d3d_extras_from_plugins}.dll "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/syswow64/" - then try_force_link_file "${WINEDIR}"/lib/wine/i386-windows/${d3d_extras_from_plugins}.dll "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/syswow64/" - fi - if ! try_force_link_file "${WINEDIR}"/lib64/wine/fakedlls/${d3d_extras_from_plugins}.dll "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/" - then try_force_link_file "${WINEDIR}"/lib64/wine/x86_64-windows/${d3d_extras_from_plugins}.dll "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/" - fi + var_winedlloverride_update "${d3d_extras_from_plugins}=n" fi if [[ -z "`grep "${d3d_extras_from_plugins}" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/winetricks.log"`" ]] ; then echo "${d3d_extras_from_plugins}" >> "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/winetricks.log" fi done - if [[ -z "`grep d3dx9 "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/winetricks.log"`" ]] ; then - echo "d3dx9" >> "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/winetricks.log" - fi - var_winedlloverride_update "steam_api,steam_api64,steamclient,steamclient64=n;dotnetfx35.exe,dotnetfx35setup.exe=b;lsteamclient,winemenubuilder=d" - echo "Try link wine DXGI by default..." if ! try_force_link_file "${WINEDIR}"/lib/wine/fakedlls/dxgi.dll "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/syswow64/dxgi.dll" then try_force_link_file "${WINEDIR}"/lib/wine/i386-windows/dxgi.dll "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/syswow64/dxgi.dll" @@ -621,8 +617,9 @@ if [[ -d "${PORT_WINE_PATH}/data/dist" ]] ; then IFS="$orig_IFS" fi -create_new_dir "${PORT_WINE_PATH}/data/prefixes" +create_new_dir "${PORT_WINE_PATH}/data/prefixes/DEFAULT" create_new_dir "${PORT_WINE_PATH}/data/prefixes/DOTNET" +create_new_dir "${PORT_WINE_PATH}/data/prefixes/PROGRAMS" try_force_link_dir "${PORT_WINE_PATH}/data/prefixes" "${PORT_WINE_PATH}" orig_IFS="$IFS" diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index a71a89f..af92b0b 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -411,7 +411,7 @@ pw_create_prefix_backup () { pw_edit_db () { pw_gui_for_edit_db \ - PW_MANGOHUD PW_MANGOHUD_x32 PW_MANGOHUD_USER_CONF ENABLE_VKBASALT PW_NO_ESYNC PW_NO_FSYNC PW_USE_DXR10 PW_USE_DXR11 \ + PW_MANGOHUD PW_MANGOHUD_x32 PW_MANGOHUD_USER_CONF ENABLE_VKBASALT PW_NO_ESYNC PW_NO_FSYNC PW_USE_RAY_TRACING \ PW_USE_NVAPI_AND_DLSS PW_USE_FAKE_DLSS PW_WINE_FULLSCREEN_FSR PW_HIDE_NVIDIA_GPU PW_VIRTUAL_DESKTOP PW_USE_TERMINAL \ PW_GUI_DISABLED_CS PW_USE_GAMEMODE PW_DX12_DISABLE PW_PRIME_RENDER_OFFLOAD PW_USE_D3D_EXTRAS PW_FIX_VIDEO_IN_GAME \ PW_USE_GSTREAMER PW_FORCE_LARGE_ADDRESS_AWARE PW_USE_SHADER_CACHE PW_USE_WINE_DXGI PW_USE_EAC_AND_BE diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index ffcd9bf..a12acc5 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -1,6 +1,6 @@ #!/usr/bin/env bash #Author: Castro-Fidel (linux-gaming.ru) -#SCRIPTS_NEXT_VERSION=2182 +#SCRIPTS_NEXT_VERSION=2183 ######################################################################## export PW_MANGOHUD=0 export MANGOHUD_CONFIG=cpu_stats,cpu_temp,cpu_mhz,cpu_color=2e97cb,cpu_text=CPU,gpu_stats,gpu_temp,gpu_core_clock,gpu_mem_clock,vulkan_driver,gpu_name,gpu_color=2e9762,gpu_text=GPU,vram,vram_color=ad64c1,ram,ram_color=c26693,io_color=a491d3,frame_timing=1,frametime_color=00ff00,time,arch,wine,wine_color=eb5b5b,engine_color=eb5b5b,background_alpha=0.2,font_size=24,background_color=020202,text_color=ffffff,toggle_hud=Shift_R+F12,resolution,vkbasalt @@ -44,12 +44,14 @@ export PW_PROTON_GE_VER="PROTON_GE_${PW_GE_VER}" export PW_WINE_FULLSCREEN_FSR="1" ###DXVK_AND_VKD3D### export DXVK_STABLE_VER="1.10.3-28" -export DXVK_GIT_VER="2.1-85" +export DXVK_GIT_VER="2.2-1" export VKD3D_STABLE_VER="1.1-2602" -export VKD3D_GIT_VER="1.1-3413" +export VKD3D_GIT_VER="1.1-3414" ###PREFIX_VERSION### export DOTPFX_VER="48v1" export DEFPFX_VER="v1" +export PROGPFX_VER="v1" +export WINEDLLOVERRIDES="steam_api,steam_api64,steamclient,steamclient64=n;dotnetfx35.exe,dotnetfx35setup.exe=b;winemenubuilder=d" ################################################################# export DXVK_CONFIG_FILE="${PORT_WINE_PATH}/data/dxvk.conf" ################################################################# diff --git a/data_from_portwine/scripts/zen_yad_gui b/data_from_portwine/scripts/zen_yad_gui index dbd9e33..cf930f0 100755 --- a/data_from_portwine/scripts/zen_yad_gui +++ b/data_from_portwine/scripts/zen_yad_gui @@ -14,9 +14,10 @@ zenity_error () { export -f zenity_error zenity_error_download () { - `zenity --error --title "$loc_gui_error" --text "$loc_gui_error_download" --no-wrap ` + `zenity --question --title "$loc_gui_error" --text "$loc_gui_error_download\n" --no-wrap --ok-label="Repeat" --cancel-label="Exit" ` if [[ "$?" != 0 ]] ; then stop_portwine + exit 1 else return 0 fi