Commit 31a95449 authored by Roman Astafev's avatar Roman Astafev Committed by Mikhail Paulyshka
Browse files

build: XVM 8.6.3

parent 683ad4e5
Pipeline #191707157 passed with stages
in 2 minutes and 55 seconds
......@@ -10,5 +10,5 @@ export XVMBUILD_WOT_VERSION=${TARGET_VERSION:-1.10.0.2}
export XVMBUILD_XVM_VERSION=${XVM_VERSION:-8.6.3}
# DEV Suffix, comment for release build
export XVMBUILD_DEVELOPMENT="True"
#export XVMBUILD_DEVELOPMENT="False"
#export XVMBUILD_DEVELOPMENT="True"
export XVMBUILD_DEVELOPMENT="False"
......@@ -66,11 +66,11 @@
// The minimum required version of the XVM mod.
// Минимально необходимая версия мода XVM.
"modMinVersion": "8.6.2",
"modMinVersion": "8.6.3",
// Config last modified.
// Дата последней модификации конфига.
"date": "17.09.2020"
"date": "18.09.2020"
},
// Parameters for login screen.
......
### XVM 8.6.2
### XVM 8.6.3
#### General
* Fix incorrect tankcarousel behaviour
______________________________
### XVM 8.6.2
#### General
......@@ -81,6 +89,7 @@ ______________________________
#### General
* Fix incorrect tankcarousel behaviour
______________________________
### XVM 8.5.5
......
### XVM 8.6.2
### XVM 8.6.3
#### Общее
* Исправлено некорректное поведение карусели
______________________________
### XVM 8.6.2
#### Общее
......
......@@ -9,8 +9,8 @@ import simplejson
import constants
from account_helpers.AccountSettings import AccountSettings, DEFAULT_VALUES, KEY_FILTERS
from account_helpers.AccountSettings import CAROUSEL_FILTER_2, RANKED_CAROUSEL_FILTER_2, EPICBATTLE_CAROUSEL_FILTER_2, ROYALE_CAROUSEL_FILTER_2
from account_helpers.AccountSettings import CAROUSEL_FILTER_CLIENT_1, RANKED_CAROUSEL_FILTER_CLIENT_1, EPICBATTLE_CAROUSEL_FILTER_CLIENT_1, BATTLEPASS_CAROUSEL_FILTER_CLIENT_1, ROYALE_CAROUSEL_FILTER_CLIENT_1
from account_helpers.AccountSettings import CAROUSEL_FILTER_2, RANKED_CAROUSEL_FILTER_2, EPICBATTLE_CAROUSEL_FILTER_2, ROYALE_CAROUSEL_FILTER_2, BOB_CAROUSEL_FILTER_2
from account_helpers.AccountSettings import CAROUSEL_FILTER_CLIENT_1, RANKED_CAROUSEL_FILTER_CLIENT_1, EPICBATTLE_CAROUSEL_FILTER_CLIENT_1, BATTLEPASS_CAROUSEL_FILTER_CLIENT_1, ROYALE_CAROUSEL_FILTER_CLIENT_1, BOB_CAROUSEL_FILTER_CLIENT_1
from account_helpers.settings_core.ServerSettingsManager import ServerSettingsManager
from gui.shared.gui_items.dossier.achievements import MarkOfMasteryAchievement
from gui.shared.utils.functions import makeTooltip
......@@ -54,7 +54,7 @@ class PREFS(object):
class USERPREFS(object):
CAROUSEL_FILTERS = "users/{accountDBID}/tankcarousel/filters"
_SUPPORTED_SECTIONS = (CAROUSEL_FILTER_2, RANKED_CAROUSEL_FILTER_2, EPICBATTLE_CAROUSEL_FILTER_2, ROYALE_CAROUSEL_FILTER_2)
_SUPPORTED_SECTIONS = (CAROUSEL_FILTER_2, RANKED_CAROUSEL_FILTER_2, EPICBATTLE_CAROUSEL_FILTER_2, ROYALE_CAROUSEL_FILTER_2, BOB_CAROUSEL_FILTER_2)
#####################################################################
# initialization/finalization
......@@ -94,7 +94,7 @@ def _ServerSettingsManager_setSections(base, self, sections, settings):
@overrideStaticMethod(AccountSettings, 'setFilter')
def _AccountSettings_setFilter(base, name, value):
if name in (CAROUSEL_FILTER_CLIENT_1, RANKED_CAROUSEL_FILTER_CLIENT_1, EPICBATTLE_CAROUSEL_FILTER_CLIENT_1, BATTLEPASS_CAROUSEL_FILTER_CLIENT_1, ROYALE_CAROUSEL_FILTER_CLIENT_1):
if name in (CAROUSEL_FILTER_CLIENT_1, RANKED_CAROUSEL_FILTER_CLIENT_1, EPICBATTLE_CAROUSEL_FILTER_CLIENT_1, BATTLEPASS_CAROUSEL_FILTER_CLIENT_1, ROYALE_CAROUSEL_FILTER_CLIENT_1, BOB_CAROUSEL_FILTER_CLIENT_1):
value = {key: value for key, value in value.iteritems() if key not in PREFS.XVM_KEYS}
base(name, value)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment