Merge branch 'master' into terencehill/menu_dialogs_cleanups

Conflicts:
	qcsrc/menu/xonotic/dialog_multiplayer_playersetup_waypoint.c
	qcsrc/menu/xonotic/dialog_multiplayer_playersetup_weapons.c
	qcsrc/menu/xonotic/dialog_settings_effects.c

diff --git a/gfx/menu/default/skinvalues.txt b/gfx/menu/default/skinvalues.txt
index 8e0f548a707932eeb0451686eb765d6917e43d08..b2b0a97008db10893fac7592b3a5132c4d0bae09 100755 (executable)
--- a/gfx/menu/default/skinvalues.txt
+++ b/gfx/menu/default/skinvalues.txt
@@ -174,7 +174,7 @@ COLOR_DIALOG_USERBIND           '1 1 1'
 COLOR_DIALOG_SINGLEPLAYER       '1 1 1'
 COLOR_DIALOG_CREDITS            '1 1 1'
 COLOR_DIALOG_WEAPONS            '1 1 1'
-COLOR_DIALOG_RADAR              '1 1 1'
+COLOR_DIALOG_WAYPOINTS          '1 1 1'
 COLOR_DIALOG_SERVERINFO         '1 1 1'
 COLOR_DIALOG_CVARS              '1 0 0'
 

diff --git a/gfx/menu/luminos/skinvalues.txt b/gfx/menu/luminos/skinvalues.txt
index 9cb2b59266c4e507d98922d77e21c84c7c6c4b13..21944b67a8c17bb7c818a1c00f38b67e8d250532 100755 (executable)
--- a/gfx/menu/luminos/skinvalues.txt
+++ b/gfx/menu/luminos/skinvalues.txt
@@ -174,7 +174,7 @@ COLOR_DIALOG_USERBIND           '1 1 1'
 COLOR_DIALOG_SINGLEPLAYER       '1 1 1'
 COLOR_DIALOG_CREDITS            '1 1 1'
 COLOR_DIALOG_WEAPONS            '1 1 1'
-COLOR_DIALOG_RADAR              '1 1 1'
+COLOR_DIALOG_WAYPOINTS          '1 1 1'
 COLOR_DIALOG_SERVERINFO         '1 1 1'
 COLOR_DIALOG_CVARS              '1 0 0'
 

diff --git a/gfx/menu/xaw/skinvalues.txt b/gfx/menu/xaw/skinvalues.txt
index 666b971c23d9d032da0bf6646cdfcc401b2eaba3..eae123ce79fa059b02987416f594302d08d96c63 100644 (file)
--- a/gfx/menu/xaw/skinvalues.txt
+++ b/gfx/menu/xaw/skinvalues.txt
@@ -29,7 +29,7 @@ COLOR_DIALOG_USERBIND           '1 1 1'
 COLOR_DIALOG_SINGLEPLAYER       '1 1 1'
 COLOR_DIALOG_CREDITS            '1 1 1'
 COLOR_DIALOG_WEAPONS            '1 1 1'
-COLOR_DIALOG_RADAR              '1 1 1'
+COLOR_DIALOG_WAYPOINTS          '1 1 1'
 COLOR_DIALOG_SERVERINFO         '1 1 1'
 COLOR_DIALOG_CVARS              '1 0 0'
 

diff --git a/qcsrc/menu/skin-customizables.inc b/qcsrc/menu/skin-customizables.inc
index fa88d92246b25a473456882cdf371c877fa1be1c..ca8f4cf8e959ee7d2a5755e74e82def02d543c0b 100644 (file)
--- a/qcsrc/menu/skin-customizables.inc
+++ b/qcsrc/menu/skin-customizables.inc
@@ -63,7 +63,7 @@ SKINBEGIN
        SKINVECTOR(COLOR_DIALOG_SINGLEPLAYER, '1 1 0.7');
        SKINVECTOR(COLOR_DIALOG_CREDITS, '0.7 0.7 1');
        SKINVECTOR(COLOR_DIALOG_WEAPONS, '1 0.7 0.7');
-       SKINVECTOR(COLOR_DIALOG_RADAR, '0.7 0.7 1');
+       SKINVECTOR(COLOR_DIALOG_WAYPOINTS, '0.7 0.7 1');
        SKINVECTOR(COLOR_DIALOG_SERVERINFO, '0.7 0.7 1');
        SKINVECTOR(COLOR_DIALOG_CVARS, '1 0 0');
 

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_waypoint.c b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_waypoint.c
index 470fc678522c6a4f49decbdd864252512119d8d0..5805d2ea11de914382ad11beb108db1f71f60a55 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_waypoint.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_waypoint.c
@@ -3,41 +3,36 @@ CLASS(XonoticWaypointDialog) EXTENDS(XonoticDialog)
        METHOD(XonoticWaypointDialog, fill, void(entity))
        METHOD(XonoticWaypointDialog, showNotify, void(entity))
        ATTRIB(XonoticWaypointDialog, title, string, _("Waypoints"))
