diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index b683f3e0..b09efea1 100755 --- a/data_from_portwine/changelog_eng +++ b/data_from_portwine/changelog_eng @@ -2,6 +2,14 @@ You can help us in the development of the project on the website: boosty.to/linu ----------------------------------------- Changelog: +###Scripts version 2153### +* updated versions: + PROTON_GE="7-43" + DXVK_GIT_VER="2.0-36" + VKD3D_GIT_VER="1.1-3094" +* fixed crashes of the Witcher 3 game (next gen. DX12) It is necessary to use the PROTON_GE_7-43 version + + ###Scripts version 2152### * added installation of the game Path of Exile * updated versions of GIT DXVK and VKD3D: diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index c7901316..7e7c0d47 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,6 +2,13 @@ ----------------------------------------- История изменений: +###Scripts version 2153### +* обновлены версии: + PROTON_GE="7-43" + DXVK_GIT_VER="2.0-36" + VKD3D_GIT_VER="1.1-3094" +* исправлены вылеты игры Ведьмак 3 (next gen. DX12) Необходимо использование версии PROTON_GE_7-43 + ###Scripts version 2152### * обновлен шаблон дял создания префикса (улучшено отобраение кирилицы в некоторых приложениях, например Path of Exile) * добавлена установка игры Path of Exile diff --git a/data_from_portwine/img/gui/swl.png b/data_from_portwine/img/gui/swl.png new file mode 100755 index 00000000..531088cf Binary files /dev/null and b/data_from_portwine/img/gui/swl.png differ diff --git a/data_from_portwine/img/gui/swl.png~ b/data_from_portwine/img/gui/swl.png~ new file mode 100755 index 00000000..82df2e55 Binary files /dev/null and b/data_from_portwine/img/gui/swl.png~ differ diff --git a/data_from_portwine/scripts/portwine_db/Secret World Legends b/data_from_portwine/scripts/portwine_db/Secret World Legends new file mode 100755 index 00000000..e02fc8e9 --- /dev/null +++ b/data_from_portwine/scripts/portwine_db/Secret World Legends @@ -0,0 +1,12 @@ +#!/usr/bin/env bash +#Author: Castro-Fidel +#SecretWorldLegendsDX11.exe +#ClientPatcher.exe +#Rating=1-5 +#####################examples########################### +##export PW_COMMENT_DB="blablabla" +export PW_PREFIX_NAME="SWL" +export WINEDLLOVERRIDES="d3d9=b" +export ENABLE_VKBASALT="1" +export PW_VKBASALT_EFFECTS="Curves:cas" +export PW_VKBASALT_FFX_CAS="0.75" diff --git a/data_from_portwine/scripts/portwine_db/witcher3 b/data_from_portwine/scripts/portwine_db/witcher3 index eb67bda2..1b39ab8b 100755 --- a/data_from_portwine/scripts/portwine_db/witcher3 +++ b/data_from_portwine/scripts/portwine_db/witcher3 @@ -31,3 +31,4 @@ export PW_USE_TERMINAL=0 ##ADD_IN_START_PORTWINE () { commands ; } export PW_USE_NVAPI_AND_DLSS=0 export PW_GUI_DISABLED_CS=0 +export PW_WINE_USE=PROTON_GE diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_SWL b/data_from_portwine/scripts/pw_autoinstall/PW_SWL new file mode 100644 index 00000000..8a181205 --- /dev/null +++ b/data_from_portwine/scripts/pw_autoinstall/PW_SWL @@ -0,0 +1,24 @@ +#!/usr/bin/env bash +# Author: chal55rus +######################################################################## +export PW_PREFIX_NAME="SWL" +export WINEDLLOVERRIDES="d3d9=b" +export LAUNCH_PARAMETERS=("/VERYSILENT") +export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/SecretWorldLegendsMin.exe" + +start_portwine +if try_download "https://web-cdn.funcom.com/downloads/swl/SecretWorldLegendsMin.exe" "${PW_AUTOINSTALL_EXE}" +then + pw_start_progress_bar_block "${loc_gui_installing_the} Secret World Legends. ${loc_gui_please_wait} " + pw_kill_autostart ClientPatcher.exe & +# pw_kill_autostart PatcherSetup.exe & + pw_run "${PW_AUTOINSTALL_EXE}" +# portwine_exe="${WINEPREFIX}/drive_c/Program Files (x86)/Funcom/Secret World Legends/SecretWorldLegendsDX11.exe" + portwine_exe="${WINEPREFIX}/drive_c/Program Files (x86)/Funcom/Secret World Legends/ClientPatcher.exe" + try_remove_file "${PW_AUTOINSTALL_EXE}" + kill_portwine + pw_stop_progress_bar + export PORTWINE_CREATE_SHORTCUT_NAME="Secret World Legends" + portwine_create_shortcut +fi +stop_portwine diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index 97165fd6..3bbea4d8 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -397,11 +397,11 @@ start_portwine () { else echo "Use VKD3D-PROTON and DXVK (DX 9-12 to vulkan)" if [[ "${PW_USE_WINE_DXGI}" == 1 ]] ; then - export CP_DXVK_FILES="d3d11 d3d10core d3d9" + export CP_DXVK_FILES="d3d11 d3d10core d3d9 dxvk_config openvr_api_dxvk" elif [[ "${USE_ALL_DXVK_DLLS}" == 1 ]] ; then - export CP_DXVK_FILES="d3d11 d3d10core d3d10_1 d3d10 d3d9 dxgi" + export CP_DXVK_FILES="d3d11 d3d10core d3d10_1 d3d10 d3d9 dxgi dxvk_config openvr_api_dxvk" else - export CP_DXVK_FILES="d3d11 d3d10core d3d9 dxgi" + export CP_DXVK_FILES="d3d11 d3d10core d3d9 dxgi dxvk_config openvr_api_dxvk" fi if [[ "${PW_VULKAN_USE}" == "1" ]] ; then @@ -425,7 +425,7 @@ start_portwine () { done echo "Try link native VKD3D files..." - for wine_vkd3d_dll in d3d12 # libvkd3d-proton-utils-3 + for wine_vkd3d_dll in d3d12 libvkd3d-shader-1 # libvkd3d-proton-utils-3 do try_force_link_file "${PATH_TO_VKD3D_FILES}/x86/${wine_vkd3d_dll}.dll" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/syswow64/${wine_vkd3d_dll}.dll" try_force_link_file "${PATH_TO_VKD3D_FILES}/x64/${wine_vkd3d_dll}.dll" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/${wine_vkd3d_dll}.dll" diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 9687b55c..259e0aae 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -706,7 +706,8 @@ else --field=" Warframe"!"$PW_GUI_ICON_PATH/warframe.png"!"":"FBTN" '@bash -c "button_click PW_WARFRAME"' \ --field=" Panzar"!"$PW_GUI_ICON_PATH/panzar.png"!"":"FBTN" '@bash -c "button_click PW_PANZAR"' \ --field=" Path of Exile"!"$PW_GUI_ICON_PATH/poe.png"!"":"FBTN" '@bash -c "button_click PW_POE"' & - + + # --field=" Secret World Legends (ENG)"!"$PW_GUI_ICON_PATH/swl.png"!"":"FBTN" '@bash -c "button_click PW_SWL"' # --field=" Guild Wars 2"!"$PW_GUI_ICON_PATH/gw2.png"!"":"FBTN" '@bash -c "button_click PW_GUILD_WARS_2"' # --field=" Bethesda.net Launcher"!"$PW_GUI_ICON_PATH/bethesda.png"!"":"FBTN" '@bash -c "button_click PW_BETHESDA"' diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index e621477a..e8428bfc 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=2152 +#SCRIPTS_NEXT_VERSION=2153 ######################################################################## 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 @@ -37,14 +37,14 @@ export PW_FAKE_DLSS_VER="091122" export PW_LG_VER="7-34" export PW_PROTON_LG_VER="PROTON_LG_${PW_LG_VER}" ###WINE_PROTON_GE### -export PW_GE_VER="7-37" +export PW_GE_VER="7-43" export PW_PROTON_GE_VER="PROTON_GE_${PW_GE_VER}" export PW_WINE_FULLSCREEN_FSR="0" ###DXVK_AND_VKD3D### export DXVK_STABLE_VER="1.10.3-28" -export DXVK_GIT_VER="2.0-34" +export DXVK_GIT_VER="2.0-36" export VKD3D_STABLE_VER="1.1-2602" -export VKD3D_GIT_VER="1.1-3088" +export VKD3D_GIT_VER="1.1-3094" ###PREFIX_VERSION### export DOTPFX_VER="48v1" export DEFPFX_VER="v1"