diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng
index 8f62ef05..522cdebf 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 2145###
+* added the ability to change SVN and VKD3D versions in the game settings file .pdb and globally in user.conf using variables (values are given for example):
+ export DXVK_STABLE_VER="1.10.3"
+ export SVN_GIT_VER="2.0"
+ export VKD3D_STABLE_VER="2.6"
+ export VKD3D_GIT_VER="2.7"
+* for League of Legends, the default version is DX VK 1.10.2 - as more stable for this game
+
###Scripts version 2144###
* updated WINE for League of Legends
diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus
index 2b96d035..ced0bb70 100755
--- a/data_from_portwine/changelog_rus
+++ b/data_from_portwine/changelog_rus
@@ -2,6 +2,14 @@
-----------------------------------------
История изменений:
+###Scripts version 2145###
+* добавлена возможность смены версий DXVK и VKD3D в файле настроек игры .ppdb и глобально в user.conf с помощью переменных (значения приведены для примера):
+ export DXVK_STABLE_VER="1.10.3"
+ export DXVK_GIT_VER="2.0"
+ export VKD3D_STABLE_VER="2.6"
+ export VKD3D_GIT_VER="2.7"
+* для League of Legends по умолчанию выбана версия DXVK 1.10.2 - как более стабильная для данной игры
+
###Scripts version 2144###
* обновлена версия WINE для League of Legends
diff --git a/data_from_portwine/dxvk.conf b/data_from_portwine/dxvk.conf
index d2620f94..7299839b 100755
--- a/data_from_portwine/dxvk.conf
+++ b/data_from_portwine/dxvk.conf
@@ -15,8 +15,8 @@
#
# Supported values : 0 - 16
-dxgi.maxFrameLatency = 1
-d3d9.maxFrameLatency = 1
+# dxgi.maxFrameLatency = 1
+# d3d9.maxFrameLatency = 1
# Enables frame rate limiter. The main purpose of this is to work around
# bugs in games that have physics or other simulation tied to their frame
@@ -128,7 +128,7 @@ dxgi.customVendorId = 10de
#
# Supported values: Any number between 8 and 64
-d3d11.maxTessFactor = 16
+# d3d11.maxTessFactor = 16
# Enables relaxed pipeline barriers around UAV writes.
@@ -382,7 +382,7 @@ d3d11.maxTessFactor = 16
# - Strict: Use a slower but more correct approach. Necessary for some games
# - Auto: DXVK will pick automatically
-d3d9.floatEmulation = Auto
+# d3d9.floatEmulation = Auto
# Enable dialog box mode
diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper
index e0d05136..eefb1dee 100755
--- a/data_from_portwine/scripts/functions_helper
+++ b/data_from_portwine/scripts/functions_helper
@@ -391,9 +391,6 @@ pw_init_runtime () {
export PW_VK_LAYER_PATH="${PW_WINELIB}/portable/share/vulkan/implicit_layer.d"
- export DISABLE_VK_LAYER_VALVE_steam_fossilize_1=1
- export DISABLE_VK_LAYER_VALVE_steam_overlay_1=1
-
if [ ! -z ${PATH_TMP} ]
then export PATH="${PATH_TMP}"
else export PATH_TMP="${PATH}"
@@ -422,25 +419,19 @@ pw_init_runtime () {
export pw_runtime="${PW_WINELIB}/pressure-vessel/bin/pressure-vessel-unruntime \
--unshare-home \
--home="${PW_SANDBOX_HOME_PATH}" \
- --no-gc-runtimes \
- --gc-legacy-runtimes \
- --copy-runtime \
- --remove-game-overlay \
${PW_ADD_TO_ARGS_IN_RUNTIME} --"
else
export pw_runtime="${PW_WINELIB}/pressure-vessel/bin/pressure-vessel-unruntime \
--share-home \
- --no-gc-runtimes \
- --gc-legacy-runtimes \
- --copy-runtime \
- --remove-game-overlay \
${PW_ADD_TO_ARGS_IN_RUNTIME} --"
fi
export PRESSURE_VESSEL_IMPORT_VULKAN_LAYERS=0
- # export PRESSURE_VESSEL_GRAPHICS_PROVIDER=""
+ export PRESSURE_VESSEL_GRAPHICS_PROVIDER="/"
unset PRESSURE_VESSEL_RUNTIME_ARCHIVE
+ export PRESSURE_VESSEL_COPY_RUNTIME=1
+ export PRESSURE_VESSEL_GC_LEGACY_RUNTIMES=1
export PRESSURE_VESSEL_RUNTIME=runtime
export PRESSURE_VESSEL_RUNTIME_BASE="${PW_WINELIB}"
export PRESSURE_VESSEL_VARIABLE_DIR="${PW_WINELIB}/var"
@@ -697,7 +688,7 @@ pw_check_and_download_dxvk_and_vkd3d () {
fi
done
- #Download stamle and git version VKD3D
+ #Download stable and git version VKD3D
for VKD3D_VAR_VER in "${VKD3D_STABLE_VER}" "${VKD3D_GIT_VER}" ; do
if [ ! -d "${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_VAR_VER}" ] ; then
print_info "Download and install VKD3D-PROTON v.${VKD3D_VAR_VER}"
diff --git a/data_from_portwine/scripts/portwine_db/League of Legends b/data_from_portwine/scripts/portwine_db/League of Legends
index b0439161..b8ef693a 100755
--- a/data_from_portwine/scripts/portwine_db/League of Legends
+++ b/data_from_portwine/scripts/portwine_db/League of Legends
@@ -21,6 +21,7 @@ export PW_NO_FSYNC=1
export PW_NO_ESYNC=1
export PW_DISABLED_CREATE_DB=1
export PW_USE_D3D_EXTRAS=1
+export DXVK_STABLE_VER="1.10.2"
##export PW_GUI_DISABLED_CS=1 # 1 = disabled GUI
check_download_wine_ver_for_lol () {
diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib
index 217a2270..ac930321 100755
--- a/data_from_portwine/scripts/runlib
+++ b/data_from_portwine/scripts/runlib
@@ -592,7 +592,7 @@ pw_run () {
LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" \
LD_PRELOAD="${PW_LD_PRELOAD}" \
VK_LAYER_PATH="${PW_VK_LAYER_PATH}" \
- VK_INSTANCE_LAYERS=${PW_VK_INSTANCE_LAYERS} \
+ VK_INSTANCE_LAYERS="${PW_VK_INSTANCE_LAYERS}" \
"${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[@]}
fi
}
@@ -688,7 +688,8 @@ if [[ -z "${INSTALLING_PORT}" ]] ; then
pw_download_libs
pw_check_and_download_wine ${PW_PROTON_LG_VER}
pw_check_and_download_plugins
- pw_check_and_download_dxvk_and_vkd3d
pw_init_db
+ . "${PORT_SCRIPTS_PATH}"/lang
+ pw_check_and_download_dxvk_and_vkd3d
. "${USER_CONF}"
fi
diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var
index c1a35b96..04ffc45a 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=2144
+#SCRIPTS_NEXT_VERSION=2145
########################################################################
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