From 0ec94c73440a452795c51c7a4dadbbb901d05d99 Mon Sep 17 00:00:00 2001 From: Samual Lenks Date: Mon, 27 Jan 2014 22:21:57 -0500 Subject: [PATCH] Put in some more work on HUD tab, add comments for other places --- qcsrc/menu/xonotic/dialog_settings_game_hud.c | 60 ++++++++++++++++--- qcsrc/menu/xonotic/dialog_settings_input.c | 3 + .../menu/xonotic/dialog_settings_misc_cvars.c | 3 + 3 files changed, 58 insertions(+), 8 deletions(-) diff --git a/qcsrc/menu/xonotic/dialog_settings_game_hud.c b/qcsrc/menu/xonotic/dialog_settings_game_hud.c index f37b2f28c..24a15d2ff 100644 --- a/qcsrc/menu/xonotic/dialog_settings_game_hud.c +++ b/qcsrc/menu/xonotic/dialog_settings_game_hud.c @@ -40,6 +40,37 @@ void XonoticGameHUDSettingsTab_fill(entity me) { entity e; + // todo: + // threshold: hud_damage_pain_threshold_lower_health + + //me.gotoRC(me, 0, 3.2); me.setFirstColumn(me, me.currentColumn); + me.TR(me); + me.TD(me, 1, 3, e = makeXonoticTextLabel(0.5, _("Scoreboard"))); + e.isBold = TRUE; + e.alpha = 0.5; + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Alpha:"))); + me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.05, "scoreboard_alpha_bg")); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Speed:"))); + me.TD(me, 1, 2, e = makeXonoticSlider(0.025, 0.1, 0.025, "hud_damage_factor")); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Width:"))); + me.TD(me, 1, 2, e = makeXonoticSlider(0.25, 1, 0.05, "hud_damage_fade_rate")); + me.TR(me); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "scoreboard_respawntime_decimals", _("Show decimals in respawn countdown"))); + + // todo: + // scoreboard_accuracy + // scoreboard_alpha* + // scoreboard_fadeinspeed 10 _fadeoutspeed 5 + // scoreboard_offset_left 0.15 _right 0.15 _vertical 0.05 + // X scoreboard_respawntime_decimals + + me.TR(me); me.TD(me, 1, 3, e = makeXonoticTextLabel(0, _("Damage:"))); me.TR(me); @@ -60,27 +91,40 @@ void XonoticGameHUDSettingsTab_fill(entity me) setDependent(e, "hud_damage", 0.001, 100); me.TR(me); + // todo: + // g_waypointsprite_crosshairfadealpha + // g_waypointsprite_fontsize + + me.gotoRC(me, 0, 3.2); me.setFirstColumn(me, me.currentColumn); + me.TD(me, 1, 3, e = makeXonoticTextLabel(0.5, _("Other"))); + e.isBold = TRUE; + e.alpha = 0.5; 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:"))); // TODO: use fontsize? - setDependent(e, "cl_hidewaypoints", 0, 0); + 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); + 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); + 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); + 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); + 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); + makeMulti(e, "g_waypointsprite_edgeoffset_top g_waypointsprite_edgeoffset_left g_waypointsprite_edgeoffset_right"); + setDependent(e, "cl_hidewaypoints", 0, 0); + + // todo: + // hud_shownames_fontsize + // hud_shownames_maxdistance 5000 _mindistance 1000 + // hud_shownames_alpha me.gotoRC(me, 0, 3.2); me.setFirstColumn(me, me.currentColumn); me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_shownames", _("Show names above players"))); // TODO: select fontsize for shownames diff --git a/qcsrc/menu/xonotic/dialog_settings_input.c b/qcsrc/menu/xonotic/dialog_settings_input.c index 50b40f9b3..57787f23c 100644 --- a/qcsrc/menu/xonotic/dialog_settings_input.c +++ b/qcsrc/menu/xonotic/dialog_settings_input.c @@ -44,6 +44,9 @@ void XonoticInputSettingsTab_fill(entity me) e.onClickEntity = kb; kb.clearButton = e; + // todo: + // add menu_mouse_absolute and hud_cursormode here + me.gotoRC(me, 0, 3.2); me.setFirstColumn(me, me.currentColumn); me.TD(me, 1, 3, e = makeXonoticTextLabel(0.5, _("Mouse"))); e.isBold = TRUE; diff --git a/qcsrc/menu/xonotic/dialog_settings_misc_cvars.c b/qcsrc/menu/xonotic/dialog_settings_misc_cvars.c index 724c868fd..99f2dbec6 100644 --- a/qcsrc/menu/xonotic/dialog_settings_misc_cvars.c +++ b/qcsrc/menu/xonotic/dialog_settings_misc_cvars.c @@ -28,6 +28,9 @@ void XonoticCvarsDialog_fill(entity me) // in this dialog, use SKINCOLOR_CVARLIS cvarlist.colorC = SKINCOLOR_CVARLIST_CONTROLS; + // todo: + // add button which does cvar_resettodefaults_saveonly + me.TR(me); me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Cvar filter:"))); me.TD(me, 1, me.columns - 1, e = makeXonoticInputBox(0, string_null)); -- 2.39.2