diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index 32fedd8..86fd59c 100755 --- a/data_from_portwine/changelog_eng +++ b/data_from_portwine/changelog_eng @@ -2,6 +2,9 @@ You can help us in the development of the project on the website: boosty.to/linu ----------------------------------------- Changelog: +###Scripts version 2203### Date: 23.06.2023 / Update download size: 9 megabytes. +* minor fixes for installing Battle.net + ###Scripts version 2202### Date: 15.06.2023 / Update download size: 9 megabytes. * added Genshin Impact (again) * fix: download PROTON-GE diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index b720376..b558185 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -1,6 +1,9 @@ Вы можете помочь развитию проекта: https://linux-gaming.ru/donate/ ----------------------------------------- История изменений: +###Scripts version 2203### Дата: 23.06.2023 / Размер скачиваемого обновления: 9 мегабайт. +* дополнены всплывающие подсказки в меню настроек vkBasalt (спасибо Boria138) +* обновлен установщик Battle.net ###Scripts version 2202### Дата: 15.06.2023 / Размер скачиваемого обновления: 9 мегабайт. * возвращена установка Genshin Impact. (Снова заработал, на долго?) diff --git a/data_from_portwine/scripts/portwine_db/Battle.net_Launcher b/data_from_portwine/scripts/portwine_db/Battle.net_Launcher index 6a8c8d2..c6a025d 100755 --- a/data_from_portwine/scripts/portwine_db/Battle.net_Launcher +++ b/data_from_portwine/scripts/portwine_db/Battle.net_Launcher @@ -12,6 +12,8 @@ export LAUNCH_PARAMETERS="" export WINEDLLOVERRIDES="locationapi=" export PW_DLL_INSTALL="vcrun2019 d3dx11_42 d3dx11_43" export PW_WINDOWS_VER=10 +export PW_WINE_FULLSCREEN_FSR="0" +export PW_USE_EAC_AND_BE="0" add_in_start_portwine () { rm -fr "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/ProgramData/Agent/data" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_BATTLE_NET b/data_from_portwine/scripts/pw_autoinstall/PW_BATTLE_NET index 24ad57c..09ea5ba 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_BATTLE_NET +++ b/data_from_portwine/scripts/pw_autoinstall/PW_BATTLE_NET @@ -4,12 +4,12 @@ [ "${update_loc}" = "RUS" ] && export BN_LOC=ruRU || export BN_LOC=enUS export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/Battle.net-Setup-${BN_LOC}.exe" start_portwine -if try_download "dist.blizzard.com/downloads/bna-installers/322d5bb9ae0318de3d4cde7641c96425/retail.1/Battle.net-Setup-${BN_LOC}.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "https://www.battle.net/download/getInstallerForGame?os=win&version=LIVE&gameProgram=BATTLENET_APP" "${PW_AUTOINSTALL_EXE}" then # PW_START_PROGRESS_BAR "${loc_gui_installing_the} Battle Net. ${loc_gui_please_wait} " pw_kill_autostart Battle.net.exe & pw_run "${PW_AUTOINSTALL_EXE}" - portwine_exe=`find "$WINEPREFIX/drive_c/" -type f -name "Battle.net.exe"` + portwine_exe=`find "$WINEPREFIX/drive_c/" -type f -name "Battle.net.exe" | grep "Battle.net/Battle.net.exe"` pw_stop_progress_bar portwine_create_shortcut try_remove_file "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index 30c4106..da74772 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -169,8 +169,8 @@ start_portwine () { grep '"renderer"=' "${WINEPREFIX}/user.reg" if [[ "$?" == 0 ]] ; then - sed -i /'"renderer"='/d "${WINEPREFIX}/user.reg" - sed -i /'renderer='/d "${WINEPREFIX}/winetricks.log" + sed -i /'"renderer"='/d "${WINEPREFIX}/user.reg" &>/dev/null + sed -i /'renderer='/d "${WINEPREFIX}/winetricks.log" &>/dev/null fi if [[ ! -z "${optirun_on}" && "${optirun_on}" != "" ]] ; then @@ -420,6 +420,7 @@ start_portwine () { # export WINE_D3D_CONFIG='renderer=vulkan' if [[ "${PW_USE_WINE_DXGI}" == 1 ]] ; then export CP_DXVK_FILES="d3d11 d3d10core d3d9 dxvk_config openvr_api_dxvk" + var_winedlloverride_update dxgi=b elif [[ "${USE_ALL_DXVK_DLLS}" == 1 ]] ; then export CP_DXVK_FILES="d3d11 d3d10core d3d10_1 d3d10 d3d9 dxgi dxvk_config openvr_api_dxvk" else diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index ed9271f..d45552f 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=2202 +#SCRIPTS_NEXT_VERSION=2203 ######################################################################## 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