-       ATTRIB(XonoticWaypointDialog, color, vector, SKINCOLOR_DIALOG_RADAR)
-       ATTRIB(XonoticWaypointDialog, intendedWidth, float, 0.7)
+       ATTRIB(XonoticWaypointDialog, color, vector, SKINCOLOR_DIALOG_WAYPOINTS)
+       ATTRIB(XonoticWaypointDialog, intendedWidth, float, 0.5)
        ATTRIB(XonoticWaypointDialog, rows, float, 6)
-       ATTRIB(XonoticWaypointDialog, columns, float, 4)
+       ATTRIB(XonoticWaypointDialog, columns, float, 3)
 ENDCLASS(XonoticWaypointDialog)
 #endif
 
 #ifdef IMPLEMENTATION
 void XonoticWaypointDialog_showNotify(entity me)
 {
-        loadAllCvars(me);
+       loadAllCvars(me);
 }
 void XonoticWaypointDialog_fill(entity me)
 {
        entity e;
-       
-       me.TR(me);
-               me.TD(me, 1, 4, makeXonoticTextLabel(0, _("Waypoint settings:")));
+
        me.TR(me);
-               me.TDempty(me, 0.2);
-               me.TD(me, 1, 3.8, e = makeXonoticCheckBox(1, "cl_hidewaypoints", _("Show base waypoints")));
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(1, "cl_hidewaypoints", _("Show base waypoints")));
        me.TR(me);
-               me.TDempty(me, 0.2);
-               me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Waypoint scale:")));
-                       me.TD(me, 1, 3, e = makeXonoticSlider(0.5, 1.5, 0.01, "g_waypointsprite_scale"));
+               me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Waypoint scale:")));
+                       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, _("Waypoint alpha:")));
-                       me.TD(me, 1, 3, e = makeXonoticSlider(0.1, 1, 0.01, "g_waypointsprite_alpha"));
+               me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Waypoint alpha:")));
+                       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, _("Show names:")));
-               me.TD(me, 1, 3, e = makeXonoticTextSlider("cl_shownames"));
+       me.TR(me);
+               me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Show names:")));
+               me.TD(me, 1, 2, e = makeXonoticTextSlider("cl_shownames"));
                        e.addValue(e, _("Never"), "0");
                        e.addValue(e, _("Teammates"), "1");
                        e.addValue(e, _("All players"), "2");
@@ -47,5 +42,4 @@ void XonoticWaypointDialog_fill(entity me)
                        e.onClick = Dialog_Close;
                        e.onClickEntity = me;
 }
-
 #endif

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_weapons.c b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_weapons.c
index ed5802a972d5dfcbd6ccef2671a412b821df8d44..d20a6483bb425e4f9735c6fbf8dc7d24b317221e 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_weapons.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_weapons.c
@@ -5,9 +5,9 @@ CLASS(XonoticWeaponsDialog) EXTENDS(XonoticDialog)
        METHOD(XonoticWeaponsDialog, showNotify, void(entity))
        ATTRIB(XonoticWeaponsDialog, title, string, _("Weapon settings"))
        ATTRIB(XonoticWeaponsDialog, color, vector, SKINCOLOR_DIALOG_WEAPONS)
-       ATTRIB(XonoticWeaponsDialog, intendedWidth, float, 0.5)
+       ATTRIB(XonoticWeaponsDialog, intendedWidth, float, 0.4)
        ATTRIB(XonoticWeaponsDialog, rows, float, 17)
-       ATTRIB(XonoticWeaponsDialog, columns, float, 4)
+       ATTRIB(XonoticWeaponsDialog, columns, float, 3)
        ATTRIB(XonoticWeaponsDialog, weaponsList, entity, NULL)
 ENDCLASS(XonoticWeaponsDialog)
 #endif
@@ -26,18 +26,18 @@ void XonoticWeaponsDialog_fill(entity me)
        entity e;
 
        me.TR(me);
-               me.TD(me, 1, 4, makeXonoticTextLabel(0, _("Weapon priority list:")));
+               me.TD(me, 1, 3, makeXonoticTextLabel(0, _("Weapon priority list:")));
        me.TR(me);
-               me.TD(me, 9, 4, e = me.weaponsList = makeXonoticWeaponsList());
+               me.TD(me, 9, 3, e = me.weaponsList = makeXonoticWeaponsList());
        me.gotoRC(me, 10, 0);
