Merge branch 'drjaska/sync-bal-wep-mario' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / xonotic / dialog_settings_game_hud.qc

diff --git a/qcsrc/menu/xonotic/dialog_settings_game_hud.qc b/qcsrc/menu/xonotic/dialog_settings_game_hud.qc
index 0fb475563a8f2e643e7b5444cb44eb96b2d8b731..dadef064763604ae27aa79de8345cfa673be80c3 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_game_hud.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_game_hud.qc
@@ -49,10 +49,6 @@ void XonoticGameHUDSettingsTab_fill(entity me)
                me.TD(me, 1, 2, e = makeXonoticScoreboardFadeTimeSlider());
        me.TR(me);
                me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_scoreboard_table_highlight", _("Enable rows / columns highlighting")));
-
-       me.TR(me);
-       //me.TR(me);
-               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_scoreboard_respawntime_decimals", _("Show decimals in respawn countdown")));
        me.TR(me);
                me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_scoreboard_accuracy", _("Show accuracy underneath scoreboard")));
        me.TR(me);
@@ -63,7 +59,7 @@ void XonoticGameHUDSettingsTab_fill(entity me)
                        e.addValue(e, _("Right"), "2");
                        e.configureXonoticTextSliderValues(e);
 
-       //me.TR(me);
+       me.TR(me);
        me.TR(me);
                me.TD(me, 1, 3, e = makeXonoticHeaderLabel(_("Waypoints")));
        me.TR(me);
@@ -78,7 +74,7 @@ void XonoticGameHUDSettingsTab_fill(entity me)
                        setDependent(e, "cl_hidewaypoints", 0, 0);
        me.TR(me);
                me.TDempty(me, 0.2);
-               me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Fontsize:")));
+               me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Font size:")));
                        setDependent(e, "cl_hidewaypoints", 0, 0);
                me.TD(me, 1, 2, e = makeXonoticSlider(5, 16, 1, "g_waypointsprite_fontsize"));
                        setDependent(e, "cl_hidewaypoints", 0, 0);
@@ -91,7 +87,6 @@ void XonoticGameHUDSettingsTab_fill(entity me)
                        setDependent(e, "cl_hidewaypoints", 0, 0);
 
        me.TR(me);
-       //me.TR(me);
                me.TDempty(me, 0.2);
                me.TD(me, 1, 2.8, e = makeXonoticCheckBoxEx(0.25, 1, "g_waypointsprite_crosshairfadealpha", _("Fade when near the crosshair")));
                        setDependent(e, "cl_hidewaypoints", 0, 0);
@@ -132,7 +127,7 @@ void XonoticGameHUDSettingsTab_fill(entity me)
                        setDependent(e, "hud_shownames", 1, 1);
        me.TR(me);
                me.TDempty(me, 0.2);
-               me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Fontsize:")));
+               me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Font size:")));
                        setDependent(e, "hud_shownames", 1, 1);
                me.TD(me, 1, 2, e = makeXonoticSlider(5, 16, 1, "hud_shownames_fontsize"));
                        setDependent(e, "hud_shownames", 1, 1);
@@ -164,6 +159,15 @@ void XonoticGameHUDSettingsTab_fill(entity me)
                        setDependent(e, "hud_shownames", 1, 1);
 
        me.TR(me);
+       me.TR(me);
+               me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Speed unit:")));
+               me.TD(me, 1, 2, e = makeXonoticTextSlider("hud_speed_unit"));
+                       e.addValue(e, _("qu/s") , "1");
+                       e.addValue(e, _("m/s")  , "2");
+                       e.addValue(e, _("km/h") , "3");
+                       e.addValue(e, _("mph")  , "4");
+                       e.addValue(e, _("knots"), "5");
+                       e.configureXonoticTextSliderValues(e);
        me.TR(me);
                me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Damage overlay:")));
                me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.05, "hud_damage"));