Commit e81c0d8f authored by Maxim Schedriviy's avatar Maxim Schedriviy

Merge branch 'master' into 'master'

XVM 8.5.4-dev

See merge request !158
parents 704f850c bbfa0d00
Pipeline #146539957 passed with stage
in 0 seconds
......@@ -3,12 +3,12 @@ WOT_PATH=${WOT_PATH:-/d/work/games/WoT}
# target WoT version for directory structure
#export XVMBUILD_WOT_VERSION=${TARGET_VERSION:-ST 0.9.20}
#export XVMBUILD_WOT_VERSION=${TARGET_VERSION:-1.9.0.0 Common Test}
#export XVMBUILD_WOT_VERSION=${TARGET_VERSION:-1.9.1.0 Common Test}
export XVMBUILD_WOT_VERSION=${TARGET_VERSION:-1.9.0.3}
# XVM version
export XVMBUILD_XVM_VERSION=${XVM_VERSION:-8.5.3}
export XVMBUILD_XVM_VERSION=${XVM_VERSION:-8.5.4}
# DEV Suffix, comment for release build
#export XVMBUILD_DEVELOPMENT="True"
export XVMBUILD_DEVELOPMENT="False"
export XVMBUILD_DEVELOPMENT="True"
#export XVMBUILD_DEVELOPMENT="False"
......@@ -62,15 +62,15 @@
// Supported version of the game.
// Поддерживаемая версия игры.
"gameVersion": "1.9.0.2",
"gameVersion": "1.9.0.3",
// The minimum required version of the XVM mod.
// Минимально необходимая версия мода XVM.
"modMinVersion": "8.5.2",
"modMinVersion": "8.5.4",
// Config last modified.
// Дата последней модификации конфига.
"date": "10.05.2020"
"date": "15.05.2020"
},
// Parameters for login screen.
......
XVM-8.5.3:
XVM-8.5.4:
XVM-8.5.3:
[GENERAL]
* XFW.Native 2.0.1
......
XVM-8.5.3:
XVM-8.5.4:
XVM-8.5.3:
[ОБЩЕЕ]
* XFW.Native 2.0.1
......
......@@ -375,6 +375,8 @@ package
public static const GAME_LOGINSERVERSELECTION:String = "#settings:game/loginServerSelection";
public static const GAME_EVENTHORNDISABLE:String = "#settings:game/eventHornDisable";
public static const MONITOR:String = "#settings:monitor";
public static const MONITOR_DESCRIPTION:String = "#settings:monitor/description";
......@@ -693,8 +695,6 @@ package
public static const CHAT_DISABLEBATTLECHAT:String = "#settings:chat/disableBattleChat";
public static const CHAT_DISABLEDCOMMONCHAT:String = "#settings:chat/disabledCommonChat";
public static const GAME_SHOWLANGUAGEBAR:String = "#settings:game/showLanguageBar";
public static const GAME_ENABLEVOIP:String = "#settings:game/enableVoIP";
......@@ -987,6 +987,8 @@ package
public static const KEYBOARD_KEYSBLOCKS_COMMAND_VOICECHAT_ENABLE:String = "#settings:keyboard/keysBlocks/command/voicechat_enable";
public static const KEYBOARD_KEYSBLOCKS_COMMAND_EVENT_HORN:String = "#settings:keyboard/keysBlocks/command/event_horn";
public static const KEYBOARD_KEYSBLOCKS_GROUP_VEHICLE_OTHER:String = "#settings:keyboard/keysBlocks/group/vehicle_other";
public static const KEYBOARD_KEYSBLOCKS_COMMAND_USEHORN:String = "#settings:keyboard/keysBlocks/command/useHorn";
......@@ -1367,7 +1369,7 @@ package
public static const KEYBOARD_KEYSBLOCKS_GROUP_ENUM:Array = [KEYBOARD_KEYSBLOCKS_GROUP_MOVEMENT,KEYBOARD_KEYSBLOCKS_GROUP_CRUIS_CONTROL,KEYBOARD_KEYSBLOCKS_GROUP_FIRING,KEYBOARD_KEYSBLOCKS_GROUP_EQUIPMENT,KEYBOARD_KEYSBLOCKS_GROUP_SHORTCUTS,KEYBOARD_KEYSBLOCKS_GROUP_CAMERA,KEYBOARD_KEYSBLOCKS_GROUP_VOICECHAT,KEYBOARD_KEYSBLOCKS_GROUP_VEHICLE_OTHER,KEYBOARD_KEYSBLOCKS_GROUP_MINIMAP];
public static const KEYBOARD_KEYSBLOCKS_COMMAND_ENUM:Array = [KEYBOARD_KEYSBLOCKS_COMMAND_FORWARD,KEYBOARD_KEYSBLOCKS_COMMAND_FORWARD_CRUISE,KEYBOARD_KEYSBLOCKS_COMMAND_BACKWARD,KEYBOARD_KEYSBLOCKS_COMMAND_BACKWARD_CRUISE,KEYBOARD_KEYSBLOCKS_COMMAND_LEFT,KEYBOARD_KEYSBLOCKS_COMMAND_RIGHT,KEYBOARD_KEYSBLOCKS_COMMAND_AUTO_ROTATION,KEYBOARD_KEYSBLOCKS_COMMAND_BLOCK_TRACKS,KEYBOARD_KEYSBLOCKS_COMMAND_STOP_FIRE,KEYBOARD_KEYSBLOCKS_COMMAND_FIRE,KEYBOARD_KEYSBLOCKS_COMMAND_CHARGEFIRE,KEYBOARD_KEYSBLOCKS_COMMAND_LOCK_TARGET,KEYBOARD_KEYSBLOCKS_COMMAND_LOCK_TARGET_OFF,KEYBOARD_KEYSBLOCKS_COMMAND_ALTERNATE_MODE,KEYBOARD_KEYSBLOCKS_COMMAND_TRAJECTORY_VIEW,KEYBOARD_KEYSBLOCKS_COMMAND_RELOADPARTIALCLIP,KEYBOARD_KEYSBLOCKS_COMMAND_ITEM01,KEYBOARD_KEYSBLOCKS_COMMAND_ITEM02,KEYBOARD_KEYSBLOCKS_COMMAND_ITEM03,KEYBOARD_KEYSBLOCKS_COMMAND_ITEM04,KEYBOARD_KEYSBLOCKS_COMMAND_ITEM05,KEYBOARD_KEYSBLOCKS_COMMAND_ITEM06,KEYBOARD_KEYSBLOCKS_COMMAND_ITEM07,KEYBOARD_KEYSBLOCKS_COMMAND_ITEM08,KEYBOARD_KEYSBLOCKS_COMMAND_MY_TARGET_FOLLOW_ME,KEYBOARD_KEYSBLOCKS_COMMAND_ATTACK,KEYBOARD_KEYSBLOCKS_COMMAND_TO_BASE_TO_BACK,KEYBOARD_KEYSBLOCKS_COMMAND_POSITIVE,KEYBOARD_KEYSBLOCKS_COMMAND_NEGATIVE,KEYBOARD_KEYSBLOCKS_COMMAND_SOS_HELP_ME,KEYBOARD_KEYSBLOCKS_COMMAND_RELOAD_STOP,KEYBOARD_KEYSBLOCKS_COMMAND_CAMERA_UP,KEYBOARD_KEYSBLOCKS_COMMAND_CAMERA_DOWN,KEYBOARD_KEYSBLOCKS_COMMAND_CAMERA_LEFT,KEYBOARD_KEYSBLOCKS_COMMAND_CAMERA_RIGHT,KEYBOARD_KEYSBLOCKS_COMMAND_PUSHTOTALK,KEYBOARD_KEYSBLOCKS_COMMAND_VOICECHAT_ENABLE,KEYBOARD_KEYSBLOCKS_COMMAND_USEHORN,KEYBOARD_KEYSBLOCKS_COMMAND_SHOWHUD,KEYBOARD_KEYSBLOCKS_COMMAND_FRONTLINESELFDESTRUCTION,KEYBOARD_KEYSBLOCKS_COMMAND_SHOWRADIALMENU,KEYBOARD_KEYSBLOCKS_COMMAND_SHOWQUESTPROGRESS,KEYBOARD_KEYSBLOCKS_COMMAND_SIZEUP,KEYBOARD_KEYSBLOCKS_COMMAND_SIZEDOWN,KEYBOARD_KEYSBLOCKS_COMMAND_VISIBLE];
public static const KEYBOARD_KEYSBLOCKS_COMMAND_ENUM:Array = [KEYBOARD_KEYSBLOCKS_COMMAND_FORWARD,KEYBOARD_KEYSBLOCKS_COMMAND_FORWARD_CRUISE,KEYBOARD_KEYSBLOCKS_COMMAND_BACKWARD,KEYBOARD_KEYSBLOCKS_COMMAND_BACKWARD_CRUISE,KEYBOARD_KEYSBLOCKS_COMMAND_LEFT,KEYBOARD_KEYSBLOCKS_COMMAND_RIGHT,KEYBOARD_KEYSBLOCKS_COMMAND_AUTO_ROTATION,KEYBOARD_KEYSBLOCKS_COMMAND_BLOCK_TRACKS,KEYBOARD_KEYSBLOCKS_COMMAND_STOP_FIRE,KEYBOARD_KEYSBLOCKS_COMMAND_FIRE,KEYBOARD_KEYSBLOCKS_COMMAND_CHARGEFIRE,KEYBOARD_KEYSBLOCKS_COMMAND_LOCK_TARGET,KEYBOARD_KEYSBLOCKS_COMMAND_LOCK_TARGET_OFF,KEYBOARD_KEYSBLOCKS_COMMAND_ALTERNATE_MODE,KEYBOARD_KEYSBLOCKS_COMMAND_TRAJECTORY_VIEW,KEYBOARD_KEYSBLOCKS_COMMAND_RELOADPARTIALCLIP,KEYBOARD_KEYSBLOCKS_COMMAND_ITEM01,KEYBOARD_KEYSBLOCKS_COMMAND_ITEM02,KEYBOARD_KEYSBLOCKS_COMMAND_ITEM03,KEYBOARD_KEYSBLOCKS_COMMAND_ITEM04,KEYBOARD_KEYSBLOCKS_COMMAND_ITEM05,KEYBOARD_KEYSBLOCKS_COMMAND_ITEM06,KEYBOARD_KEYSBLOCKS_COMMAND_ITEM07,KEYBOARD_KEYSBLOCKS_COMMAND_ITEM08,KEYBOARD_KEYSBLOCKS_COMMAND_MY_TARGET_FOLLOW_ME,KEYBOARD_KEYSBLOCKS_COMMAND_ATTACK,KEYBOARD_KEYSBLOCKS_COMMAND_TO_BASE_TO_BACK,KEYBOARD_KEYSBLOCKS_COMMAND_POSITIVE,KEYBOARD_KEYSBLOCKS_COMMAND_NEGATIVE,KEYBOARD_KEYSBLOCKS_COMMAND_SOS_HELP_ME,KEYBOARD_KEYSBLOCKS_COMMAND_RELOAD_STOP,KEYBOARD_KEYSBLOCKS_COMMAND_CAMERA_UP,KEYBOARD_KEYSBLOCKS_COMMAND_CAMERA_DOWN,KEYBOARD_KEYSBLOCKS_COMMAND_CAMERA_LEFT,KEYBOARD_KEYSBLOCKS_COMMAND_CAMERA_RIGHT,KEYBOARD_KEYSBLOCKS_COMMAND_PUSHTOTALK,KEYBOARD_KEYSBLOCKS_COMMAND_VOICECHAT_ENABLE,KEYBOARD_KEYSBLOCKS_COMMAND_EVENT_HORN,KEYBOARD_KEYSBLOCKS_COMMAND_USEHORN,KEYBOARD_KEYSBLOCKS_COMMAND_SHOWHUD,KEYBOARD_KEYSBLOCKS_COMMAND_FRONTLINESELFDESTRUCTION,KEYBOARD_KEYSBLOCKS_COMMAND_SHOWRADIALMENU,KEYBOARD_KEYSBLOCKS_COMMAND_SHOWQUESTPROGRESS,KEYBOARD_KEYSBLOCKS_COMMAND_SIZEUP,KEYBOARD_KEYSBLOCKS_COMMAND_SIZEDOWN,KEYBOARD_KEYSBLOCKS_COMMAND_VISIBLE];
public function SETTINGS()
{
......
......@@ -175,8 +175,6 @@ package
public static const TURNOFFCOMBATCHAT:String = "#tooltips:turnOffCombatChat";
public static const DISABLECOMMONCHAT:String = "#tooltips:disableCommonChat";
public static const SHOWMARKSONGUN:String = "#tooltips:showMarksOnGun";
public static const C11NHISTORICALLYACCURATE:String = "#tooltips:c11nHistoricallyAccurate";
......@@ -787,10 +785,6 @@ package
public static const TURNOFFCOMBATCHAT_BODY:String = "#tooltips:turnOffCombatChat/body";
public static const DISABLECOMMONCHAT_HEADER:String = "#tooltips:disableCommonChat/header";
public static const DISABLECOMMONCHAT_BODY:String = "#tooltips:disableCommonChat/body";
public static const HANGARCAMDROPDOWN_HEADER:String = "#tooltips:hangarCamDropdown/header";
public static const HANGARCAMDROPDOWN_BODY:String = "#tooltips:hangarCamDropdown/body";
......
......@@ -44,8 +44,6 @@ package net.wg.gui.lobby.settings
public var disableBattleChatCheckbox:CheckBox = null;
public var disableEventCommonChatCheckbox:CheckBox = null;
public var ppShowLevelsCheckbox:CheckBox = null;
public var gameplay_ctfCheckbox:CheckBox = null;
......@@ -138,6 +136,8 @@ package net.wg.gui.lobby.settings
public var enableSpeedometerCheckbox:CheckBox = null;
public var disableEventHornCheckbox:CheckBox = null;
public function GameSettingsContent()
{
super();
......@@ -174,7 +174,6 @@ package net.wg.gui.lobby.settings
this.disableBattleChatCheckbox.label = SETTINGS.CHAT_DISABLEBATTLECHAT;
this.disableBattleChatCheckbox.toolTip = TOOLTIPS.TURNOFFCOMBATCHAT;
this.disableBattleChatCheckbox.infoIcoType = InfoIcon.TYPE_INFO;
this.disableEventCommonChatCheckbox.label = SETTINGS.CHAT_DISABLEDCOMMONCHAT;
this.ppShowLevelsCheckbox.label = SETTINGS.GAME_PPSHOWLEVELS;
this.gameplay_ctfCheckbox.label = SETTINGS.GAMEPLAY_CTF;
this.gameplay_dominationCheckbox.label = SETTINGS.GAMEPLAY_DOMINATION;
......@@ -233,6 +232,7 @@ package net.wg.gui.lobby.settings
this.hangarCamLabelControl.toolTip = TOOLTIPS.HANGARCAMDROPDOWN;
this.showDamageIconCheckbox.infoIcoType = InfoIcon.TYPE_INFO;
this.enableSpeedometerCheckbox.label = SETTINGS.GAME_ENABLESPEEDOMETER;
this.disableEventHornCheckbox.label = SETTINGS.GAME_EVENTHORNDISABLE;
super.configUI();
}
......@@ -268,8 +268,6 @@ package net.wg.gui.lobby.settings
this.chatContactsListOnlyCheckbox = null;
this.disableBattleChatCheckbox.dispose();
this.disableBattleChatCheckbox = null;
this.disableEventCommonChatCheckbox.dispose();
this.disableEventCommonChatCheckbox = null;
this.ppShowLevelsCheckbox.dispose();
this.ppShowLevelsCheckbox = null;
this.gameplay_ctfCheckbox.dispose();
......@@ -357,6 +355,8 @@ package net.wg.gui.lobby.settings
this.showDamageIconCheckbox = null;
this.enableSpeedometerCheckbox.dispose();
this.enableSpeedometerCheckbox = null;
this.disableEventHornCheckbox.dispose();
this.disableEventHornCheckbox = null;
super.onDispose();
}
......
......@@ -29,8 +29,6 @@ package net.wg.gui.lobby.settings.vo.config
public var disableBattleChat:SettingsControlProp = null;
public var disableEventCommonChat:SettingsControlProp = null;
public var ppShowLevels:SettingsControlProp = null;
public var gameplay_ctf:SettingsControlProp = null;
......@@ -101,6 +99,8 @@ package net.wg.gui.lobby.settings.vo.config
public var minimapAlphaEnabled:SettingsControlProp = null;
public var disableEventHorn:SettingsControlProp = null;
public function GameSettingsDataVo()
{
super({
......@@ -115,7 +115,6 @@ package net.wg.gui.lobby.settings.vo.config
"dynamicCamera":createControl(ControlsFactory.TYPE_CHECKBOX).build(),
"horStabilizationSnp":createControl(ControlsFactory.TYPE_CHECKBOX).build(),
"disableBattleChat":createControl(ControlsFactory.TYPE_CHECKBOX).build(),
"disableEventCommonChat":createControl(ControlsFactory.TYPE_CHECKBOX).build(),
"receiveClanInvitesNotifications":createControl(ControlsFactory.TYPE_CHECKBOX).build(),
"sniperModeByShift":createControl(ControlsFactory.TYPE_CHECKBOX).build(),
"increasedZoom":createControl(ControlsFactory.TYPE_CHECKBOX).build(),
......@@ -150,7 +149,8 @@ package net.wg.gui.lobby.settings.vo.config
"battleLoadingRankedInfo":createControl(ControlsFactory.TYPE_DROPDOWN).build(),
"carouselType":createControl(ControlsFactory.TYPE_BUTTON_BAR).build(),
"doubleCarouselType":createControl(ControlsFactory.TYPE_DROPDOWN).build(),
"vehicleCarouselStats":createControl(ControlsFactory.TYPE_CHECKBOX).build()
"vehicleCarouselStats":createControl(ControlsFactory.TYPE_CHECKBOX).build(),
"disableEventHorn":createControl(ControlsFactory.TYPE_CHECKBOX).build()
});
}
......@@ -167,7 +167,6 @@ package net.wg.gui.lobby.settings.vo.config
this.dynamicCamera = null;
this.horStabilizationSnp = null;
this.disableBattleChat = null;
this.disableEventCommonChat = null;
this.ppShowLevels = null;
this.gameplay_ctf = null;
this.gameplay_domination = null;
......@@ -209,6 +208,7 @@ package net.wg.gui.lobby.settings.vo.config
this.vehicleCarouselStats = null;
this.minimapAlphaEnabled.dispose();
this.minimapAlphaEnabled = null;
this.disableEventHorn = null;
super.onDispose();
}
}
......
......@@ -375,6 +375,8 @@ package
public static const GAME_LOGINSERVERSELECTION:String = "#settings:game/loginServerSelection";
public static const GAME_EVENTHORNDISABLE:String = "#settings:game/eventHornDisable";
public static const MONITOR:String = "#settings:monitor";
public static const MONITOR_DESCRIPTION:String = "#settings:monitor/description";
......@@ -693,8 +695,6 @@ package
public static const CHAT_DISABLEBATTLECHAT:String = "#settings:chat/disableBattleChat";
public static const CHAT_DISABLEDCOMMONCHAT:String = "#settings:chat/disabledCommonChat";
public static const GAME_SHOWLANGUAGEBAR:String = "#settings:game/showLanguageBar";
public static const GAME_ENABLEVOIP:String = "#settings:game/enableVoIP";
......@@ -987,6 +987,8 @@ package
public static const KEYBOARD_KEYSBLOCKS_COMMAND_VOICECHAT_ENABLE:String = "#settings:keyboard/keysBlocks/command/voicechat_enable";
public static const KEYBOARD_KEYSBLOCKS_COMMAND_EVENT_HORN:String = "#settings:keyboard/keysBlocks/command/event_horn";
public static const KEYBOARD_KEYSBLOCKS_GROUP_VEHICLE_OTHER:String = "#settings:keyboard/keysBlocks/group/vehicle_other";
public static const KEYBOARD_KEYSBLOCKS_COMMAND_USEHORN:String = "#settings:keyboard/keysBlocks/command/useHorn";
......@@ -1367,7 +1369,7 @@ package
public static const KEYBOARD_KEYSBLOCKS_GROUP_ENUM:Array = [KEYBOARD_KEYSBLOCKS_GROUP_MOVEMENT,KEYBOARD_KEYSBLOCKS_GROUP_CRUIS_CONTROL,KEYBOARD_KEYSBLOCKS_GROUP_FIRING,KEYBOARD_KEYSBLOCKS_GROUP_EQUIPMENT,KEYBOARD_KEYSBLOCKS_GROUP_SHORTCUTS,KEYBOARD_KEYSBLOCKS_GROUP_CAMERA,KEYBOARD_KEYSBLOCKS_GROUP_VOICECHAT,KEYBOARD_KEYSBLOCKS_GROUP_VEHICLE_OTHER,KEYBOARD_KEYSBLOCKS_GROUP_MINIMAP];
public static const KEYBOARD_KEYSBLOCKS_COMMAND_ENUM:Array = [KEYBOARD_KEYSBLOCKS_COMMAND_FORWARD,KEYBOARD_KEYSBLOCKS_COMMAND_FORWARD_CRUISE,KEYBOARD_KEYSBLOCKS_COMMAND_BACKWARD,KEYBOARD_KEYSBLOCKS_COMMAND_BACKWARD_CRUISE,KEYBOARD_KEYSBLOCKS_COMMAND_LEFT,KEYBOARD_KEYSBLOCKS_COMMAND_RIGHT,KEYBOARD_KEYSBLOCKS_COMMAND_AUTO_ROTATION,KEYBOARD_KEYSBLOCKS_COMMAND_BLOCK_TRACKS,KEYBOARD_KEYSBLOCKS_COMMAND_STOP_FIRE,KEYBOARD_KEYSBLOCKS_COMMAND_FIRE,KEYBOARD_KEYSBLOCKS_COMMAND_CHARGEFIRE,KEYBOARD_KEYSBLOCKS_COMMAND_LOCK_TARGET,KEYBOARD_KEYSBLOCKS_COMMAND_LOCK_TARGET_OFF,KEYBOARD_KEYSBLOCKS_COMMAND_ALTERNATE_MODE,KEYBOARD_KEYSBLOCKS_COMMAND_TRAJECTORY_VIEW,KEYBOARD_KEYSBLOCKS_COMMAND_RELOADPARTIALCLIP,KEYBOARD_KEYSBLOCKS_COMMAND_ITEM01,KEYBOARD_KEYSBLOCKS_COMMAND_ITEM02,KEYBOARD_KEYSBLOCKS_COMMAND_ITEM03,KEYBOARD_KEYSBLOCKS_COMMAND_ITEM04,KEYBOARD_KEYSBLOCKS_COMMAND_ITEM05,KEYBOARD_KEYSBLOCKS_COMMAND_ITEM06,KEYBOARD_KEYSBLOCKS_COMMAND_ITEM07,KEYBOARD_KEYSBLOCKS_COMMAND_ITEM08,KEYBOARD_KEYSBLOCKS_COMMAND_MY_TARGET_FOLLOW_ME,KEYBOARD_KEYSBLOCKS_COMMAND_ATTACK,KEYBOARD_KEYSBLOCKS_COMMAND_TO_BASE_TO_BACK,KEYBOARD_KEYSBLOCKS_COMMAND_POSITIVE,KEYBOARD_KEYSBLOCKS_COMMAND_NEGATIVE,KEYBOARD_KEYSBLOCKS_COMMAND_SOS_HELP_ME,KEYBOARD_KEYSBLOCKS_COMMAND_RELOAD_STOP,KEYBOARD_KEYSBLOCKS_COMMAND_CAMERA_UP,KEYBOARD_KEYSBLOCKS_COMMAND_CAMERA_DOWN,KEYBOARD_KEYSBLOCKS_COMMAND_CAMERA_LEFT,KEYBOARD_KEYSBLOCKS_COMMAND_CAMERA_RIGHT,KEYBOARD_KEYSBLOCKS_COMMAND_PUSHTOTALK,KEYBOARD_KEYSBLOCKS_COMMAND_VOICECHAT_ENABLE,KEYBOARD_KEYSBLOCKS_COMMAND_USEHORN,KEYBOARD_KEYSBLOCKS_COMMAND_SHOWHUD,KEYBOARD_KEYSBLOCKS_COMMAND_FRONTLINESELFDESTRUCTION,KEYBOARD_KEYSBLOCKS_COMMAND_SHOWRADIALMENU,KEYBOARD_KEYSBLOCKS_COMMAND_SHOWQUESTPROGRESS,KEYBOARD_KEYSBLOCKS_COMMAND_SIZEUP,KEYBOARD_KEYSBLOCKS_COMMAND_SIZEDOWN,KEYBOARD_KEYSBLOCKS_COMMAND_VISIBLE];
public static const KEYBOARD_KEYSBLOCKS_COMMAND_ENUM:Array = [KEYBOARD_KEYSBLOCKS_COMMAND_FORWARD,KEYBOARD_KEYSBLOCKS_COMMAND_FORWARD_CRUISE,KEYBOARD_KEYSBLOCKS_COMMAND_BACKWARD,KEYBOARD_KEYSBLOCKS_COMMAND_BACKWARD_CRUISE,KEYBOARD_KEYSBLOCKS_COMMAND_LEFT,KEYBOARD_KEYSBLOCKS_COMMAND_RIGHT,KEYBOARD_KEYSBLOCKS_COMMAND_AUTO_ROTATION,KEYBOARD_KEYSBLOCKS_COMMAND_BLOCK_TRACKS,KEYBOARD_KEYSBLOCKS_COMMAND_STOP_FIRE,KEYBOARD_KEYSBLOCKS_COMMAND_FIRE,KEYBOARD_KEYSBLOCKS_COMMAND_CHARGEFIRE,KEYBOARD_KEYSBLOCKS_COMMAND_LOCK_TARGET,KEYBOARD_KEYSBLOCKS_COMMAND_LOCK_TARGET_OFF,KEYBOARD_KEYSBLOCKS_COMMAND_ALTERNATE_MODE,KEYBOARD_KEYSBLOCKS_COMMAND_TRAJECTORY_VIEW,KEYBOARD_KEYSBLOCKS_COMMAND_RELOADPARTIALCLIP,KEYBOARD_KEYSBLOCKS_COMMAND_ITEM01,KEYBOARD_KEYSBLOCKS_COMMAND_ITEM02,KEYBOARD_KEYSBLOCKS_COMMAND_ITEM03,KEYBOARD_KEYSBLOCKS_COMMAND_ITEM04,KEYBOARD_KEYSBLOCKS_COMMAND_ITEM05,KEYBOARD_KEYSBLOCKS_COMMAND_ITEM06,KEYBOARD_KEYSBLOCKS_COMMAND_ITEM07,KEYBOARD_KEYSBLOCKS_COMMAND_ITEM08,KEYBOARD_KEYSBLOCKS_COMMAND_MY_TARGET_FOLLOW_ME,KEYBOARD_KEYSBLOCKS_COMMAND_ATTACK,KEYBOARD_KEYSBLOCKS_COMMAND_TO_BASE_TO_BACK,KEYBOARD_KEYSBLOCKS_COMMAND_POSITIVE,KEYBOARD_KEYSBLOCKS_COMMAND_NEGATIVE,KEYBOARD_KEYSBLOCKS_COMMAND_SOS_HELP_ME,KEYBOARD_KEYSBLOCKS_COMMAND_RELOAD_STOP,KEYBOARD_KEYSBLOCKS_COMMAND_CAMERA_UP,KEYBOARD_KEYSBLOCKS_COMMAND_CAMERA_DOWN,KEYBOARD_KEYSBLOCKS_COMMAND_CAMERA_LEFT,KEYBOARD_KEYSBLOCKS_COMMAND_CAMERA_RIGHT,KEYBOARD_KEYSBLOCKS_COMMAND_PUSHTOTALK,KEYBOARD_KEYSBLOCKS_COMMAND_VOICECHAT_ENABLE,KEYBOARD_KEYSBLOCKS_COMMAND_EVENT_HORN,KEYBOARD_KEYSBLOCKS_COMMAND_USEHORN,KEYBOARD_KEYSBLOCKS_COMMAND_SHOWHUD,KEYBOARD_KEYSBLOCKS_COMMAND_FRONTLINESELFDESTRUCTION,KEYBOARD_KEYSBLOCKS_COMMAND_SHOWRADIALMENU,KEYBOARD_KEYSBLOCKS_COMMAND_SHOWQUESTPROGRESS,KEYBOARD_KEYSBLOCKS_COMMAND_SIZEUP,KEYBOARD_KEYSBLOCKS_COMMAND_SIZEDOWN,KEYBOARD_KEYSBLOCKS_COMMAND_VISIBLE];
public function SETTINGS()
{
......
......@@ -175,8 +175,6 @@ package
public static const TURNOFFCOMBATCHAT:String = "#tooltips:turnOffCombatChat";
public static const DISABLECOMMONCHAT:String = "#tooltips:disableCommonChat";
public static const SHOWMARKSONGUN:String = "#tooltips:showMarksOnGun";
public static const C11NHISTORICALLYACCURATE:String = "#tooltips:c11nHistoricallyAccurate";
......@@ -787,10 +785,6 @@ package
public static const TURNOFFCOMBATCHAT_BODY:String = "#tooltips:turnOffCombatChat/body";
public static const DISABLECOMMONCHAT_HEADER:String = "#tooltips:disableCommonChat/header";
public static const DISABLECOMMONCHAT_BODY:String = "#tooltips:disableCommonChat/body";
public static const HANGARCAMDROPDOWN_HEADER:String = "#tooltips:hangarCamDropdown/header";
public static const HANGARCAMDROPDOWN_BODY:String = "#tooltips:hangarCamDropdown/body";
......
......@@ -124,7 +124,7 @@ diff -Naur lobby.orig/net/wg/gui/lobby/components/SmallSkillsList.as lobby/net/w
diff -Naur lobby.orig/net/wg/gui/lobby/hangar/Hangar.as lobby/net/wg/gui/lobby/hangar/Hangar.as
--- lobby.orig/net/wg/gui/lobby/hangar/Hangar.as 2020-02-28 20:16:11.425977000 +0200
+++ lobby/net/wg/gui/lobby/hangar/Hangar.as 2020-02-28 20:19:21.831655200 +0200
@@ -173,6 +173,11 @@
@@ -175,6 +175,11 @@
public var dqWidget:DailyQuestWidget;
......
......@@ -375,6 +375,8 @@ package
public static const GAME_LOGINSERVERSELECTION:String = "#settings:game/loginServerSelection";
public static const GAME_EVENTHORNDISABLE:String = "#settings:game/eventHornDisable";
public static const MONITOR:String = "#settings:monitor";
public static const MONITOR_DESCRIPTION:String = "#settings:monitor/description";
......@@ -693,8 +695,6 @@ package
public static const CHAT_DISABLEBATTLECHAT:String = "#settings:chat/disableBattleChat";
public static const CHAT_DISABLEDCOMMONCHAT:String = "#settings:chat/disabledCommonChat";
public static const GAME_SHOWLANGUAGEBAR:String = "#settings:game/showLanguageBar";
public static const GAME_ENABLEVOIP:String = "#settings:game/enableVoIP";
......@@ -987,6 +987,8 @@ package
public static const KEYBOARD_KEYSBLOCKS_COMMAND_VOICECHAT_ENABLE:String = "#settings:keyboard/keysBlocks/command/voicechat_enable";
public static const KEYBOARD_KEYSBLOCKS_COMMAND_EVENT_HORN:String = "#settings:keyboard/keysBlocks/command/event_horn";
public static const KEYBOARD_KEYSBLOCKS_GROUP_VEHICLE_OTHER:String = "#settings:keyboard/keysBlocks/group/vehicle_other";
public static const KEYBOARD_KEYSBLOCKS_COMMAND_USEHORN:String = "#settings:keyboard/keysBlocks/command/useHorn";
......@@ -1367,7 +1369,7 @@ package
public static const KEYBOARD_KEYSBLOCKS_GROUP_ENUM:Array = [KEYBOARD_KEYSBLOCKS_GROUP_MOVEMENT,KEYBOARD_KEYSBLOCKS_GROUP_CRUIS_CONTROL,KEYBOARD_KEYSBLOCKS_GROUP_FIRING,KEYBOARD_KEYSBLOCKS_GROUP_EQUIPMENT,KEYBOARD_KEYSBLOCKS_GROUP_SHORTCUTS,KEYBOARD_KEYSBLOCKS_GROUP_CAMERA,KEYBOARD_KEYSBLOCKS_GROUP_VOICECHAT,KEYBOARD_KEYSBLOCKS_GROUP_VEHICLE_OTHER,KEYBOARD_KEYSBLOCKS_GROUP_MINIMAP];
public static const KEYBOARD_KEYSBLOCKS_COMMAND_ENUM:Array = [KEYBOARD_KEYSBLOCKS_COMMAND_FORWARD,KEYBOARD_KEYSBLOCKS_COMMAND_FORWARD_CRUISE,KEYBOARD_KEYSBLOCKS_COMMAND_BACKWARD,KEYBOARD_KEYSBLOCKS_COMMAND_BACKWARD_CRUISE,KEYBOARD_KEYSBLOCKS_COMMAND_LEFT,KEYBOARD_KEYSBLOCKS_COMMAND_RIGHT,KEYBOARD_KEYSBLOCKS_COMMAND_AUTO_ROTATION,KEYBOARD_KEYSBLOCKS_COMMAND_BLOCK_TRACKS,KEYBOARD_KEYSBLOCKS_COMMAND_STOP_FIRE,KEYBOARD_KEYSBLOCKS_COMMAND_FIRE,KEYBOARD_KEYSBLOCKS_COMMAND_CHARGEFIRE,KEYBOARD_KEYSBLOCKS_COMMAND_LOCK_TARGET,KEYBOARD_KEYSBLOCKS_COMMAND_LOCK_TARGET_OFF,KEYBOARD_KEYSBLOCKS_COMMAND_ALTERNATE_MODE,KEYBOARD_KEYSBLOCKS_COMMAND_TRAJECTORY_VIEW,KEYBOARD_KEYSBLOCKS_COMMAND_RELOADPARTIALCLIP,KEYBOARD_KEYSBLOCKS_COMMAND_ITEM01,KEYBOARD_KEYSBLOCKS_COMMAND_ITEM02,KEYBOARD_KEYSBLOCKS_COMMAND_ITEM03,KEYBOARD_KEYSBLOCKS_COMMAND_ITEM04,KEYBOARD_KEYSBLOCKS_COMMAND_ITEM05,KEYBOARD_KEYSBLOCKS_COMMAND_ITEM06,KEYBOARD_KEYSBLOCKS_COMMAND_ITEM07,KEYBOARD_KEYSBLOCKS_COMMAND_ITEM08,KEYBOARD_KEYSBLOCKS_COMMAND_MY_TARGET_FOLLOW_ME,KEYBOARD_KEYSBLOCKS_COMMAND_ATTACK,KEYBOARD_KEYSBLOCKS_COMMAND_TO_BASE_TO_BACK,KEYBOARD_KEYSBLOCKS_COMMAND_POSITIVE,KEYBOARD_KEYSBLOCKS_COMMAND_NEGATIVE,KEYBOARD_KEYSBLOCKS_COMMAND_SOS_HELP_ME,KEYBOARD_KEYSBLOCKS_COMMAND_RELOAD_STOP,KEYBOARD_KEYSBLOCKS_COMMAND_CAMERA_UP,KEYBOARD_KEYSBLOCKS_COMMAND_CAMERA_DOWN,KEYBOARD_KEYSBLOCKS_COMMAND_CAMERA_LEFT,KEYBOARD_KEYSBLOCKS_COMMAND_CAMERA_RIGHT,KEYBOARD_KEYSBLOCKS_COMMAND_PUSHTOTALK,KEYBOARD_KEYSBLOCKS_COMMAND_VOICECHAT_ENABLE,KEYBOARD_KEYSBLOCKS_COMMAND_USEHORN,KEYBOARD_KEYSBLOCKS_COMMAND_SHOWHUD,KEYBOARD_KEYSBLOCKS_COMMAND_FRONTLINESELFDESTRUCTION,KEYBOARD_KEYSBLOCKS_COMMAND_SHOWRADIALMENU,KEYBOARD_KEYSBLOCKS_COMMAND_SHOWQUESTPROGRESS,KEYBOARD_KEYSBLOCKS_COMMAND_SIZEUP,KEYBOARD_KEYSBLOCKS_COMMAND_SIZEDOWN,KEYBOARD_KEYSBLOCKS_COMMAND_VISIBLE];
public static const KEYBOARD_KEYSBLOCKS_COMMAND_ENUM:Array = [KEYBOARD_KEYSBLOCKS_COMMAND_FORWARD,KEYBOARD_KEYSBLOCKS_COMMAND_FORWARD_CRUISE,KEYBOARD_KEYSBLOCKS_COMMAND_BACKWARD,KEYBOARD_KEYSBLOCKS_COMMAND_BACKWARD_CRUISE,KEYBOARD_KEYSBLOCKS_COMMAND_LEFT,KEYBOARD_KEYSBLOCKS_COMMAND_RIGHT,KEYBOARD_KEYSBLOCKS_COMMAND_AUTO_ROTATION,KEYBOARD_KEYSBLOCKS_COMMAND_BLOCK_TRACKS,KEYBOARD_KEYSBLOCKS_COMMAND_STOP_FIRE,KEYBOARD_KEYSBLOCKS_COMMAND_FIRE,KEYBOARD_KEYSBLOCKS_COMMAND_CHARGEFIRE,KEYBOARD_KEYSBLOCKS_COMMAND_LOCK_TARGET,KEYBOARD_KEYSBLOCKS_COMMAND_LOCK_TARGET_OFF,KEYBOARD_KEYSBLOCKS_COMMAND_ALTERNATE_MODE,KEYBOARD_KEYSBLOCKS_COMMAND_TRAJECTORY_VIEW,KEYBOARD_KEYSBLOCKS_COMMAND_RELOADPARTIALCLIP,KEYBOARD_KEYSBLOCKS_COMMAND_ITEM01,KEYBOARD_KEYSBLOCKS_COMMAND_ITEM02,KEYBOARD_KEYSBLOCKS_COMMAND_ITEM03,KEYBOARD_KEYSBLOCKS_COMMAND_ITEM04,KEYBOARD_KEYSBLOCKS_COMMAND_ITEM05,KEYBOARD_KEYSBLOCKS_COMMAND_ITEM06,KEYBOARD_KEYSBLOCKS_COMMAND_ITEM07,KEYBOARD_KEYSBLOCKS_COMMAND_ITEM08,KEYBOARD_KEYSBLOCKS_COMMAND_MY_TARGET_FOLLOW_ME,KEYBOARD_KEYSBLOCKS_COMMAND_ATTACK,KEYBOARD_KEYSBLOCKS_COMMAND_TO_BASE_TO_BACK,KEYBOARD_KEYSBLOCKS_COMMAND_POSITIVE,KEYBOARD_KEYSBLOCKS_COMMAND_NEGATIVE,KEYBOARD_KEYSBLOCKS_COMMAND_SOS_HELP_ME,KEYBOARD_KEYSBLOCKS_COMMAND_RELOAD_STOP,KEYBOARD_KEYSBLOCKS_COMMAND_CAMERA_UP,KEYBOARD_KEYSBLOCKS_COMMAND_CAMERA_DOWN,KEYBOARD_KEYSBLOCKS_COMMAND_CAMERA_LEFT,KEYBOARD_KEYSBLOCKS_COMMAND_CAMERA_RIGHT,KEYBOARD_KEYSBLOCKS_COMMAND_PUSHTOTALK,KEYBOARD_KEYSBLOCKS_COMMAND_VOICECHAT_ENABLE,KEYBOARD_KEYSBLOCKS_COMMAND_EVENT_HORN,KEYBOARD_KEYSBLOCKS_COMMAND_USEHORN,KEYBOARD_KEYSBLOCKS_COMMAND_SHOWHUD,KEYBOARD_KEYSBLOCKS_COMMAND_FRONTLINESELFDESTRUCTION,KEYBOARD_KEYSBLOCKS_COMMAND_SHOWRADIALMENU,KEYBOARD_KEYSBLOCKS_COMMAND_SHOWQUESTPROGRESS,KEYBOARD_KEYSBLOCKS_COMMAND_SIZEUP,KEYBOARD_KEYSBLOCKS_COMMAND_SIZEDOWN,KEYBOARD_KEYSBLOCKS_COMMAND_VISIBLE];
public function SETTINGS()
{
......
......@@ -175,8 +175,6 @@ package
public static const TURNOFFCOMBATCHAT:String = "#tooltips:turnOffCombatChat";
public static const DISABLECOMMONCHAT:String = "#tooltips:disableCommonChat";
public static const SHOWMARKSONGUN:String = "#tooltips:showMarksOnGun";
public static const C11NHISTORICALLYACCURATE:String = "#tooltips:c11nHistoricallyAccurate";
......@@ -787,10 +785,6 @@ package
public static const TURNOFFCOMBATCHAT_BODY:String = "#tooltips:turnOffCombatChat/body";
public static const DISABLECOMMONCHAT_HEADER:String = "#tooltips:disableCommonChat/header";
public static const DISABLECOMMONCHAT_BODY:String = "#tooltips:disableCommonChat/body";
public static const HANGARCAMDROPDOWN_HEADER:String = "#tooltips:hangarCamDropdown/header";
public static const HANGARCAMDROPDOWN_BODY:String = "#tooltips:hangarCamDropdown/body";
......
......@@ -65,7 +65,9 @@ package net.wg.gui.lobby.hangar
protected static const INVALIDATE_CAROUSEL_SIZE:String = "InvalidateCarouselSize";
private static const ENTRY_CONT_POSITION_INVALID:String = "entryContPositionInvalid";
protected static const INVALIDATE_AMMUNITION_PANEL_SIZE:String = "InvalidateAmmunitionPanelSize";
private static const ENTRY_CONT_POSITION_INVALID:String = "enrtyContPositionInvalid";
private static const PARAMS_POSITION_INVALID:String = "paramsPositionInvalid";
......@@ -360,8 +362,8 @@ package net.wg.gui.lobby.hangar
this._gameInputMgr.clearKeyHandler(Keyboard.F1,KeyboardEvent.KEY_DOWN,this.showLayoutHandler);
this._gameInputMgr.clearKeyHandler(Keyboard.F1,KeyboardEvent.KEY_UP,this.closeLayoutHandler);
this.crewOperationBtn.removeEventListener(ButtonEvent.CLICK,this.onCrewOperationBtnClickHandler);
this.ammunitionPanel.removeEventListener(FocusRequestEvent.REQUEST_FOCUS,this.onAmmunitionPanelRequestFocusHandler);
this.ammunitionPanel.removeEventListener(Event.RESIZE,this.onAmmunitionPanelResizeHandler);
this.ammunitionPanel.removeEventListener(FocusRequestEvent.REQUEST_FOCUS,this.onAmmunitionPanelRequestFocusHandler);
this.vehResearchPanel.removeEventListener(Event.RESIZE,this.onVehResearchPanelResizeHandler);
this.teaser.removeEventListener(TeaserEvent.TEASER_CLICK,this.onTeaserTeaserClickHandler);
this.teaser.removeEventListener(TeaserEvent.HIDE,this.onTeaserHideHandler);
......@@ -443,8 +445,8 @@ package net.wg.gui.lobby.hangar
this.crewOperationBtn.helpText = LOBBY_HELP.HANGAR_CREWOPERATIONBTN;
this.crewOperationBtn.addEventListener(ButtonEvent.CLICK,this.onCrewOperationBtnClickHandler,false,0,true);
this.crewOperationBtn.iconSource = RES_ICONS.MAPS_ICONS_TANKMEN_CREW_CREWOPERATIONS;
this.ammunitionPanel.addEventListener(FocusRequestEvent.REQUEST_FOCUS,this.onAmmunitionPanelRequestFocusHandler);
this.ammunitionPanel.addEventListener(Event.RESIZE,this.onAmmunitionPanelResizeHandler);
this.ammunitionPanel.addEventListener(FocusRequestEvent.REQUEST_FOCUS,this.onAmmunitionPanelRequestFocusHandler);
this.switchModePanel.addEventListener(ComponentEvent.SHOW,this.onSwitchModePanelShowHandler);
this.switchModePanel.addEventListener(ComponentEvent.HIDE,this.onSwitchModePanelHideHandler);
this.vehResearchPanel.addEventListener(Event.RESIZE,this.onVehResearchPanelResizeHandler);
......@@ -468,7 +470,7 @@ package net.wg.gui.lobby.hangar
this.crew.enabled = this._crewEnabled;
this.crewOperationBtn.enabled = this._crewEnabled;
}
var _loc1_:Boolean = isInvalid(ENTRY_CONT_POSITION_INVALID);
var _loc1_:Boolean = isInvalid(ENTRY_CONT_POSITION_INVALID,INVALIDATE_AMMUNITION_PANEL_SIZE);
if(isInvalid(INVALIDATE_CAROUSEL_SIZE))
{
this.carousel.visible = true;
......@@ -1175,14 +1177,14 @@ package net.wg.gui.lobby.hangar
this.hideTeaserAnim();
}
private function onAmmunitionPanelRequestFocusHandler(param1:FocusRequestEvent) : void
private function onAmmunitionPanelResizeHandler(param1:Event) : void
{
setFocus(param1.focusContainer.getComponentForFocus());
invalidate(INVALIDATE_AMMUNITION_PANEL_SIZE);
}
private function onAmmunitionPanelResizeHandler(param1:Event) : void
private function onAmmunitionPanelRequestFocusHandler(param1:FocusRequestEvent) : void
{
invalidate(ENTRY_CONT_POSITION_INVALID);
setFocus(param1.focusContainer.getComponentForFocus());
}
private function onCrewOperationBtnClickHandler(param1:Event) : void
......
......@@ -44,8 +44,6 @@ package net.wg.gui.lobby.settings
public var disableBattleChatCheckbox:CheckBox = null;
public var disableEventCommonChatCheckbox:CheckBox = null;
public var ppShowLevelsCheckbox:CheckBox = null;
public var gameplay_ctfCheckbox:CheckBox = null;
......@@ -138,6 +136,8 @@ package net.wg.gui.lobby.settings
public var enableSpeedometerCheckbox:CheckBox = null;
public var disableEventHornCheckbox:CheckBox = null;
public function GameSettingsContent()
{
super();
......@@ -174,7 +174,6 @@ package net.wg.gui.lobby.settings
this.disableBattleChatCheckbox.label = SETTINGS.CHAT_DISABLEBATTLECHAT;
this.disableBattleChatCheckbox.toolTip = TOOLTIPS.TURNOFFCOMBATCHAT;
this.disableBattleChatCheckbox.infoIcoType = InfoIcon.TYPE_INFO;
this.disableEventCommonChatCheckbox.label = SETTINGS.CHAT_DISABLEDCOMMONCHAT;
this.ppShowLevelsCheckbox.label = SETTINGS.GAME_PPSHOWLEVELS;
this.gameplay_ctfCheckbox.label = SETTINGS.GAMEPLAY_CTF;
this.gameplay_dominationCheckbox.label = SETTINGS.GAMEPLAY_DOMINATION;
......@@ -233,6 +232,7 @@ package net.wg.gui.lobby.settings
this.hangarCamLabelControl.toolTip = TOOLTIPS.HANGARCAMDROPDOWN;
this.showDamageIconCheckbox.infoIcoType = InfoIcon.TYPE_INFO;
this.enableSpeedometerCheckbox.label = SETTINGS.GAME_ENABLESPEEDOMETER;
this.disableEventHornCheckbox.label = SETTINGS.GAME_EVENTHORNDISABLE;
super.configUI();
}
......@@ -268,8 +268,6 @@ package net.wg.gui.lobby.settings
this.chatContactsListOnlyCheckbox = null;
this.disableBattleChatCheckbox.dispose();
this.disableBattleChatCheckbox = null;
this.disableEventCommonChatCheckbox.dispose();
this.disableEventCommonChatCheckbox = null;
this.ppShowLevelsCheckbox.dispose();
this.ppShowLevelsCheckbox = null;
this.gameplay_ctfCheckbox.dispose();
......@@ -357,6 +355,8 @@ package net.wg.gui.lobby.settings
this.showDamageIconCheckbox = null;
this.enableSpeedometerCheckbox.dispose();
this.enableSpeedometerCheckbox = null;
this.disableEventHornCheckbox.dispose();
this.disableEventHornCheckbox = null;
super.onDispose();
}
......
......@@ -29,8 +29,6 @@ package net.wg.gui.lobby.settings.vo.config
public var disableBattleChat:SettingsControlProp = null;
public var disableEventCommonChat:SettingsControlProp = null;
public var ppShowLevels:SettingsControlProp = null;
public var gameplay_ctf:SettingsControlProp = null;
......@@ -101,6 +99,8 @@ package net.wg.gui.lobby.settings.vo.config
public var minimapAlphaEnabled:SettingsControlProp = null;
public var disableEventHorn:SettingsControlProp = null;
public function GameSettingsDataVo()
{
super({
......@@ -115,7 +115,6 @@ package net.wg.gui.lobby.settings.vo.config
"dynamicCamera":createControl(ControlsFactory.TYPE_CHECKBOX).build(),
"horStabilizationSnp":createControl(ControlsFactory.TYPE_CHECKBOX).build(),
"disableBattleChat":createControl(ControlsFactory.TYPE_CHECKBOX).build(),
"disableEventCommonChat":createControl(ControlsFactory.TYPE_CHECKBOX).build(),
"receiveClanInvitesNotifications":createControl(ControlsFactory.TYPE_CHECKBOX).build(),
"sniperModeByShift":createControl(ControlsFactory.TYPE_CHECKBOX).build(),
"increasedZoom":createControl(ControlsFactory.TYPE_CHECKBOX).build(),
......@@ -150,7 +149,8 @@ package net.wg.gui.lobby.settings.vo.config
"battleLoadingRankedInfo":createControl(ControlsFactory.TYPE_DROPDOWN).build(),
"carouselType":createControl(ControlsFactory.TYPE_BUTTON_BAR).build(),
"doubleCarouselType":createControl(ControlsFactory.TYPE_DROPDOWN).build(),
"vehicleCarouselStats":createControl(ControlsFactory.TYPE_CHECKBOX).build()
"vehicleCarouselStats":createControl(ControlsFactory.TYPE_CHECKBOX).build(),
"disableEventHorn":createControl(ControlsFactory.TYPE_CHECKBOX).build()
});
}
......@@ -167,7 +167,6 @@ package net.wg.gui.lobby.settings.vo.config
this.dynamicCamera = null;
this.horStabilizationSnp = null;
this.disableBattleChat = null;
this.disableEventCommonChat = null;
this.ppShowLevels = null;
this.gameplay_ctf = null;
this.gameplay_domination = null;
......@@ -209,6 +208,7 @@ package net.wg.gui.lobby.settings.vo.config
this.vehicleCarouselStats = null;
this.minimapAlphaEnabled.dispose();
this.minimapAlphaEnabled = null;
this.disableEventHorn = null;
super.onDispose();
}
}
......
......@@ -71,7 +71,7 @@ package net.wg.gui.login.impl
private static const COPYRIGHT_OFFSET_Y:Number = 44;
private static const WARNING_OFFSET_Y:Number = 68;
private static const WARNING_OFFSET_Y:Number = 48;
private static const STAGE_RESIZED:String = "stageResized";
......
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