X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fdialog_multiplayer_playersetup_hud.c;h=e53f99bc1fec29b5a6b90f46cf30aa51f3c9c585;hb=bd71e076bdb4066094634ee70e7cdce9b2fc4002;hp=d638edb7d97bd3393dc48a39cad55655ea462731;hpb=b73f381ebb0443f7b59bdef2a0934dfdc900e0a0;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_hud.c b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_hud.c
index d638edb7d..e53f99bc1 100644
--- a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_hud.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_hud.c
@@ -6,7 +6,7 @@ CLASS(XonoticHUDDialog) EXTENDS(XonoticDialog)
 	ATTRIB(XonoticHUDDialog, title, string, _("HUD settings"))
 	ATTRIB(XonoticHUDDialog, color, vector, SKINCOLOR_DIALOG_HUD)
 	ATTRIB(XonoticHUDDialog, intendedWidth, float, 0.5)
-	ATTRIB(XonoticHUDDialog, rows, float, 12)
+	ATTRIB(XonoticHUDDialog, rows, float, 18)
 	ATTRIB(XonoticHUDDialog, columns, float, 3)
 ENDCLASS(XonoticHUDDialog)
 void HUDSetup_Start(entity me, entity btn);
@@ -36,6 +36,58 @@ void XonoticHUDDialog_fill(entity me)
 {
 	entity e;
 	
+	me.TR(me);
+		me.TD(me, 1, 3, e = makeXonoticTextLabel(0, _("Damage:")));
+	me.TR(me);
+		me.TDempty(me, 0.2);
+		me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Overlay:")));
+		me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.05, "hud_damage"));
+	me.TR(me);
+		me.TDempty(me, 0.2);
+		me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Factor:")));
+		setDependent(e, "hud_damage", 0.001, 100);
+		me.TD(me, 1, 2, e = makeXonoticSlider(0.025, 0.1, 0.025, "hud_damage_factor"));
+		setDependent(e, "hud_damage", 0.001, 100);
+	me.TR(me);
+		me.TDempty(me, 0.2);
+		me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Fade rate:")));
+		setDependent(e, "hud_damage", 0.001, 100);
+		me.TD(me, 1, 2, e = makeXonoticSlider(0.25, 1, 0.05, "hud_damage_fade_rate"));
+		setDependent(e, "hud_damage", 0.001, 100);
+	me.TR(me);
+	
+	me.TR(me);
+		me.TD(me, 1, 3, e = makeXonoticCheckBox(1, "cl_hidewaypoints", _("Waypoints")));
+	me.TR(me);
+		me.TDempty(me, 0.2);
+		me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Scale:")));
+		setDependent(e, "cl_hidewaypoints", 0, 0);
+		me.TD(me, 1, 2, e = makeXonoticSlider(0.5, 1.5, 0.05, "g_waypointsprite_scale"));
+		setDependent(e, "cl_hidewaypoints", 0, 0);
+	me.TR(me);
+		me.TDempty(me, 0.2);
+		me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Alpha:")));
+		setDependent(e, "cl_hidewaypoints", 0, 0);
+		me.TD(me, 1, 2, e = makeXonoticSlider(0.1, 1, 0.05, "g_waypointsprite_alpha"));
+		setDependent(e, "cl_hidewaypoints", 0, 0);
+	me.TR(me);
+		me.TDempty(me, 0.2);
+		me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Edge offset:")));
+		setDependent(e, "cl_hidewaypoints", 0, 0);
+		me.TD(me, 1, 2, e = makeXonoticSlider(0, 0.3, 0.01, "g_waypointsprite_edgeoffset_bottom"));
+		makeMulti(e, "g_waypointsprite_edgeoffset_top g_waypointsprite_edgeoffset_left g_waypointsprite_edgeoffset_right");
+		setDependent(e, "cl_hidewaypoints", 0, 0);
+	me.TR(me);
+	
+	me.TR(me);
+		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_shownames", _("Show names above players")));
+	me.TR(me);
+		me.TDempty(me, 0.2);
+		me.TD(me, 1, 2.8, e = makeXonoticCheckBoxEx(25, 0, "hud_shownames_crosshairdistance", _("Only when near crosshair")));
+	me.TR(me);
+		me.TDempty(me, 0.2);
+		me.TD(me, 1, 2.8, e = makeXonoticCheckBox(0, "hud_shownames_status", _("Display health and armor")));
+	me.TR(me);
 	me.TR(me);
 		me.TDempty(me, 0.5);
 		me.TD(me, 1, 2, e = makeXonoticButton(_("Enter HUD editor"), '0 0 0'));