From: Rudolf Polzer <divVerent@xonotic.org>
Date: Mon, 20 Dec 2010 13:30:43 +0000 (+0100)
Subject: Merge branch 'master' into divVerent/virtual-mirror-damage
X-Git-Tag: xonotic-v0.1.0preview~2^2~2^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=72ab0540e65d8296d4d62c056f099c82bb815868;p=xonotic%2Fxonotic-data.pk3dir.git

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

72ab0540e65d8296d4d62c056f099c82bb815868
diff --cc qcsrc/menu/xonotic/dialog_multiplayer_create_advanced.c
index e61b5e3cd,647f6afba..841b2bf49
--- a/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:"));