From: Sahil Singhal Date: Thu, 10 Jun 2010 04:59:45 +0000 (-0400) Subject: Add default hud options to exit dialog. X-Git-Tag: xonotic-v0.1.0preview~541^2~68 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=660016cad56c5e00baed1f7da721ada7e7a3d1a1;p=xonotic%2Fxonotic-data.pk3dir.git Add default hud options to exit dialog. --- diff --git a/qcsrc/menu/xonotic/dialog_hudsetup_exit.c b/qcsrc/menu/xonotic/dialog_hudsetup_exit.c index f5af5e21c..ce8323557 100644 --- a/qcsrc/menu/xonotic/dialog_hudsetup_exit.c +++ b/qcsrc/menu/xonotic/dialog_hudsetup_exit.c @@ -16,6 +16,36 @@ void fillXonoticHUDExitDialog(entity me) { entity e; me.TR(me); - me.TD(me, 2, 1, makeXonoticCommandButton("Exit Setup", '1 1 1', "_hud_configure 0", 1)); + me.TD(me, 1, 4, makeXonoticTextLabel(0, "Panel Settings:")); + me.TR(me); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_bg", "Panel Background")); + me.TR(me); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Team Color:")); + me.TD(me, 1, 3, e = makeXonoticSlider(0, 1, 0.01, "hud_bg_color_team")); + me.TR(me); + me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Background Alpha:")); + me.TD(me, 1, 3, e = makeXonoticSlider(0.1, 1, 0.01, "hud_bg_alpha")); + me.TR(me); + me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Foreground Alpha:")); + me.TD(me, 1, 3, e = makeXonoticSlider(0.1, 1, 0.01, "hud_fg_alpha")); + me.TR(me); + me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Progress Bar Alpha:")); + me.TD(me, 1, 3, e = makeXonoticSlider(0.1, 1, 0.01, "hud_progressbar_alpha")); + me.TR(me); + me.TR(me); + me.TD(me, 1, 4, makeXonoticTextLabel(0, "Dock Settings:")); + me.TR(me); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Team Color:")); + me.TD(me, 1, 3, e = makeXonoticSlider(0, 1, 0.01, "hud_dock_color_team")); + me.TR(me); + me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Dock Alpha:")); + me.TD(me, 1, 3, e = makeXonoticSlider(0.1, 1, 0.01, "hud_dock_alpha")); + me.TR(me); + me.TR(me); + me.TD(me, 1, 4, makeXonoticTextLabel(0, "Grid Settings:")); + me.TR(me); + me.TD(me, 1, 3, e = makeXonoticCheckBox(1, "hud_configure_grid", "Snap Panel to Grid")); + me.gotoRC(me, me.rows - 1, 0); + me.TD(me, 1, me.columns, e = makeXonoticCommandButton("Exit Setup", '0 0 0', "_hud_configure 0", 1)); } #endif diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c index f8240001d..68842113e 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c +++ b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c @@ -168,7 +168,6 @@ void fillXonoticPlayerSettingsTab(entity me) me.TD(me, 1, 2/3, e = makeXonoticRadioButton(2, "cl_forceplayermodelsfromxonotic", string_null, "Custom")); me.TD(me, 1, 2/3, e = makeXonoticRadioButton(2, "cl_forceplayermodels", string_null, "All")); #endif - me.TR(me); me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "cl_gentle", "Disable gore effects")); me.TR(me); me.TD(me, 1, 1, e = makeXonoticTextLabel(0, "Gibs:"));