diff --git a/SQF/dayz_code/Configs/RscDisplay/RscGroups.hpp b/SQF/dayz_code/Configs/RscDisplay/RscGroups.hpp index c46e9eee3..ad5b58c11 100644 --- a/SQF/dayz_code/Configs/RscDisplay/RscGroups.hpp +++ b/SQF/dayz_code/Configs/RscDisplay/RscGroups.hpp @@ -134,7 +134,7 @@ class DZ_GroupDialog { h = .05; }; class Players: DZ_GroupText { - text = $STR_EPOCH_PLAYERS; + text = $STR_MP_PLAYERS; x = .1075; y = .165; w = .3; diff --git a/SQF/dayz_code/Configs/RscDisplay/RscLobby.hpp b/SQF/dayz_code/Configs/RscDisplay/RscLobby.hpp index 70f6d02fa..158000642 100644 --- a/SQF/dayz_code/Configs/RscDisplay/RscLobby.hpp +++ b/SQF/dayz_code/Configs/RscDisplay/RscLobby.hpp @@ -196,9 +196,19 @@ class RscDisplayMultiplayerSetup: RscStandardDisplay class CA_ValuePool: RscIGUIListBox { idc = 114; - text = "Players"; + text = $STR_MP_PLAYERS; x = "(2/100) * SafeZoneW + SafeZoneX"; // to left w = "(96/100) * SafeZoneW"; // wide + colorText[] = {0.95, 0.95, 0.95, 1}; + class ScrollBar { + color[] = {1, 1, 1, 0.6}; + colorActive[] = {0.5, 0.5, 0.5, 1}; + colorDisabled[] = {1, 1, 1, 0.3}; + thumb = "\z\addons\dayz_code\gui\grey\igui_scrollbar_thumb_ca.paa"; + arrowFull = "\z\addons\dayz_code\gui\grey\igui_arrow_top_active_ca.paa"; + arrowEmpty = "\z\addons\dayz_code\gui\grey\igui_arrow_top_ca.paa"; + border = "\z\addons\dayz_code\gui\grey\igui_border_scroll_ca.paa"; + }; }; class CA_B_Lock : RscShortcutButton { idc = 118; @@ -229,7 +239,22 @@ class RscDisplayMultiplayerSetup: RscStandardDisplay animTextureFocused = "\z\addons\dayz_code\gui\grey\ui_button_focus_ca.paa"; animTexturePressed = "\z\addons\dayz_code\gui\grey\ui_button_down_ca.paa"; animTextureDefault = "\z\addons\dayz_code\gui\grey\ui_button_default_ca.paa"; - }; + }; + class CA_B_Kick : RscShortcutButton { + idc = 116; + default = 0; + shortcuts[] = {0x00050000 + 2}; + x = "(83/100) * SafeZoneW + SafeZoneX"; + y = "(14/100) * SafeZoneH + SafeZoneY"; + text = $STR_DISP_MP_KICKOFF; + color[] = {0.95, 0.95, 0.95, 1.0}; + animTextureNormal = "\z\addons\dayz_code\gui\grey\ui_button_normal_ca.paa"; + animTextureDisabled = "\z\addons\dayz_code\gui\grey\ui_button_disabled_ca.paa"; + animTextureOver = "\z\addons\dayz_code\gui\grey\ui_button_over_ca.paa"; + animTextureFocused = "\z\addons\dayz_code\gui\grey\ui_button_focus_ca.paa"; + animTexturePressed = "\z\addons\dayz_code\gui\grey\ui_button_down_ca.paa"; + animTextureDefault = "\z\addons\dayz_code\gui\grey\ui_button_default_ca.paa"; + }; class CA_ButtonContinue : RscShortcutButton { idc = 1; default = 1; diff --git a/SQF/dayz_code/Configs/rscTitles.hpp b/SQF/dayz_code/Configs/rscTitles.hpp index 6e97a9bb8..b3559ff40 100644 --- a/SQF/dayz_code/Configs/rscTitles.hpp +++ b/SQF/dayz_code/Configs/rscTitles.hpp @@ -45,7 +45,7 @@ class RscDisplayConfigure { class controls; }; class RscDisplayGameOptions { - onLoad = "{(_this select 0) displayCtrl 140 lbAdd _x;} forEach [localize 'STR_UI_DISABLED',localize 'STR_UI_ENABLED']; (_this select 0) displayCtrl 140 lbSetCurSel (profileNamespace getVariable ['streamerMode',0]); uiNamespace setVariable ['streamerMode',(profileNamespace getVariable ['streamerMode',0])];"; + onLoad = "{(_this select 0) displayCtrl 140 lbAdd _x;} forEach [localize 'STR_DISABLED',localize 'STR_ENABLED']; (_this select 0) displayCtrl 140 lbSetCurSel (profileNamespace getVariable ['streamerMode',0]); uiNamespace setVariable ['streamerMode',(profileNamespace getVariable ['streamerMode',0])];"; onUnload = "call ui_changeDisplay;"; class controls { class CA_TextLanguage : RscText { @@ -370,8 +370,18 @@ class RscDisplayDiary { y = "SafeZoneY + 0.137"; w = "0.146*SafeZoneW"; h = 0.6; + colorText[] = {0.95, 0.95, 0.95, 1}; colorSelectBackground[] = {0, 0, 0, 1.0}; colorSelectBackground2[] = {0, 0, 0, 0.8}; + class ScrollBar { + color[] = {1, 1, 1, 0.6}; + colorActive[] = {0.5, 0.5, 0.5, 1}; + colorDisabled[] = {1, 1, 1, 0.3}; + thumb = "\z\addons\dayz_code\gui\grey\igui_scrollbar_thumb_ca.paa"; + arrowFull = "\z\addons\dayz_code\gui\grey\igui_arrow_top_active_ca.paa"; + arrowEmpty = "\z\addons\dayz_code\gui\grey\igui_arrow_top_ca.paa"; + border = "\z\addons\dayz_code\gui\grey\igui_border_scroll_ca.paa"; + }; }; class CA_DiaryIndex : RscIGUIListBox { idc = 1002; @@ -382,8 +392,18 @@ class RscDisplayDiary { w = "0.283*SafeZoneW"; h = 0.6; sizeEx = 0.034; + colorText[] = {0.95, 0.95, 0.95, 1}; colorSelectBackground[] = {0, 0, 0, 1.0}; colorSelectBackground2[] = {0, 0, 0, 0.8}; + class ScrollBar { + color[] = {1, 1, 1, 0.6}; + colorActive[] = {0.5, 0.5, 0.5, 1}; + colorDisabled[] = {1, 1, 1, 0.3}; + thumb = "\z\addons\dayz_code\gui\grey\igui_scrollbar_thumb_ca.paa"; + arrowFull = "\z\addons\dayz_code\gui\grey\igui_arrow_top_active_ca.paa"; + arrowEmpty = "\z\addons\dayz_code\gui\grey\igui_arrow_top_ca.paa"; + border = "\z\addons\dayz_code\gui\grey\igui_border_scroll_ca.paa"; + }; }; }; }; diff --git a/SQF/dayz_code/gui/grey/igui_arrow_top_active_ca.paa b/SQF/dayz_code/gui/grey/igui_arrow_top_active_ca.paa new file mode 100644 index 000000000..a2eef8cd7 Binary files /dev/null and b/SQF/dayz_code/gui/grey/igui_arrow_top_active_ca.paa differ diff --git a/SQF/dayz_code/gui/grey/igui_arrow_top_ca.paa b/SQF/dayz_code/gui/grey/igui_arrow_top_ca.paa new file mode 100644 index 000000000..93daf7a60 Binary files /dev/null and b/SQF/dayz_code/gui/grey/igui_arrow_top_ca.paa differ diff --git a/SQF/dayz_code/gui/grey/igui_border_scroll_ca.paa b/SQF/dayz_code/gui/grey/igui_border_scroll_ca.paa new file mode 100644 index 000000000..5d7e1a6c1 Binary files /dev/null and b/SQF/dayz_code/gui/grey/igui_border_scroll_ca.paa differ diff --git a/SQF/dayz_code/gui/grey/igui_button_default_ca.paa b/SQF/dayz_code/gui/grey/igui_button_default_ca.paa new file mode 100644 index 000000000..c1e5729ab Binary files /dev/null and b/SQF/dayz_code/gui/grey/igui_button_default_ca.paa differ diff --git a/SQF/dayz_code/gui/grey/igui_button_disabled_ca.paa b/SQF/dayz_code/gui/grey/igui_button_disabled_ca.paa new file mode 100644 index 000000000..cd786feb9 Binary files /dev/null and b/SQF/dayz_code/gui/grey/igui_button_disabled_ca.paa differ diff --git a/SQF/dayz_code/gui/grey/igui_button_down_ca.paa b/SQF/dayz_code/gui/grey/igui_button_down_ca.paa new file mode 100644 index 000000000..37485609d Binary files /dev/null and b/SQF/dayz_code/gui/grey/igui_button_down_ca.paa differ diff --git a/SQF/dayz_code/gui/grey/igui_button_focus_ca.paa b/SQF/dayz_code/gui/grey/igui_button_focus_ca.paa new file mode 100644 index 000000000..4757da44d Binary files /dev/null and b/SQF/dayz_code/gui/grey/igui_button_focus_ca.paa differ diff --git a/SQF/dayz_code/gui/grey/igui_button_normal_ca.paa b/SQF/dayz_code/gui/grey/igui_button_normal_ca.paa new file mode 100644 index 000000000..c1e5729ab Binary files /dev/null and b/SQF/dayz_code/gui/grey/igui_button_normal_ca.paa differ diff --git a/SQF/dayz_code/gui/grey/igui_button_over_ca.paa b/SQF/dayz_code/gui/grey/igui_button_over_ca.paa new file mode 100644 index 000000000..e007b967b Binary files /dev/null and b/SQF/dayz_code/gui/grey/igui_button_over_ca.paa differ diff --git a/SQF/dayz_code/gui/grey/igui_scrollbar_thumb_ca.paa b/SQF/dayz_code/gui/grey/igui_scrollbar_thumb_ca.paa new file mode 100644 index 000000000..955ec7e70 Binary files /dev/null and b/SQF/dayz_code/gui/grey/igui_scrollbar_thumb_ca.paa differ diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml index 3085f96c5..4caf7b3d6 100644 --- a/SQF/dayz_code/stringtable.xml +++ b/SQF/dayz_code/stringtable.xml @@ -7804,30 +7804,6 @@ Hides server watermark and rules feed Blendet das Server Wasserzeichen und die Chatliste aus. - - Enabled - Activé - Activado - Attivato - Engedélyezve - włączony - Включен - Aktiviert - Povolen - 有効 - - - Disabled - Désactivé - Desactivado - Disattivato - Kikapcsolva - Wyłączone - Откл. - Deaktiviert - Zakázáno - 無効 - @@ -16346,17 +16322,6 @@ Hráč プレイヤー - - Players - Joueurs - Jugadores - Giocatori - Játékosok - Gracze - Игроки - Spieler - Hráči - Groups (F5) групп