From: terencehill <piuntn@gmail.com>
Date: Fri, 27 Apr 2012 21:55:32 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/mutators_dialog_cleanup
X-Git-Tag: xonotic-v0.7.0~267^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=834876e6b179cf33ce95102ba25faf754e9a8773;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/mutators_dialog_cleanup

Conflicts:
	qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c
---

834876e6b179cf33ce95102ba25faf754e9a8773
diff --cc qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c
index 16347953b,2d642728e..42015131f
--- a/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c
@@@ -216,19 -229,23 +229,23 @@@ void XonoticMutatorsDialog_fill(entity 
  		me.TD(me, 1, 2, makeXonoticTextLabel(0, _("Weapon & item mutators:")));
  	me.TR(me);
  		me.TDempty(me, 0.2);
 -		me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "g_grappling_hook", _("Grappling hook")));
 +		me.TD(me, 1, 1.8, e = makeXonoticCheckBox(0, "g_grappling_hook", _("Grappling hook")));
  	me.TR(me);
  		me.TDempty(me, 0.2);
 -		me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "g_jetpack", _("Jet pack")));
 +		me.TD(me, 1, 1.8, e = makeXonoticCheckBox(0, "g_jetpack", _("Jet pack")));
  	me.TR(me);
  		me.TDempty(me, 0.2);
 -		me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "g_invincible_projectiles", _("Invincible Projectiles")));
 +		me.TD(me, 1, 1.8, e = makeXonoticCheckBox(0, "g_invincible_projectiles", _("Invincible Projectiles")));
+ 	me.TR(me);
+ 		me.TDempty(me, 0.2);
 -		me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "g_new_toys", _("New Toys")));
++		me.TD(me, 1, 1.8, e = makeXonoticCheckBox(0, "g_new_toys", _("New Toys")));
+ 			setDependentWeird(e, checkCompatibility_newtoys);
  	me.TR(me);
  		me.TDempty(me, 0.2);
 -		me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "g_rocket_flying", _("Rocket Flying")));
 +		me.TD(me, 1, 1.8, e = makeXonoticCheckBox(0, "g_rocket_flying", _("Rocket Flying")));
  	me.TR(me);
  		me.TDempty(me, 0.2);
 -		me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "g_pinata", _("Piñata")));
 +		me.TD(me, 1, 1.8, e = makeXonoticCheckBox(0, "g_pinata", _("Piñata")));
  			setDependentWeird(e, checkCompatibility_pinata);
  	me.TR(me);
  		me.TDempty(me, 0.2);