edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 01:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove deepfly binds (fixes #3667)

Browse source 
Anyone have a better idea?
This commit is contained in:
def 2021-03-03 10:11:48 +01:00
parent 0ca7f8fd8f
commit fb8f689460
34 changed files with 4 additions and 200 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
data/languages/arabic.txt
View file

@ -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
==

6
data/languages/belarusian.txt
View file

@ -946,12 +946,6 @@ Show HUD
45° aim
==
Deepfly on
==
Deepfly off
==
UI mouse s.
==

6
data/languages/bosnian.txt
View file

@ -1162,12 +1162,6 @@ Skins directory
45° aim
==
Deepfly on
==
Deepfly off
==
Dummy
==

6
data/languages/brazilian_portuguese.txt
View file

@ -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

6
data/languages/bulgarian.txt
View file

@ -946,12 +946,6 @@ Show HUD
45° aim
==
Deepfly on
==
Deepfly off
==
UI mouse s.
==

6
data/languages/catalan.txt
View file

@ -1185,12 +1185,6 @@ Skins directory
45° aim
==
Deepfly on
==
Deepfly off
==
Dummy
==

6
data/languages/czech.txt
View file

@ -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
==

6
data/languages/danish.txt
View file

@ -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
==

6
data/languages/dutch.txt
View file

@ -1197,12 +1197,6 @@ Skins directory
45° aim
==
Deepfly on
==
Deepfly off
==
Dummy
==

6
data/languages/finnish.txt
View file

@ -947,12 +947,6 @@ Show HUD
45° aim
==
Deepfly on
==
Deepfly off
==
UI mouse s.
==

6
data/languages/french.txt
View file

@ -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
==

6
data/languages/german.txt
View file

@ -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

6
data/languages/hungarian.txt
View file

@ -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
==

6
data/languages/italian.txt
View file

@ -1281,12 +1281,6 @@ Converse
45° aim
==
Deepfly on
==
Deepfly off
==
Dummy
==

6
data/languages/japanese.txt
View file

@ -946,12 +946,6 @@ Show HUD
45° aim
==
Deepfly on
==
Deepfly off
==
UI mouse s.
==

6
data/languages/korean.txt
View file

@ -945,12 +945,6 @@ Show HUD
45° aim
==
Deepfly on
==
Deepfly off
==
UI mouse s.
==

6
data/languages/kyrgyz.txt
View file

@ -937,12 +937,6 @@ Show HUD
45° aim
==
Deepfly on
==
Deepfly off
==
UI mouse s.
==

6
data/languages/norwegian.txt
View file

@ -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
==

6
data/languages/persian.txt
View file

@ -766,12 +766,6 @@ Show HUD
45° aim
==
Deepfly on
==
Deepfly off
==
UI mouse s.
==

6
data/languages/polish.txt
View file

@ -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
==

6
data/languages/portuguese.txt
View file

@ -1079,12 +1079,6 @@ Show HUD
45° aim
==
Deepfly on
==
Deepfly off
==
UI mouse s.
==

6
data/languages/romanian.txt
View file

@ -952,12 +952,6 @@ Show HUD
45° aim
==
Deepfly on
==
Deepfly off
==
UI mouse s.
==

6
data/languages/russian.txt
View file

@ -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
== Дамми

6
data/languages/serbian.txt
View file

@ -950,12 +950,6 @@ Show HUD
45° aim
==
Deepfly on
==
Deepfly off
==
UI mouse s.
==

6
data/languages/serbian_cyrillic.txt
View file

@ -1235,12 +1235,6 @@ Smooth Dynamic Camera
45° aim
==
Deepfly on
==
Deepfly off
==
Dummy
==

6
data/languages/simplified_chinese.txt
View file

@ -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
==

6
data/languages/slovak.txt
View file

@ -946,12 +946,6 @@ Show HUD
45° aim
==
Deepfly on
==
Deepfly off
==
UI mouse s.
==

6
data/languages/spanish.txt
View file

@ -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
==

6
data/languages/swedish.txt
View file

@ -1223,12 +1223,6 @@ Skins directory
45° aim
==
Deepfly on
==
Deepfly off
==
Dummy
==

6
data/languages/traditional_chinese.txt
View file

@ -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
==

6
data/languages/turkish.txt
View file

@ -1200,12 +1200,6 @@ Skins directory
45° aim
==
Deepfly on
==
Deepfly off
==
Dummy
==

6
data/languages/ukrainian.txt
View file

@ -1195,12 +1195,6 @@ Skins directory
45° aim
==
Deepfly on
==
Deepfly off
==
Dummy
==

2
src/game/client/components/binds.cpp
View file

@ -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);

10
src/game/client/components/menus_settings.cpp
View file

@ -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);