-               me.TDempty(me, 1);
+               me.TDempty(me, 0.5);
                me.TD(me, 1, 1, e = makeXonoticButton(_("Up"), '0 0 0'));
                        e.onClick = WeaponsList_MoveUp_Click;
                        e.onClickEntity = me.weaponsList;
                me.TD(me, 1, 1, e = makeXonoticButton(_("Down"), '0 0 0'));
                        e.onClick = WeaponsList_MoveDown_Click;
                        e.onClickEntity = me.weaponsList;
-       me.gotoRC(me, 11, 0);
+       me.TR(me);
                me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "cl_weaponpriority_useforcycling", _("Use priority list for weapon cycling")));
        me.TR(me);
                me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "cl_autoswitch", _("Auto switch weapons on pickup")));
@@ -45,9 +45,9 @@ void XonoticWeaponsDialog_fill(entity me)
                me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "r_drawviewmodel", _("Draw 1st person weapon model")));
        me.TR(me);
                me.TDempty(me, 0.2);
-               me.TD(me, 1, 1, e = makeXonoticRadioButton(1, "cl_gunalign", "4", _("Left align")));
+               me.TD(me, 1, 1.4, e = makeXonoticRadioButton(1, "cl_gunalign", "4", _("Left align")));
                        setDependent(e, "r_drawviewmodel", 1, 1);
-               me.TD(me, 1, 1, e = makeXonoticRadioButton(1, "cl_gunalign", "3", _("Right align")));
+               me.TD(me, 1, 1.4, e = makeXonoticRadioButton(1, "cl_gunalign", "3", _("Right align")));
                        setDependent(e, "r_drawviewmodel", 1, 1);
        me.TR(me);
                me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "v_flipped", _("Flip view horizontally")));

diff --git a/qcsrc/menu/xonotic/dialog_settings_effects.c b/qcsrc/menu/xonotic/dialog_settings_effects.c
index ec8329b5d8b399ac59dd090af4d73eb3f551fd07..b94bd1f08ae006623a3b9797fab171b9efeec8fa 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_effects.c
+++ b/qcsrc/menu/xonotic/dialog_settings_effects.c
@@ -129,15 +129,15 @@ void XonoticEffectsSettingsTab_fill(entity me)
                setDependent(e, "cl_decals", 1, 1);
 
        me.gotoRC(me, 2, 3.5); me.setFirstColumn(me, me.currentColumn);
-       me.TD(me, 1, 1.3, e = makeXonoticCheckBox(1, "mod_q3bsp_nolightmaps", _("Use lightmaps")));
-       me.TD(me, 1, 0.9, e = makeXonoticCheckBox(0, "r_glsl_deluxemapping", _("Deluxe mapping")));
+       me.TD(me, 1, 1.2, e = makeXonoticCheckBox(1, "mod_q3bsp_nolightmaps", _("Use lightmaps")));
+       me.TD(me, 1, 1.2, e = makeXonoticCheckBox(0, "r_glsl_deluxemapping", _("Deluxe mapping")));
                setDependentAND(e, "vid_gl20", 1, 1, "mod_q3bsp_nolightmaps", 0, 0);
-       me.TD(me, 1, 0.8, e = makeXonoticCheckBox(0, "r_shadow_gloss", _("Gloss")));
+       me.TD(me, 1, 0.6, e = makeXonoticCheckBox(0, "r_shadow_gloss", _("Gloss")));
                setDependentAND3(e, "vid_gl20", 1, 1, "r_glsl_deluxemapping", 1, 2, "mod_q3bsp_nolightmaps", 0, 0);
        me.TR(me);
-               me.TD(me, 1, 1.3, e = makeXonoticCheckBox(0, "r_glsl_offsetmapping", _("Offset mapping")));
+               me.TD(me, 1, 1.2, e = makeXonoticCheckBox(0, "r_glsl_offsetmapping", _("Offset mapping")));
                        setDependent(e, "vid_gl20", 1, 1);
-               me.TD(me, 1, 1.7, e = makeXonoticCheckBox(0, "r_glsl_offsetmapping_reliefmapping", _("Relief mapping")));
+               me.TD(me, 1, 1.8, e = makeXonoticCheckBox(0, "r_glsl_offsetmapping_reliefmapping", _("Relief mapping")));
                        setDependentAND(e, "vid_gl20", 1, 1, "r_glsl_offsetmapping", 1, 1);
        me.TR(me);
                me.TD(me, 1, 1, e = makeXonoticCheckBox(0, "r_water", _("Reflections:")));