From fb8f68946003ad583ee94c1ba39198cd8bc03534 Mon Sep 17 00:00:00 2001 From: def Date: Wed, 3 Mar 2021 10:11:48 +0100 Subject: [PATCH 1/2] Remove deepfly binds (fixes #3667) Anyone have a better idea? --- data/languages/arabic.txt | 6 ------ data/languages/belarusian.txt | 6 ------ data/languages/bosnian.txt | 6 ------ data/languages/brazilian_portuguese.txt | 6 ------ data/languages/bulgarian.txt | 6 ------ data/languages/catalan.txt | 6 ------ data/languages/czech.txt | 6 ------ data/languages/danish.txt | 6 ------ data/languages/dutch.txt | 6 ------ data/languages/finnish.txt | 6 ------ data/languages/french.txt | 6 ------ data/languages/german.txt | 6 ------ data/languages/hungarian.txt | 6 ------ data/languages/italian.txt | 6 ------ data/languages/japanese.txt | 6 ------ data/languages/korean.txt | 6 ------ data/languages/kyrgyz.txt | 6 ------ data/languages/norwegian.txt | 6 ------ data/languages/persian.txt | 6 ------ data/languages/polish.txt | 6 ------ data/languages/portuguese.txt | 6 ------ data/languages/romanian.txt | 6 ------ data/languages/russian.txt | 6 ------ data/languages/serbian.txt | 6 ------ data/languages/serbian_cyrillic.txt | 6 ------ data/languages/simplified_chinese.txt | 6 ------ data/languages/slovak.txt | 6 ------ data/languages/spanish.txt | 6 ------ data/languages/swedish.txt | 6 ------ data/languages/traditional_chinese.txt | 6 ------ data/languages/turkish.txt | 6 ------ data/languages/ukrainian.txt | 6 ------ src/game/client/components/binds.cpp | 2 -- src/game/client/components/menus_settings.cpp | 10 ++++------ 34 files changed, 4 insertions(+), 200 deletions(-) diff --git a/data/languages/arabic.txt b/data/languages/arabic.txt index adcf35809..b06e1a031 100644 --- a/data/languages/arabic.txt +++ b/data/languages/arabic.txt @@ -1240,12 +1240,6 @@ The width of texture %s is not divisible by %d, or the height is not divisible b 45° aim == -Deepfly on -== - -Deepfly off -== - Dummy == diff --git a/data/languages/belarusian.txt b/data/languages/belarusian.txt index 829ffe371..e83b47e71 100644 --- a/data/languages/belarusian.txt +++ b/data/languages/belarusian.txt @@ -946,12 +946,6 @@ Show HUD 45° aim == -Deepfly on -== - -Deepfly off -== - UI mouse s. == diff --git a/data/languages/bosnian.txt b/data/languages/bosnian.txt index cb38ae5db..ea2911b7c 100644 --- a/data/languages/bosnian.txt +++ b/data/languages/bosnian.txt @@ -1162,12 +1162,6 @@ Skins directory 45° aim == -Deepfly on -== - -Deepfly off -== - Dummy == diff --git a/data/languages/brazilian_portuguese.txt b/data/languages/brazilian_portuguese.txt index 34fd21190..06d816cdd 100644 --- a/data/languages/brazilian_portuguese.txt +++ b/data/languages/brazilian_portuguese.txt @@ -1265,12 +1265,6 @@ The width of texture %s is not divisible by %d, or the height is not divisible b 45° aim == Mirar em 45º -Deepfly on -== Ativar deepfly - -Deepfly off -== Desativar deepfly - Dummy == Dummy diff --git a/data/languages/bulgarian.txt b/data/languages/bulgarian.txt index af6bf42fc..23b4d5974 100644 --- a/data/languages/bulgarian.txt +++ b/data/languages/bulgarian.txt @@ -946,12 +946,6 @@ Show HUD 45° aim == -Deepfly on -== - -Deepfly off -== - UI mouse s. == diff --git a/data/languages/catalan.txt b/data/languages/catalan.txt index 128a51420..aa8d6fb92 100644 --- a/data/languages/catalan.txt +++ b/data/languages/catalan.txt @@ -1185,12 +1185,6 @@ Skins directory 45° aim == -Deepfly on -== - -Deepfly off -== - Dummy == diff --git a/data/languages/czech.txt b/data/languages/czech.txt index 45bf7e4a0..1021d17e2 100644 --- a/data/languages/czech.txt +++ b/data/languages/czech.txt @@ -1253,12 +1253,6 @@ The width of texture %s is not divisible by %d, or the height is not divisible b 45° aim == -Deepfly on -== - -Deepfly off -== - Dummy == diff --git a/data/languages/danish.txt b/data/languages/danish.txt index bc5819d60..bd79f00fb 100644 --- a/data/languages/danish.txt +++ b/data/languages/danish.txt @@ -1251,12 +1251,6 @@ The width of texture %s is not divisible by %d, or the height is not divisible b 45° aim == -Deepfly on -== - -Deepfly off -== - Dummy == diff --git a/data/languages/dutch.txt b/data/languages/dutch.txt index 31c6c2564..eea06961b 100644 --- a/data/languages/dutch.txt +++ b/data/languages/dutch.txt @@ -1197,12 +1197,6 @@ Skins directory 45° aim == -Deepfly on -== - -Deepfly off -== - Dummy == diff --git a/data/languages/finnish.txt b/data/languages/finnish.txt index 9011e356c..2a990ee71 100644 --- a/data/languages/finnish.txt +++ b/data/languages/finnish.txt @@ -947,12 +947,6 @@ Show HUD 45° aim == -Deepfly on -== - -Deepfly off -== - UI mouse s. == diff --git a/data/languages/french.txt b/data/languages/french.txt index b628ea930..61ac68f3f 100644 --- a/data/languages/french.txt +++ b/data/languages/french.txt @@ -1276,12 +1276,6 @@ The width of texture %s is not divisible by %d, or the height is not divisible b 45° aim == -Deepfly on -== - -Deepfly off -== - Dummy == diff --git a/data/languages/german.txt b/data/languages/german.txt index 2b64ebe84..99529008a 100644 --- a/data/languages/german.txt +++ b/data/languages/german.txt @@ -1265,12 +1265,6 @@ The width of texture %s is not divisible by %d, or the height is not divisible b 45° aim == 45°-Zielen -Deepfly on -== Deepfly an - -Deepfly off -== Deepfly aus - Dummy == Dummy diff --git a/data/languages/hungarian.txt b/data/languages/hungarian.txt index 05855137b..450adc863 100644 --- a/data/languages/hungarian.txt +++ b/data/languages/hungarian.txt @@ -1249,12 +1249,6 @@ The width of texture %s is not divisible by %d, or the height is not divisible b 45° aim == -Deepfly on -== - -Deepfly off -== - Dummy == diff --git a/data/languages/italian.txt b/data/languages/italian.txt index 30695cba0..d1525bfa9 100644 --- a/data/languages/italian.txt +++ b/data/languages/italian.txt @@ -1281,12 +1281,6 @@ Converse 45° aim == -Deepfly on -== - -Deepfly off -== - Dummy == diff --git a/data/languages/japanese.txt b/data/languages/japanese.txt index d60ebb1ee..9b551bc3b 100644 --- a/data/languages/japanese.txt +++ b/data/languages/japanese.txt @@ -946,12 +946,6 @@ Show HUD 45° aim == -Deepfly on -== - -Deepfly off -== - UI mouse s. == diff --git a/data/languages/korean.txt b/data/languages/korean.txt index e2b8ee96f..07f22d31a 100644 --- a/data/languages/korean.txt +++ b/data/languages/korean.txt @@ -945,12 +945,6 @@ Show HUD 45° aim == -Deepfly on -== - -Deepfly off -== - UI mouse s. == diff --git a/data/languages/kyrgyz.txt b/data/languages/kyrgyz.txt index 269c28ce1..0b5c19d9e 100644 --- a/data/languages/kyrgyz.txt +++ b/data/languages/kyrgyz.txt @@ -937,12 +937,6 @@ Show HUD 45° aim == -Deepfly on -== - -Deepfly off -== - UI mouse s. == diff --git a/data/languages/norwegian.txt b/data/languages/norwegian.txt index 7fdfff219..7ab777156 100644 --- a/data/languages/norwegian.txt +++ b/data/languages/norwegian.txt @@ -1252,12 +1252,6 @@ The width of texture %s is not divisible by %d, or the height is not divisible b 45° aim == -Deepfly on -== - -Deepfly off -== - Dummy == diff --git a/data/languages/persian.txt b/data/languages/persian.txt index 6b379e0dd..062495ee1 100644 --- a/data/languages/persian.txt +++ b/data/languages/persian.txt @@ -766,12 +766,6 @@ Show HUD 45° aim == -Deepfly on -== - -Deepfly off -== - UI mouse s. == diff --git a/data/languages/polish.txt b/data/languages/polish.txt index 223c4a4f4..5dcf6e442 100644 --- a/data/languages/polish.txt +++ b/data/languages/polish.txt @@ -1253,12 +1253,6 @@ The width of texture %s is not divisible by %d, or the height is not divisible b 45° aim == -Deepfly on -== - -Deepfly off -== - Dummy == diff --git a/data/languages/portuguese.txt b/data/languages/portuguese.txt index 9d1b0750d..7e2130f24 100644 --- a/data/languages/portuguese.txt +++ b/data/languages/portuguese.txt @@ -1079,12 +1079,6 @@ Show HUD 45° aim == -Deepfly on -== - -Deepfly off -== - UI mouse s. == diff --git a/data/languages/romanian.txt b/data/languages/romanian.txt index 12ffd41b2..c5e170faa 100644 --- a/data/languages/romanian.txt +++ b/data/languages/romanian.txt @@ -952,12 +952,6 @@ Show HUD 45° aim == -Deepfly on -== - -Deepfly off -== - UI mouse s. == diff --git a/data/languages/russian.txt b/data/languages/russian.txt index b9c05bd4a..b4bedd08f 100644 --- a/data/languages/russian.txt +++ b/data/languages/russian.txt @@ -1256,12 +1256,6 @@ The width of texture %s is not divisible by %d, or the height is not divisible b 45° aim == Прицел 45° -Deepfly on -== Вкл. Deepfly - -Deepfly off -== Выкл. Deepfly - Dummy == Дамми diff --git a/data/languages/serbian.txt b/data/languages/serbian.txt index aecc3377f..7683a1153 100644 --- a/data/languages/serbian.txt +++ b/data/languages/serbian.txt @@ -950,12 +950,6 @@ Show HUD 45° aim == -Deepfly on -== - -Deepfly off -== - UI mouse s. == diff --git a/data/languages/serbian_cyrillic.txt b/data/languages/serbian_cyrillic.txt index ee1a85e82..8f2944c5b 100644 --- a/data/languages/serbian_cyrillic.txt +++ b/data/languages/serbian_cyrillic.txt @@ -1235,12 +1235,6 @@ Smooth Dynamic Camera 45° aim == -Deepfly on -== - -Deepfly off -== - Dummy == diff --git a/data/languages/simplified_chinese.txt b/data/languages/simplified_chinese.txt index 2725f6c37..e86f5cfd2 100644 --- a/data/languages/simplified_chinese.txt +++ b/data/languages/simplified_chinese.txt @@ -1268,12 +1268,6 @@ The width of texture %s is not divisible by %d, or the height is not divisible b 45° aim == -Deepfly on -== - -Deepfly off -== - Dummy == diff --git a/data/languages/slovak.txt b/data/languages/slovak.txt index d136b39b0..bfc493402 100644 --- a/data/languages/slovak.txt +++ b/data/languages/slovak.txt @@ -946,12 +946,6 @@ Show HUD 45° aim == -Deepfly on -== - -Deepfly off -== - UI mouse s. == diff --git a/data/languages/spanish.txt b/data/languages/spanish.txt index bf52b8fe3..418c64f9d 100644 --- a/data/languages/spanish.txt +++ b/data/languages/spanish.txt @@ -1257,12 +1257,6 @@ The width of texture %s is not divisible by %d, or the height is not divisible b 45° aim == -Deepfly on -== - -Deepfly off -== - Dummy == diff --git a/data/languages/swedish.txt b/data/languages/swedish.txt index 809c9b6b1..728712cda 100644 --- a/data/languages/swedish.txt +++ b/data/languages/swedish.txt @@ -1223,12 +1223,6 @@ Skins directory 45° aim == -Deepfly on -== - -Deepfly off -== - Dummy == diff --git a/data/languages/traditional_chinese.txt b/data/languages/traditional_chinese.txt index d28948d2a..1202d052f 100644 --- a/data/languages/traditional_chinese.txt +++ b/data/languages/traditional_chinese.txt @@ -1256,12 +1256,6 @@ The width of texture %s is not divisible by %d, or the height is not divisible b 45° aim == -Deepfly on -== - -Deepfly off -== - Dummy == diff --git a/data/languages/turkish.txt b/data/languages/turkish.txt index 6e146bdbf..d3cfd679a 100644 --- a/data/languages/turkish.txt +++ b/data/languages/turkish.txt @@ -1200,12 +1200,6 @@ Skins directory 45° aim == -Deepfly on -== - -Deepfly off -== - Dummy == diff --git a/data/languages/ukrainian.txt b/data/languages/ukrainian.txt index 2de67ec3a..3be94500e 100644 --- a/data/languages/ukrainian.txt +++ b/data/languages/ukrainian.txt @@ -1195,12 +1195,6 @@ Skins directory 45° aim == -Deepfly on -== - -Deepfly off -== - Dummy == diff --git a/src/game/client/components/binds.cpp b/src/game/client/components/binds.cpp index e1ded9e76..3e3cedb5b 100644 --- a/src/game/client/components/binds.cpp +++ b/src/game/client/components/binds.cpp @@ -469,8 +469,6 @@ void CBinds::SetDDRaceBinds(bool FreeOnly) Bind(KEY_S, "+showhookcoll", FreeOnly); Bind(KEY_X, "toggle cl_dummy 0 1", FreeOnly); Bind(KEY_H, "toggle cl_dummy_hammer 0 1", FreeOnly); - Bind(KEY_UP, "bind mouse1 \"+fire; +toggle cl_dummy_hammer 1 0\"", FreeOnly); - Bind(KEY_DOWN, "bind mouse1 \"+fire\"", FreeOnly); Bind(KEY_SLASH, "+show_chat; chat all /", FreeOnly); Bind(KEY_PAGEDOWN, "toggle cl_show_quads 0 1", FreeOnly); Bind(KEY_PAGEUP, "toggle cl_overlay_entities 0 100", FreeOnly); diff --git a/src/game/client/components/menus_settings.cpp b/src/game/client/components/menus_settings.cpp index 1679949cd..2f73dd75e 100644 --- a/src/game/client/components/menus_settings.cpp +++ b/src/game/client/components/menus_settings.cpp @@ -791,8 +791,6 @@ static CKeyInfo gs_aKeys[] = {"Toggle dummy", "toggle cl_dummy 0 1", 0, 0}, {"Dummy copy", "toggle cl_dummy_copy_moves 0 1", 0, 0}, {"Hammerfly dummy", "toggle cl_dummy_hammer 0 1", 0, 0}, - {"Deepfly on", "bind mouse1 \"+fire; +toggle cl_dummy_hammer 1 0\"", 0, 0}, - {"Deepfly off", "bind mouse1 \"+fire\"", 0, 0}, {"Emoticon", "+emote", 0, 0}, {"Spectator mode", "+spectate", 0, 0}, @@ -819,7 +817,7 @@ static CKeyInfo gs_aKeys[] = Localize("Spectator mode");Localize("Spectate next");Localize("Spectate previous");Localize("Console"); Localize("Remote console");Localize("Screenshot");Localize("Scoreboard");Localize("Statboard"); Localize("Lock team");Localize("Show entities");Localize("Show HUD");Localize("45° aim"); - Localize("Chat command";Localize("Deepfly on");Localize("Deepfly off"); + Localize("Chat command"; */ void CMenus::UiDoGetButtons(int Start, int Stop, CUIRect View, CUIRect ScopeView) @@ -985,14 +983,14 @@ void CMenus::RenderSettingsControls(CUIRect MainView) // dummy settings { DummySettings.HSplitTop(10.0f, 0, &DummySettings); - DummySettings.HSplitTop(145.0f, &DummySettings, &MiscSettings); + DummySettings.HSplitTop(100.0f, &DummySettings, &MiscSettings); RenderTools()->DrawUIRect(&DummySettings, ColorRGBA(1, 1, 1, 0.25f), CUI::CORNER_ALL, 10.0f); DummySettings.VMargin(10.0f, &DummySettings); TextRender()->Text(0, DummySettings.x, DummySettings.y + (14.0f + 5.0f + 10.0f - 14.0f * UI()->Scale()) / 2.f, 14.0f * UI()->Scale(), Localize("Dummy"), -1.0f); DummySettings.HSplitTop(14.0f + 5.0f + 10.0f, 0, &DummySettings); - UiDoGetButtons(30, 35, DummySettings, MainView); + UiDoGetButtons(30, 33, DummySettings, MainView); } // misc settings @@ -1005,7 +1003,7 @@ void CMenus::RenderSettingsControls(CUIRect MainView) TextRender()->Text(0, MiscSettings.x, MiscSettings.y + (14.0f + 5.0f + 10.0f - 14.0f * UI()->Scale()) / 2.f, 14.0f * UI()->Scale(), Localize("Miscellaneous"), -1.0f); MiscSettings.HSplitTop(14.0f + 5.0f + 10.0f, 0, &MiscSettings); - UiDoGetButtons(35, 47, MiscSettings, MainView); + UiDoGetButtons(33, 45, MiscSettings, MainView); } UiDoListboxEnd(&s_ScrollValue, 0); From 9ea88f1197847b71d26f4799a94a4affa5f35c44 Mon Sep 17 00:00:00 2001 From: def Date: Wed, 3 Mar 2021 15:21:02 +0100 Subject: [PATCH 2/2] =?UTF-8?q?Remove=2045=C2=B0=20aim=20too?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/languages/arabic.txt | 2 +- data/languages/belarusian.txt | 2 +- data/languages/bosnian.txt | 2 +- data/languages/brazilian_portuguese.txt | 6 +++--- data/languages/bulgarian.txt | 2 +- data/languages/catalan.txt | 2 +- data/languages/czech.txt | 2 +- data/languages/danish.txt | 2 +- data/languages/dutch.txt | 2 +- data/languages/finnish.txt | 2 +- data/languages/french.txt | 2 +- data/languages/german.txt | 6 +++--- data/languages/hungarian.txt | 2 +- data/languages/italian.txt | 2 +- data/languages/japanese.txt | 2 +- data/languages/korean.txt | 2 +- data/languages/kyrgyz.txt | 2 +- data/languages/norwegian.txt | 2 +- data/languages/persian.txt | 2 +- data/languages/polish.txt | 2 +- data/languages/portuguese.txt | 2 +- data/languages/romanian.txt | 2 +- data/languages/russian.txt | 6 +++--- data/languages/serbian.txt | 2 +- data/languages/serbian_cyrillic.txt | 2 +- data/languages/simplified_chinese.txt | 2 +- data/languages/slovak.txt | 2 +- data/languages/spanish.txt | 2 +- data/languages/swedish.txt | 2 +- data/languages/traditional_chinese.txt | 2 +- data/languages/turkish.txt | 2 +- data/languages/ukrainian.txt | 2 +- src/game/client/components/menus_settings.cpp | 18 ++++++++---------- 33 files changed, 46 insertions(+), 48 deletions(-) diff --git a/data/languages/arabic.txt b/data/languages/arabic.txt index b06e1a031..6d942262b 100644 --- a/data/languages/arabic.txt +++ b/data/languages/arabic.txt @@ -1237,7 +1237,7 @@ Smooth Dynamic Camera The width of texture %s is not divisible by %d, or the height is not divisible by %d, which might cause visual bugs. == -45° aim +Chat command == Dummy diff --git a/data/languages/belarusian.txt b/data/languages/belarusian.txt index e83b47e71..c193b107f 100644 --- a/data/languages/belarusian.txt +++ b/data/languages/belarusian.txt @@ -943,7 +943,7 @@ Show entities Show HUD == -45° aim +Chat command == UI mouse s. diff --git a/data/languages/bosnian.txt b/data/languages/bosnian.txt index ea2911b7c..37b336e84 100644 --- a/data/languages/bosnian.txt +++ b/data/languages/bosnian.txt @@ -1159,7 +1159,7 @@ Skin Database Skins directory == -45° aim +Chat command == Dummy diff --git a/data/languages/brazilian_portuguese.txt b/data/languages/brazilian_portuguese.txt index 06d816cdd..a42bf77f2 100644 --- a/data/languages/brazilian_portuguese.txt +++ b/data/languages/brazilian_portuguese.txt @@ -1262,9 +1262,6 @@ Use old chat style The width of texture %s is not divisible by %d, or the height is not divisible by %d, which might cause visual bugs. == A largura da textura %s não é divisível por %d ou a altura não é divisível por %d, o que pode causar erros visuais. -45° aim -== Mirar em 45º - Dummy == Dummy @@ -1289,6 +1286,9 @@ Entities Background color Regular Background Color == Cor de fundo comum +Chat command +== + Discord == diff --git a/data/languages/bulgarian.txt b/data/languages/bulgarian.txt index 23b4d5974..6107bbb0e 100644 --- a/data/languages/bulgarian.txt +++ b/data/languages/bulgarian.txt @@ -943,7 +943,7 @@ Show entities Show HUD == -45° aim +Chat command == UI mouse s. diff --git a/data/languages/catalan.txt b/data/languages/catalan.txt index aa8d6fb92..c91dc8410 100644 --- a/data/languages/catalan.txt +++ b/data/languages/catalan.txt @@ -1182,7 +1182,7 @@ Skin Database Skins directory == -45° aim +Chat command == Dummy diff --git a/data/languages/czech.txt b/data/languages/czech.txt index 1021d17e2..124d7999e 100644 --- a/data/languages/czech.txt +++ b/data/languages/czech.txt @@ -1250,7 +1250,7 @@ Update failed! Check log... The width of texture %s is not divisible by %d, or the height is not divisible by %d, which might cause visual bugs. == -45° aim +Chat command == Dummy diff --git a/data/languages/danish.txt b/data/languages/danish.txt index bd79f00fb..9520d7c38 100644 --- a/data/languages/danish.txt +++ b/data/languages/danish.txt @@ -1248,7 +1248,7 @@ Grabs The width of texture %s is not divisible by %d, or the height is not divisible by %d, which might cause visual bugs. == -45° aim +Chat command == Dummy diff --git a/data/languages/dutch.txt b/data/languages/dutch.txt index eea06961b..f3da6fc64 100644 --- a/data/languages/dutch.txt +++ b/data/languages/dutch.txt @@ -1194,7 +1194,7 @@ Skin Database Skins directory == -45° aim +Chat command == Dummy diff --git a/data/languages/finnish.txt b/data/languages/finnish.txt index 2a990ee71..584be6b66 100644 --- a/data/languages/finnish.txt +++ b/data/languages/finnish.txt @@ -944,7 +944,7 @@ Show entities Show HUD == -45° aim +Chat command == UI mouse s. diff --git a/data/languages/french.txt b/data/languages/french.txt index 61ac68f3f..8e9dfbc8d 100644 --- a/data/languages/french.txt +++ b/data/languages/french.txt @@ -1273,7 +1273,7 @@ Replay The width of texture %s is not divisible by %d, or the height is not divisible by %d, which might cause visual bugs. == -45° aim +Chat command == Dummy diff --git a/data/languages/german.txt b/data/languages/german.txt index 99529008a..ff1b5e30b 100644 --- a/data/languages/german.txt +++ b/data/languages/german.txt @@ -1262,9 +1262,6 @@ Smooth Dynamic Camera The width of texture %s is not divisible by %d, or the height is not divisible by %d, which might cause visual bugs. == Die Breite von Textur %s ist nicht durch %d teilbar, oder die Höhe nicht durch %d teilbar, was Visuelle Fehler verursachen könnte. -45° aim -== 45°-Zielen - Dummy == Dummy @@ -1289,6 +1286,9 @@ Entities Background color Regular Background Color == Normale Hintergrundfarbe +Chat command +== + Discord == diff --git a/data/languages/hungarian.txt b/data/languages/hungarian.txt index 450adc863..66e12a72c 100644 --- a/data/languages/hungarian.txt +++ b/data/languages/hungarian.txt @@ -1246,7 +1246,7 @@ Replay The width of texture %s is not divisible by %d, or the height is not divisible by %d, which might cause visual bugs. == -45° aim +Chat command == Dummy diff --git a/data/languages/italian.txt b/data/languages/italian.txt index d1525bfa9..8e6f98b39 100644 --- a/data/languages/italian.txt +++ b/data/languages/italian.txt @@ -1278,7 +1278,7 @@ Markers: Converse == -45° aim +Chat command == Dummy diff --git a/data/languages/japanese.txt b/data/languages/japanese.txt index 9b551bc3b..6860d727e 100644 --- a/data/languages/japanese.txt +++ b/data/languages/japanese.txt @@ -943,7 +943,7 @@ Show entities Show HUD == -45° aim +Chat command == UI mouse s. diff --git a/data/languages/korean.txt b/data/languages/korean.txt index 07f22d31a..b980ebd47 100644 --- a/data/languages/korean.txt +++ b/data/languages/korean.txt @@ -942,7 +942,7 @@ Show entities Show HUD == -45° aim +Chat command == UI mouse s. diff --git a/data/languages/kyrgyz.txt b/data/languages/kyrgyz.txt index 0b5c19d9e..e6a2ad51b 100644 --- a/data/languages/kyrgyz.txt +++ b/data/languages/kyrgyz.txt @@ -934,7 +934,7 @@ Show entities Show HUD == -45° aim +Chat command == UI mouse s. diff --git a/data/languages/norwegian.txt b/data/languages/norwegian.txt index 7ab777156..02bf193cd 100644 --- a/data/languages/norwegian.txt +++ b/data/languages/norwegian.txt @@ -1249,7 +1249,7 @@ Play The width of texture %s is not divisible by %d, or the height is not divisible by %d, which might cause visual bugs. == -45° aim +Chat command == Dummy diff --git a/data/languages/persian.txt b/data/languages/persian.txt index 062495ee1..d4d1926c0 100644 --- a/data/languages/persian.txt +++ b/data/languages/persian.txt @@ -763,7 +763,7 @@ Show entities Show HUD == -45° aim +Chat command == UI mouse s. diff --git a/data/languages/polish.txt b/data/languages/polish.txt index 5dcf6e442..cd01b2def 100644 --- a/data/languages/polish.txt +++ b/data/languages/polish.txt @@ -1250,7 +1250,7 @@ Play The width of texture %s is not divisible by %d, or the height is not divisible by %d, which might cause visual bugs. == -45° aim +Chat command == Dummy diff --git a/data/languages/portuguese.txt b/data/languages/portuguese.txt index 7e2130f24..e8411186d 100644 --- a/data/languages/portuguese.txt +++ b/data/languages/portuguese.txt @@ -1076,7 +1076,7 @@ Show entities Show HUD == -45° aim +Chat command == UI mouse s. diff --git a/data/languages/romanian.txt b/data/languages/romanian.txt index c5e170faa..3b80a3d4c 100644 --- a/data/languages/romanian.txt +++ b/data/languages/romanian.txt @@ -949,7 +949,7 @@ Show entities Show HUD == -45° aim +Chat command == UI mouse s. diff --git a/data/languages/russian.txt b/data/languages/russian.txt index b4bedd08f..60a5924f3 100644 --- a/data/languages/russian.txt +++ b/data/languages/russian.txt @@ -1253,9 +1253,6 @@ Entities The width of texture %s is not divisible by %d, or the height is not divisible by %d, which might cause visual bugs. == Ширина текстуры %s не делится на %d или же его высота не делится на %d, что может повлиять на графику. -45° aim -== Прицел 45° - Dummy == Дамми @@ -1280,6 +1277,9 @@ Entities Background color Regular Background Color == Станд. фоновый цвет +Chat command +== + Discord == diff --git a/data/languages/serbian.txt b/data/languages/serbian.txt index 7683a1153..e30471699 100644 --- a/data/languages/serbian.txt +++ b/data/languages/serbian.txt @@ -947,7 +947,7 @@ Show entities Show HUD == -45° aim +Chat command == UI mouse s. diff --git a/data/languages/serbian_cyrillic.txt b/data/languages/serbian_cyrillic.txt index 8f2944c5b..2bd8b9baf 100644 --- a/data/languages/serbian_cyrillic.txt +++ b/data/languages/serbian_cyrillic.txt @@ -1232,7 +1232,7 @@ Checking for existing player with your name Smooth Dynamic Camera == -45° aim +Chat command == Dummy diff --git a/data/languages/simplified_chinese.txt b/data/languages/simplified_chinese.txt index e86f5cfd2..83bb7aa7a 100644 --- a/data/languages/simplified_chinese.txt +++ b/data/languages/simplified_chinese.txt @@ -1265,7 +1265,7 @@ Discord The width of texture %s is not divisible by %d, or the height is not divisible by %d, which might cause visual bugs. == -45° aim +Chat command == Dummy diff --git a/data/languages/slovak.txt b/data/languages/slovak.txt index bfc493402..33fd99d3f 100644 --- a/data/languages/slovak.txt +++ b/data/languages/slovak.txt @@ -943,7 +943,7 @@ Show entities Show HUD == -45° aim +Chat command == UI mouse s. diff --git a/data/languages/spanish.txt b/data/languages/spanish.txt index 418c64f9d..37c3c341b 100644 --- a/data/languages/spanish.txt +++ b/data/languages/spanish.txt @@ -1254,7 +1254,7 @@ Replay The width of texture %s is not divisible by %d, or the height is not divisible by %d, which might cause visual bugs. == -45° aim +Chat command == Dummy diff --git a/data/languages/swedish.txt b/data/languages/swedish.txt index 728712cda..df91b1e15 100644 --- a/data/languages/swedish.txt +++ b/data/languages/swedish.txt @@ -1220,7 +1220,7 @@ Skin Database Skins directory == -45° aim +Chat command == Dummy diff --git a/data/languages/traditional_chinese.txt b/data/languages/traditional_chinese.txt index 1202d052f..7722fb571 100644 --- a/data/languages/traditional_chinese.txt +++ b/data/languages/traditional_chinese.txt @@ -1253,7 +1253,7 @@ Assets directory The width of texture %s is not divisible by %d, or the height is not divisible by %d, which might cause visual bugs. == -45° aim +Chat command == Dummy diff --git a/data/languages/turkish.txt b/data/languages/turkish.txt index d3cfd679a..0ad72bec4 100644 --- a/data/languages/turkish.txt +++ b/data/languages/turkish.txt @@ -1197,7 +1197,7 @@ Skin Database Skins directory == -45° aim +Chat command == Dummy diff --git a/data/languages/ukrainian.txt b/data/languages/ukrainian.txt index 3be94500e..c1d732532 100644 --- a/data/languages/ukrainian.txt +++ b/data/languages/ukrainian.txt @@ -1192,7 +1192,7 @@ Skin Database Skins directory == -45° aim +Chat command == Dummy diff --git a/src/game/client/components/menus_settings.cpp b/src/game/client/components/menus_settings.cpp index 2f73dd75e..90b1a292f 100644 --- a/src/game/client/components/menus_settings.cpp +++ b/src/game/client/components/menus_settings.cpp @@ -760,7 +760,6 @@ static CKeyInfo gs_aKeys[] = {"Fire", "+fire", 0, 0}, {"Hook", "+hook", 0, 0}, {"Hook collisions", "+showhookcoll", 0, 0}, - {"45° aim", "+toggle cl_mouse_max_distance 2 400; +toggle inp_mousesens 1 200", 0, 0}, {"Pause", "say /pause", 0, 0}, {"Kill", "kill", 0, 0}, {"Zoom in", "zoom+", 0, 0}, @@ -816,8 +815,7 @@ static CKeyInfo gs_aKeys[] = Localize("Chat");Localize("Team chat");Localize("Converse");Localize("Show chat");Localize("Emoticon"); Localize("Spectator mode");Localize("Spectate next");Localize("Spectate previous");Localize("Console"); Localize("Remote console");Localize("Screenshot");Localize("Scoreboard");Localize("Statboard"); - Localize("Lock team");Localize("Show entities");Localize("Show HUD");Localize("45° aim"); - Localize("Chat command"; + Localize("Lock team");Localize("Show entities");Localize("Show HUD");Localize("Chat command"); */ void CMenus::UiDoGetButtons(int Start, int Stop, CUIRect View, CUIRect ScopeView) @@ -891,7 +889,7 @@ void CMenus::RenderSettingsControls(CUIRect MainView) // movement settings { MovementSettings.VMargin(5.0f, &MovementSettings); - MovementSettings.HSplitTop(510.0f, &MovementSettings, &WeaponSettings); + MovementSettings.HSplitTop(490.0f, &MovementSettings, &WeaponSettings); RenderTools()->DrawUIRect(&MovementSettings, ColorRGBA(1, 1, 1, 0.25f), CUI::CORNER_ALL, 10.0f); MovementSettings.VMargin(10.0f, &MovementSettings); @@ -925,7 +923,7 @@ void CMenus::RenderSettingsControls(CUIRect MainView) MovementSettings.HSplitTop(20.0f, 0, &MovementSettings); } - UiDoGetButtons(0, 18, MovementSettings, MainView); + UiDoGetButtons(0, 17, MovementSettings, MainView); } // weapon settings @@ -938,7 +936,7 @@ void CMenus::RenderSettingsControls(CUIRect MainView) TextRender()->Text(0, WeaponSettings.x, WeaponSettings.y + (14.0f + 5.0f + 10.0f - 14.0f * UI()->Scale()) / 2.f, 14.0f * UI()->Scale(), Localize("Weapon"), -1.0f); WeaponSettings.HSplitTop(14.0f + 5.0f + 10.0f, 0, &WeaponSettings); - UiDoGetButtons(18, 23, WeaponSettings, MainView); + UiDoGetButtons(17, 22, WeaponSettings, MainView); } // defaults @@ -964,7 +962,7 @@ void CMenus::RenderSettingsControls(CUIRect MainView) TextRender()->Text(0, VotingSettings.x, VotingSettings.y + (14.0f + 5.0f + 10.0f - 14.0f * UI()->Scale()) / 2.f, 14.0f * UI()->Scale(), Localize("Voting"), -1.0f); VotingSettings.HSplitTop(14.0f + 5.0f + 10.0f, 0, &VotingSettings); - UiDoGetButtons(23, 25, VotingSettings, MainView); + UiDoGetButtons(22, 24, VotingSettings, MainView); } // chat settings @@ -977,7 +975,7 @@ void CMenus::RenderSettingsControls(CUIRect MainView) TextRender()->Text(0, ChatSettings.x, ChatSettings.y + (14.0f + 5.0f + 10.0f - 14.0f * UI()->Scale()) / 2.f, 14.0f * UI()->Scale(), Localize("Chat"), -1.0f); ChatSettings.HSplitTop(14.0f + 5.0f + 10.0f, 0, &ChatSettings); - UiDoGetButtons(25, 30, ChatSettings, MainView); + UiDoGetButtons(24, 29, ChatSettings, MainView); } // dummy settings @@ -990,7 +988,7 @@ void CMenus::RenderSettingsControls(CUIRect MainView) TextRender()->Text(0, DummySettings.x, DummySettings.y + (14.0f + 5.0f + 10.0f - 14.0f * UI()->Scale()) / 2.f, 14.0f * UI()->Scale(), Localize("Dummy"), -1.0f); DummySettings.HSplitTop(14.0f + 5.0f + 10.0f, 0, &DummySettings); - UiDoGetButtons(30, 33, DummySettings, MainView); + UiDoGetButtons(29, 32, DummySettings, MainView); } // misc settings @@ -1003,7 +1001,7 @@ void CMenus::RenderSettingsControls(CUIRect MainView) TextRender()->Text(0, MiscSettings.x, MiscSettings.y + (14.0f + 5.0f + 10.0f - 14.0f * UI()->Scale()) / 2.f, 14.0f * UI()->Scale(), Localize("Miscellaneous"), -1.0f); MiscSettings.HSplitTop(14.0f + 5.0f + 10.0f, 0, &MiscSettings); - UiDoGetButtons(33, 45, MiscSettings, MainView); + UiDoGetButtons(32, 44, MiscSettings, MainView); } UiDoListboxEnd(&s_ScrollValue, 0);