From 20a0dc25a7e0e4d2d92a0c1f0cc91080edcc916f Mon Sep 17 00:00:00 2001 From: Edo Date: Sun, 24 Dec 2023 11:36:10 +0100 Subject: [PATCH 1/9] fix(str): update localize string value --- iw4x/iw4x_00/localizedstrings/iw4x_english.str | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iw4x/iw4x_00/localizedstrings/iw4x_english.str b/iw4x/iw4x_00/localizedstrings/iw4x_english.str index a6b9cb8..c894983 100644 --- a/iw4x/iw4x_00/localizedstrings/iw4x_english.str +++ b/iw4x/iw4x_00/localizedstrings/iw4x_english.str @@ -360,7 +360,7 @@ REFERENCE MENU_FRIENDNOTIFY LANG_ENGLISH "Friend Notifications" REFERENCE MPUI_DESC_FRIENDNOTIFY -LANG_ENGLISH "When should the friend status notifications be displayed?" +LANG_ENGLISH "Where should the friend status notifications be displayed?" REFERENCE MPUI_DESC_OPTIONS LANG_ENGLISH "Set your game options." From b3adaada9218091b7264734d60caa333b13254d0 Mon Sep 17 00:00:00 2001 From: Edo Date: Sun, 24 Dec 2023 11:52:05 +0100 Subject: [PATCH 2/9] better desc --- iw4x/iw4x_00/localizedstrings/iw4x_english.str | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iw4x/iw4x_00/localizedstrings/iw4x_english.str b/iw4x/iw4x_00/localizedstrings/iw4x_english.str index c894983..deb75be 100644 --- a/iw4x/iw4x_00/localizedstrings/iw4x_english.str +++ b/iw4x/iw4x_00/localizedstrings/iw4x_english.str @@ -360,7 +360,7 @@ REFERENCE MENU_FRIENDNOTIFY LANG_ENGLISH "Friend Notifications" REFERENCE MPUI_DESC_FRIENDNOTIFY -LANG_ENGLISH "Where should the friend status notifications be displayed?" +LANG_ENGLISH "Should you send status notifications to your friends?" REFERENCE MPUI_DESC_OPTIONS LANG_ENGLISH "Set your game options." From 32e940e5d4bed1cce4b578115a7b3da753eba5ab Mon Sep 17 00:00:00 2001 From: Edo Date: Sun, 24 Dec 2023 11:57:16 +0100 Subject: [PATCH 3/9] update gamepad --- iw4x/iw4x_00/ui_mp/pc_options_gamepad.menu | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/iw4x/iw4x_00/ui_mp/pc_options_gamepad.menu b/iw4x/iw4x_00/ui_mp/pc_options_gamepad.menu index a1b2195..3544d3e 100644 --- a/iw4x/iw4x_00/ui_mp/pc_options_gamepad.menu +++ b/iw4x/iw4x_00/ui_mp/pc_options_gamepad.menu @@ -110,7 +110,7 @@ {"@MENU_DEFAULT"; "thumbstick_default"; "@MENU_SOUTHPAW"; "thumbstick_southpaw"; "@MENU_LEGACY"; "thumbstick_legacy"; - "@MENU_LEGACY_SOUTHPAW"; "thumbstick_legacysouthpaw"}, execNow "bindgpsticksconfigs";, ;, ON_GPAD_DISABLED, ON_GPAD_ENABLED) + "@MENU_LEGACY_SOUTHPAW"; "thumbstick_legacysouthpaw"}, execNow "bindgpsticksconfigs";, "@MENU_DESC_THUMBSTICK_LAYOUT", ON_GPAD_DISABLED, ON_GPAD_ENABLED) PC_OPTIONS_STRLIST_RAW(3, "@MENU_BUTTON_LAYOUT", "gpad_buttonConfig", {"@MENU_DEFAULT"; "buttons_default"; "@MENU_TACTICAL"; "buttons_tactical"; @@ -119,7 +119,7 @@ "@MENU_DEFAULT_ALT"; "buttons_default_alt"; "@MENU_TACTICAL_ALT"; "buttons_tactical_alt"; "@MENU_LEFTY_ALT"; "buttons_lefty_alt"; - "@MENU_NOMAD_ALT"; "buttons_nomad_alt"}, execNow "bindgpbuttonsconfigs";, ;, ON_GPAD_DISABLED, ON_GPAD_ENABLED) + "@MENU_NOMAD_ALT"; "buttons_nomad_alt"}, execNow "bindgpbuttonsconfigs";, "@MENU_DESC_BUTTON_LAYOUT", ON_GPAD_DISABLED, ON_GPAD_ENABLED) PC_OPTIONS_FLOATLIST_RAW(4, "@MENU_GPAD_STYLE", "gpad_style", {"@MENU_GPAD_XBOX_CAPS" 0 "@MENU_GPAD_PS_CAPS" 1}, ;, "@MPUI_DESC_GPAD_STYLE", ON_GPAD_DISABLED, ON_GPAD_ENABLED) PC_OPTIONS_DVARYESNO_RAW(5, "@MENU_SLOWDOWN_ENABLED", "gpad_slowdown_enabled", ;, "@MPUI_DESC_SLOWDOWN_ENABLED", ON_GPAD_DISABLED, ON_GPAD_ENABLED) PC_OPTIONS_DVARYESNO_RAW(6, "@MENU_LOCKON_ENABLED", "gpad_lockon_enabled", ;, "@MPUI_DESC_LOCKON_ENABLED", ON_GPAD_DISABLED, ON_GPAD_ENABLED) @@ -129,6 +129,6 @@ {"@MENU_SENSITIVITY_LOW_CAPS" SENSITIVITY_1 "@MENU_SENSITIVITY_MEDIUM_CAPS" SENSITIVITY_2 "3" SENSITIVITY_3 "@MENU_SENSITIVITY_HIGH_CAPS" SENSITIVITY_4 "5" SENSITIVITY_5 "6" SENSITIVITY_6 "@MENU_SENSITIVITY_VERY_HIGH_CAPS" SENSITIVITY_7 "8" SENSITIVITY_8 "9" SENSITIVITY_9 "@MENU_SENSITIVITY_INSANE_CAPS" SENSITIVITY_10}, - ;, ;, ON_GPAD_DISABLED, ON_GPAD_ENABLED) + ;, "@MENU_DESC_LOOK_SENSITIVITY_PRESET", ON_GPAD_DISABLED, ON_GPAD_ENABLED) } } From 17f0f49635b94663003585a02fa55827f604243c Mon Sep 17 00:00:00 2001 From: Edo Date: Sun, 24 Dec 2023 11:57:53 +0100 Subject: [PATCH 4/9] Update iw4x_english.str --- .../iw4x_00/localizedstrings/iw4x_english.str | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/iw4x/iw4x_00/localizedstrings/iw4x_english.str b/iw4x/iw4x_00/localizedstrings/iw4x_english.str index deb75be..924e4d3 100644 --- a/iw4x/iw4x_00/localizedstrings/iw4x_english.str +++ b/iw4x/iw4x_00/localizedstrings/iw4x_english.str @@ -1304,6 +1304,25 @@ LANG_ENGLISH "SAS eliminated" REFERENCE MP_SAS_FORFEITED LANG_ENGLISH "SAS forfeited" +REFERENCE MENU_DESC_BUTTON_LAYOUT +LANG_ENGLISH "Change the button layout for the gamepad" +REFERENCE MENU_DESC_THUMBSTICK_LAYOUT +LANG_ENGLISH "Change the thumbstick layout for the gamepad" + +REFERENCE MENU_DESC_LOOK_SENSITIVITY_PRESET +LANG_ENGLISH "Choose different sensitivity presets" + +REFERENCE MENU_DESC_MAXPACKETS +LANG_ENGLISH "Maximum number of packets sent per frame" + +REFERENCE MENU_DESC_SNAPS +LANG_ENGLISH "Snapshot rate" + +REFERENCE MENU_DESC_DRAWFPS +LANG_ENGLISH "Draw frames per second" + +REFERENCE MENU_DESC_FPSLABELS +LANG_ENGLISH "Draw viewpos" ENDMARKER From e8cf3048c5dd299720411821a16624925e59517d Mon Sep 17 00:00:00 2001 From: Edo Date: Sun, 24 Dec 2023 11:59:31 +0100 Subject: [PATCH 5/9] Update pc_options_multi.menu --- iw4x/iw4x_00/ui_mp/pc_options_multi.menu | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/iw4x/iw4x_00/ui_mp/pc_options_multi.menu b/iw4x/iw4x_00/ui_mp/pc_options_multi.menu index ca4b120..627c8d2 100644 --- a/iw4x/iw4x_00/ui_mp/pc_options_multi.menu +++ b/iw4x/iw4x_00/ui_mp/pc_options_multi.menu @@ -84,18 +84,18 @@ PC_OPTIONS_SEPERATOR(0) - PC_OPTIONS_FLOATLIST_RAW(1, "@MENU_MAXPACKETS", "cl_maxpackets", {"30" 30 "100" 100 "125" 125}, ;, ;, when(0), 1) - PC_OPTIONS_FLOATLIST_RAW(2, "@MENU_SNAPS", "snaps", {"20" 20 "30" 30}, ;, ;, when(0), 1) + PC_OPTIONS_FLOATLIST_RAW(1, "@MENU_MAXPACKETS", "cl_maxpackets", {"30" 30 "100" 100 "125" 125}, ;, "@MENU_DESC_MAXPACKETS", when(0), 1) + PC_OPTIONS_FLOATLIST_RAW(2, "@MENU_SNAPS", "snaps", {"20" 20 "30" 30}, ;, "@MENU_DESC_SNAPS", when(0), 1) PC_OPTIONS_SEPERATOR(2) PC_OPTIONS_DVARYESNO(3, "@MENU_LAGOMETER", "drawLagometer", ;, when(0)) - PC_OPTIONS_STRLIST_RAW(4, "@MENU_DRAWFPS", "cg_drawFPS", {"Off"; "Off"; "Simple"; "Simple"; "SimpleRanges"; "SimpleRanges"; "Verbose"; "Verbose"; "Verbose+Viewpos"; "Verbose+Viewpos"}, ;, ;, when(0), 1) - PC_OPTIONS_DVARYESNO(5, "@MENU_FPSLABELS", "cg_drawFPSLabels", ;, when(0)) + PC_OPTIONS_STRLIST_RAW(4, "@MENU_DRAWFPS", "cg_drawFPS", {"Off"; "Off"; "Simple"; "Simple"; "SimpleRanges"; "SimpleRanges"; "Verbose"; "Verbose"; "Verbose+Viewpos"; "Verbose+Viewpos"}, ;, "@MENU_DRAWFPS_DESC", when(0), 1) + PC_OPTIONS_DVARYESNO(5, "@MENU_FPSLABELS", "cg_drawFPSLabels", "@MENU_DESC_FPSLABELS", when(0)) PC_OPTIONS_SEPERATOR(5) PC_OPTIONS_DVARYESNO_RAW(6, "@MENU_STREAMFRIENDLY_UI", "ui_streamFriendly", ;, "@MPUI_DESC_STREAM_FRIENDLY_UI", when(0), 1) - PC_OPTIONS_FLOATLIST_RAW(7, "@MENU_FRIENDNOTIFY", "cl_notifyFriendState", {"Always" -1 "Never" 0 "in Menu" 1}, ;, "@MPUI_DESC_FRIENDNOTIFY", when(dvarBool("ui_streamFriendly")), 1) + PC_OPTIONS_DVARYESNO(7, "@MENU_FRIENDNOTIFY", "cl_notifyFriendState", "@MPUI_DESC_FRIENDNOTIFY", when(dvarBool("ui_streamFriendly"))) } } From 66bfdf1b06acc01eb47afa65deed0202a8ecfdaf Mon Sep 17 00:00:00 2001 From: Edo Date: Sun, 24 Dec 2023 12:04:02 +0100 Subject: [PATCH 6/9] Update pc_options_multi.menu --- iw4x/iw4x_00/ui_mp/pc_options_multi.menu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iw4x/iw4x_00/ui_mp/pc_options_multi.menu b/iw4x/iw4x_00/ui_mp/pc_options_multi.menu index 627c8d2..8925c15 100644 --- a/iw4x/iw4x_00/ui_mp/pc_options_multi.menu +++ b/iw4x/iw4x_00/ui_mp/pc_options_multi.menu @@ -90,7 +90,7 @@ PC_OPTIONS_SEPERATOR(2) PC_OPTIONS_DVARYESNO(3, "@MENU_LAGOMETER", "drawLagometer", ;, when(0)) - PC_OPTIONS_STRLIST_RAW(4, "@MENU_DRAWFPS", "cg_drawFPS", {"Off"; "Off"; "Simple"; "Simple"; "SimpleRanges"; "SimpleRanges"; "Verbose"; "Verbose"; "Verbose+Viewpos"; "Verbose+Viewpos"}, ;, "@MENU_DRAWFPS_DESC", when(0), 1) + PC_OPTIONS_STRLIST_RAW(4, "@MENU_DRAWFPS", "cg_drawFPS", {"Off"; "Off"; "Simple"; "Simple"; "SimpleRanges"; "SimpleRanges"; "Verbose"; "Verbose"; "Verbose+Viewpos"; "Verbose+Viewpos"}, ;, "@MENU_DESC_DRAWFPS", when(0), 1) PC_OPTIONS_DVARYESNO(5, "@MENU_FPSLABELS", "cg_drawFPSLabels", "@MENU_DESC_FPSLABELS", when(0)) PC_OPTIONS_SEPERATOR(5) From bb8ba5bea75af9c17a773d442ec2111db02b8f7c Mon Sep 17 00:00:00 2001 From: Edo Date: Sun, 24 Dec 2023 12:09:37 +0100 Subject: [PATCH 7/9] Update pc_options_multi.menu --- iw4x/iw4x_00/ui_mp/pc_options_multi.menu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iw4x/iw4x_00/ui_mp/pc_options_multi.menu b/iw4x/iw4x_00/ui_mp/pc_options_multi.menu index 8925c15..71ea6ca 100644 --- a/iw4x/iw4x_00/ui_mp/pc_options_multi.menu +++ b/iw4x/iw4x_00/ui_mp/pc_options_multi.menu @@ -96,6 +96,6 @@ PC_OPTIONS_SEPERATOR(5) PC_OPTIONS_DVARYESNO_RAW(6, "@MENU_STREAMFRIENDLY_UI", "ui_streamFriendly", ;, "@MPUI_DESC_STREAM_FRIENDLY_UI", when(0), 1) - PC_OPTIONS_DVARYESNO(7, "@MENU_FRIENDNOTIFY", "cl_notifyFriendState", "@MPUI_DESC_FRIENDNOTIFY", when(dvarBool("ui_streamFriendly"))) + PC_OPTIONS_DVARYESNO(7, "@MENU_FRIENDNOTIFY", "cl_notifyFriendState", "@MPUI_DESC_FRIENDNOTIFY", when(0)) } } From 7dcca93eedebc1e282e056da9dcd12a0d58c18ee Mon Sep 17 00:00:00 2001 From: Edo Date: Sun, 24 Dec 2023 12:17:09 +0100 Subject: [PATCH 8/9] Update popup_cac_primary_camo.menu --- iw4x/iw4x_00/ui_mp/popup_cac_primary_camo.menu | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/iw4x/iw4x_00/ui_mp/popup_cac_primary_camo.menu b/iw4x/iw4x_00/ui_mp/popup_cac_primary_camo.menu index fd738a7..9860e7f 100644 --- a/iw4x/iw4x_00/ui_mp/popup_cac_primary_camo.menu +++ b/iw4x/iw4x_00/ui_mp/popup_cac_primary_camo.menu @@ -15,7 +15,7 @@ allowedBinding "+talk" visible when ( localvarint( "ui_tabDepth" ) == localvarint( "ui_popup_cac_primary_camo_tabDepth" ) ) exp rect y ( localvarfloat( "ui_popupYPos" ) + localvarint( "ui_tabDepth" ) * 20 ) - execKey 168 + execKeyInt 168 { if ( localvarstring( "ui_selected_ref" ) != "none" && !isitemunlocked( getplayerdata( "customClasses" , localvarint( "classIndex" ) , "weaponSetups" , 0 , "weapon" ) + " " + localvarstring( "ui_selected_ref" ) ) ) { @@ -2220,4 +2220,4 @@ visible when ( !isitemunlocked( getplayerdata( "customClasses" , localvarint( "classIndex" ) , "weaponSetups" , 0 , "weapon" ) + " " + localvarstring( "ui_selected_ref" ) ) ) } } -} \ No newline at end of file +} From 5c7ba128cc8d6c0a0365b5d68e9dbc3e2a7df553 Mon Sep 17 00:00:00 2001 From: Edo Date: Sun, 24 Dec 2023 23:37:25 +0100 Subject: [PATCH 9/9] remove double entry --- iw4x/iw4x_00/localizedstrings/iw4x_english.str | 3 --- 1 file changed, 3 deletions(-) diff --git a/iw4x/iw4x_00/localizedstrings/iw4x_english.str b/iw4x/iw4x_00/localizedstrings/iw4x_english.str index 924e4d3..690f384 100644 --- a/iw4x/iw4x_00/localizedstrings/iw4x_english.str +++ b/iw4x/iw4x_00/localizedstrings/iw4x_english.str @@ -620,9 +620,6 @@ LANG_ENGLISH "CHANGELOG" REFERENCE MPUI_DESC_CHANGELOG LANG_ENGLISH "See what's new." -REFERENCE MPUI_DESC_CHANGELOG -LANG_ENGLISH "See what's new." - REFERENCE MPUI_DESC_NOBORDER LANG_ENGLISH "Do not use a border in windowed mode."