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

Merge #3668

Browse source 
3668: Remove deepfly binds (fixes #3667) r=heinrich5991 a=def-

Anyone have a better idea?

<!-- What is the motivation for the changes of this pull request -->

## Checklist

- [ ] Tested the change ingame
- [ ] Provided screenshots if it is a visual change
- [ ] Tested in combination with possibly related configuration options
- [ ] Written a unit test if it works standalone, system.c especially
- [ ] Considered possible null pointers and out of bounds array indexing
- [ ] Changed no physics that affect existing maps
- [ ] Tested the change with [ASan+UBSan or valgrind's memcheck](https://github.com/ddnet/ddnet/#using-addresssanitizer--undefinedbehavioursanitizer-or-valgrinds-memcheck) (optional)


Co-authored-by: def <dennis@felsin9.de>
This commit is contained in:
bors[bot] 2021-03-07 22:19:10 +00:00 committed by GitHub
parent 0ca7f8fd8f 9ea88f1197
commit 4925d43b0b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
34 changed files with 47 additions and 245 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
data/languages/arabic.txt
View file

@ -1237,13 +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
==
Deepfly on
==
Deepfly off
Chat command
==
Dummy

8
data/languages/belarusian.txt
View file

@ -943,13 +943,7 @@ Show entities
Show HUD
==
45° aim
==
Deepfly on
==
Deepfly off
Chat command
==
UI mouse s.

8
data/languages/bosnian.txt
View file

@ -1159,13 +1159,7 @@ Skin Database
Skins directory
==
45° aim
==
Deepfly on
==
Deepfly off
Chat command
==
Dummy

12
data/languages/brazilian_portuguese.txt
View file

@ -1262,15 +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º
Deepfly on
== Ativar deepfly
Deepfly off
== Desativar deepfly
Dummy
== Dummy
@ -1295,6 +1286,9 @@ Entities Background color
Regular Background Color
== Cor de fundo comum
Chat command
==
Discord
==

8
data/languages/bulgarian.txt
View file

@ -943,13 +943,7 @@ Show entities
Show HUD
==
45° aim
==
Deepfly on
==
Deepfly off
Chat command
==
UI mouse s.

8
data/languages/catalan.txt
View file

@ -1182,13 +1182,7 @@ Skin Database
Skins directory
==
45° aim
==
Deepfly on
==
Deepfly off
Chat command
==
Dummy

8
data/languages/czech.txt
View file

@ -1250,13 +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
==
Deepfly on
==
Deepfly off
Chat command
==
Dummy

8
data/languages/danish.txt
View file

@ -1248,13 +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
==
Deepfly on
==
Deepfly off
Chat command
==
Dummy

8
data/languages/dutch.txt
View file

@ -1194,13 +1194,7 @@ Skin Database
Skins directory
==
45° aim
==
Deepfly on
==
Deepfly off
Chat command
==
Dummy

8
data/languages/finnish.txt
View file

@ -944,13 +944,7 @@ Show entities
Show HUD
==
45° aim
==
Deepfly on
==
Deepfly off
Chat command
==
UI mouse s.

8
data/languages/french.txt
View file

@ -1273,13 +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
==
Deepfly on
==
Deepfly off
Chat command
==
Dummy

12
data/languages/german.txt
View file

@ -1262,15 +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
Deepfly on
== Deepfly an
Deepfly off
== Deepfly aus
Dummy
== Dummy
@ -1295,6 +1286,9 @@ Entities Background color
Regular Background Color
== Normale Hintergrundfarbe
Chat command
==
Discord
==

8
data/languages/hungarian.txt
View file

@ -1246,13 +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
==
Deepfly on
==
Deepfly off
Chat command
==
Dummy

8
data/languages/italian.txt
View file

@ -1278,13 +1278,7 @@ Markers:
Converse
==
45° aim
==
Deepfly on
==
Deepfly off
Chat command
==
Dummy

8
data/languages/japanese.txt
View file

@ -943,13 +943,7 @@ Show entities
Show HUD
==
45° aim
==
Deepfly on
==
Deepfly off
Chat command
==
UI mouse s.

8
data/languages/korean.txt
View file

@ -942,13 +942,7 @@ Show entities
Show HUD
==
45° aim
==
Deepfly on
==
Deepfly off
Chat command
==
UI mouse s.

8
data/languages/kyrgyz.txt
View file

@ -934,13 +934,7 @@ Show entities
Show HUD
==
45° aim
==
Deepfly on
==
Deepfly off
Chat command
==
UI mouse s.

8
data/languages/norwegian.txt
View file

@ -1249,13 +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
==
Deepfly on
==
Deepfly off
Chat command
==
Dummy

8
data/languages/persian.txt
View file

@ -763,13 +763,7 @@ Show entities
Show HUD
==
45° aim
==
Deepfly on
==
Deepfly off
Chat command
==
UI mouse s.

8
data/languages/polish.txt
View file

@ -1250,13 +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
==
Deepfly on
==
Deepfly off
Chat command
==
Dummy

8
data/languages/portuguese.txt
View file

@ -1076,13 +1076,7 @@ Show entities
Show HUD
==
45° aim
==
Deepfly on
==
Deepfly off
Chat command
==
UI mouse s.

8
data/languages/romanian.txt
View file

@ -949,13 +949,7 @@ Show entities
Show HUD
==
45° aim
==
Deepfly on
==
Deepfly off
Chat command
==
UI mouse s.

12
data/languages/russian.txt
View file

@ -1253,15 +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°
Deepfly on
== Вкл. Deepfly
Deepfly off
== Выкл. Deepfly
Dummy
== Дамми
@ -1286,6 +1277,9 @@ Entities Background color
Regular Background Color
== Станд. фоновый цвет
Chat command
==
Discord
==

8
data/languages/serbian.txt
View file

@ -947,13 +947,7 @@ Show entities
Show HUD
==
45° aim
==
Deepfly on
==
Deepfly off
Chat command
==
UI mouse s.

8
data/languages/serbian_cyrillic.txt
View file

@ -1232,13 +1232,7 @@ Checking for existing player with your name
Smooth Dynamic Camera
==
45° aim
==
Deepfly on
==
Deepfly off
Chat command
==
Dummy

8
data/languages/simplified_chinese.txt
View file

@ -1265,13 +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
==
Deepfly on
==
Deepfly off
Chat command
==
Dummy

8
data/languages/slovak.txt
View file

@ -943,13 +943,7 @@ Show entities
Show HUD
==
45° aim
==
Deepfly on
==
Deepfly off
Chat command
==
UI mouse s.

8
data/languages/spanish.txt
View file

@ -1254,13 +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
==
Deepfly on
==
Deepfly off
Chat command
==
Dummy

8
data/languages/swedish.txt
View file

@ -1220,13 +1220,7 @@ Skin Database
Skins directory
==
45° aim
==
Deepfly on
==
Deepfly off
Chat command
==
Dummy

8
data/languages/traditional_chinese.txt
View file

@ -1253,13 +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
==
Deepfly on
==
Deepfly off
Chat command
==
Dummy

8
data/languages/turkish.txt
View file

@ -1197,13 +1197,7 @@ Skin Database
Skins directory
==
45° aim
==
Deepfly on
==
Deepfly off
Chat command
==
Dummy

8
data/languages/ukrainian.txt
View file

@ -1192,13 +1192,7 @@ Skin Database
Skins directory
==
45° aim
==
Deepfly on
==
Deepfly off
Chat command
==
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);

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

@ -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},
@ -791,8 +790,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},
@ -818,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("Deepfly on");Localize("Deepfly off");
Localize("Lock team");Localize("Show entities");Localize("Show HUD");Localize("Chat command");
*/
void CMenus::UiDoGetButtons(int Start, int Stop, CUIRect View, CUIRect ScopeView)
@ -893,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);
@ -927,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
@ -940,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
@ -966,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
@ -979,20 +975,20 @@ 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
{
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(29, 32, DummySettings, MainView);
}
// misc settings
@ -1005,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(35, 47, MiscSettings, MainView);
UiDoGetButtons(32, 44, MiscSettings, MainView);
}
UiDoListboxEnd(&s_ScrollValue, 0);