Merge branch 'master' into divVerent/virtual-mirror-damage

diff --cc qcsrc/menu/xonotic/dialog_multiplayer_create_advanced.c
index e61b5e3cd0009842615375abd2bd0ca85d898a4f,647f6afbaac36dd25b4ee2b7b16da136d1a4b996..841b2bf490dc8bf5845ce01f263a24147037a3a9
--- 1/qcsrc/menu/xonotic/dialog_multiplayer_create_advanced.c
--- 2/qcsrc/menu/xonotic/dialog_multiplayer_create_advanced.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_create_advanced.c
@@@ -45,10 -45,7 +45,10 @@@ void XonoticAdvancedDialog_fill(entity 
        me.TR(me);
                me.TDempty(me, 0.2);
                me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Friendly fire penalty:"));
-               me.TD(me, 1, 1.7, e = makeXonoticSlider(0, 1.0, 0.05, "g_mirrordamage"));
+               me.TD(me, 1, 1.6, e = makeXonoticSlider(0, 1.0, 0.05, "g_mirrordamage"));
 +      me.TR(me);
 +              me.TDempty(me, 0.4);
 +              me.TD(me, 1, 2.6, e = makeXonoticCheckBox(0, "g_mirrordamage_virtual", "Virtual penalty (effect only)"));
        me.TR(me);
                me.TDempty(me, 0.2);
                me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Teams:"));