diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index 40027fe..15f4c70 100755 --- a/data_from_portwine/changelog_eng +++ b/data_from_portwine/changelog_eng @@ -2,6 +2,12 @@ You can help us in the development of the project on the website: https://linux- ---------------------------------------- Changelog: +###Scripts version 2242### Date: 11.01.2024 / Download update size: 8 megabytes +* added a graphical interface for configuring MANGOHUD (thanks to Boria138) +* updated versions: + DXVK_GIT_VER 2.3-26 + VKD3D_GIT_VER 1.1-3821 + ###Scripts version 2241### Date: 28.12.2023 / Download update size: 8 megabytes * HOTFIX - VKD3D diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index b188917..164c2ac 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,6 +2,12 @@ ----------------------------------------- История изменений: +###Scripts version 2242### Дата: 11.01.2024 / Размер скачиваемого обновления: 8 мегабайт +* добавлен графический интерфейс для настройки MANGOHUD (спасибо Boria138) +* обновлены версии: + DXVK_GIT_VER 2.3-26 + VKD3D_GIT_VER 1.1-3821 + ###Scripts version 2241### Дата: 28.12.2023 / Размер скачиваемого обновления: 8 мегабайт * HOTFIX - VKD3D (определение DX12 в некоторых играх) diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index ddd18a7..5564efc 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -499,7 +499,7 @@ start_portwine () { else export CP_DXVK_FILES="d3d11 d3d10core d3d9 dxgi dxvk_config" # openvr_api_dxvk fi - check_variables VKD3D_FEATURE_LEVEL "12_0" + check_variables VKD3D_FEATURE_LEVEL "12_1" if [[ "${PW_VULKAN_USE}" == "1" ]] ; then PATH_TO_DXVK_FILES="${PW_VULKAN_DIR}/dxvk-${DXVK_STABLE_VER}" PATH_TO_VKD3D_FILES="${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_STABLE_VER}" diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index b6fd873..a2ff583 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=2241 +#SCRIPTS_NEXT_VERSION=2242 ######################################################################## export PW_MANGOHUD=0 export DEFAULT_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,gamemode @@ -47,9 +47,9 @@ export PW_WINE_FULLSCREEN_FSR="1" export VKD3D_LIMIT_TESS_FACTORS="32" export D8VK_VER="1.0" export DXVK_STABLE_VER="1.10.3-28" -export DXVK_GIT_VER="2.3-13" +export DXVK_GIT_VER="2.3-26" export VKD3D_STABLE_VER="1.1-2602" -export VKD3D_GIT_VER="1.1-3727" +export VKD3D_GIT_VER="1.1-3821" ###PREFIX_VERSION### export DOTPFX_VER="48v2" export DEFPFX_VER="v1" diff --git a/data_from_portwine/scripts/zen_yad_gui b/data_from_portwine/scripts/zen_yad_gui index 8a97c14..ef3b0ae 100755 --- a/data_from_portwine/scripts/zen_yad_gui +++ b/data_from_portwine/scripts/zen_yad_gui @@ -494,7 +494,7 @@ gui_vkBasalt () { } -gui_MangoHud() { +gui_MangoHud () { KEY_MH_GUI=$RANDOM LIST_MH=( arch battery battery_icon battery_time battery_watt core_bars core_load @@ -567,32 +567,30 @@ gui_MangoHud() { YAD_MH_SET=$(<"${PORT_WINE_TMP_PATH}/tmp_yad_mh_set") FPS_LIMIT=$(<"${PORT_WINE_TMP_PATH}/tmp_yad_mh_fps_limit") - if command -v xrand 2>/dev/null; then + if command -v xrand 2>/dev/null ; then MONITOR_HEIGHT=$(xrandr | grep -oP 'current\s+\K[0-9]+ x [0-9]+' | awk '{print $3}') MH_FONT_SIZE="font_size=$(expr $MONITOR_HEIGHT / 45)" fi - INT_COUNT_FX=0 - for read_list_mh in ${YAD_MH_SET}; do - if [[ "$read_list_mh" == "TRUE" ]]; then - export GUI_MH_RESULT+="${LIST_MH[$INT_COUNT_FX]}," + export INT_COUNT_FX=0 + for read_list_mh in ${YAD_MH_SET} ; do + if [[ "$read_list_mh" == "TRUE" ]] + then export GUI_MH_RESULT+="${LIST_MH[$INT_COUNT_FX]}," fi - export INT_COUNT_FX=$((INT_COUNT_FX + 1)) + ((INT_COUNT_FX++)) done - if [ -n "$MH_FONT_SIZE" ]; then - GUI_MH_RESULT="${GUI_MH_RESULT}${MH_FONT_SIZE}" - else - GUI_MH_RESULT="${GUI_MH_RESULT%,}" + if [[ -n "$MH_FONT_SIZE" ]] + then GUI_MH_RESULT="${GUI_MH_RESULT}${MH_FONT_SIZE}" + else GUI_MH_RESULT="${GUI_MH_RESULT%,}" fi if [[ "${FPS_LIMIT}" != "disabled" ]] ; then export GUI_MH_RESULT=${GUI_MH_RESULT},fps_limit=${FPS_LIMIT} export PW_MANGOHUD=1 - elif [[ "${FPS_LIMIT}" == "disabled" ]] ; then - export GUI_MH_RESULT="$(echo ${GUI_MH_RESULT} | sed "s/,fps_limit=${FPS_LIMIT_VAR}//" | sed "s/,fps_limit=//")" + elif [[ "${FPS_LIMIT}" == "disabled" ]] + then export GUI_MH_RESULT="$(echo ${GUI_MH_RESULT} | sed "s/,fps_limit=${FPS_LIMIT_VAR}//" | sed "s/,fps_limit=//")" fi - export MANGOHUD_CONFIG="${GUI_MH_RESULT}" edit_db_from_gui MANGOHUD_CONFIG PW_MANGOHUD FPS_LIMIT