From: Rudolf Polzer <divVerent@xonotic.org>
Date: Tue, 8 Feb 2011 09:39:23 +0000 (+0100)
Subject: Merge remote branch 'origin/akari/healthcross'
X-Git-Tag: xonotic-v0.5.0~311^2~32
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a2aac26e6d660e5e70e65d7639a669bced3de9e2;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/akari/healthcross'

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

a2aac26e6d660e5e70e65d7639a669bced3de9e2
diff --cc qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
index fe0e75749,5cb714f52..a1ee88dbd
--- a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
@@@ -135,20 -134,24 +135,23 @@@ void XonoticPlayerSettingsTab_fill(enti
  		me.TD(me, 1, 1.8, e = makeXonoticSlider(0, 1, 0.1, "crosshair_alpha"));
  	me.TR(me);
  		me.TDempty(me, 0.2);
- 		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Crosshair color:")));
- 		me.TD(me, 2, 1.8, e = makeXonoticColorpickerString("crosshair_color", "crosshair_color"));
+ 		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, "Crosshair color:"));
 -		me.TD(me, 1, 2/3, e = makeXonoticCheckBox(0, "crosshair_color_per_weapon", "Per weapon"));
 -		me.TDempty(me, 0.1);
 -		me.TD(me, 1, 2/3, e = makeXonoticCheckBox(0, "crosshair_color_by_health", "By health"));
++		me.TD(me, 1, 0.9, e = makeXonoticCheckBox(0, "crosshair_color_per_weapon", "Per weapon"));
++		me.TD(me, 1, 0.9, e = makeXonoticCheckBox(0, "crosshair_color_by_health", "By health"));
  		setDependent(e, "crosshair_color_per_weapon", 0, 0);
  	me.TR(me);
- 		me.TDempty(me, 0.3);
- 		me.TD(me, 1, 0.7, e = makeXonoticCheckBox(0, "crosshair_color_per_weapon", _("Per weapon")));
+ 		me.TDempty(me, 0.4);
 -		me.TD(me, 2, 1.8, e = makeXonoticColorpickerString("crosshair_color", "crosshair_color"));
++		me.TD(me, 2, 2.6, e = makeXonoticColorpickerString("crosshair_color", "crosshair_color"));
+ 		setDependentAND(e, "crosshair_color_per_weapon", 0, 0, "crosshair_color_by_health", 0, 0);
+ 	me.TR(me);
  	me.TR(me);
 -		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "crosshair_dot", "Enable center dot"));
 +		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "crosshair_dot", _("Enable center dot")));
  	me.TR(me);
  		me.TDempty(me, 0.2);
 -		me.TD(me, 1, 0.5, e = makeXonoticTextLabel(0, "Size:"));
 +		me.TD(me, 1, 0.5, e = makeXonoticTextLabel(0, _("Size:")));
  		me.TD(me, 1, 0.9, e = makeXonoticSlider(0.2, 2, 0.1, "crosshair_dot_size"));
  			setDependent(e, "crosshair_dot", 1, 1);
 -		me.TD(me, 1, 0.5, e = makeXonoticTextLabel(0, "Alpha:"));
 +		me.TD(me, 1, 0.5, e = makeXonoticTextLabel(0, _("Alpha:")));
  		me.TD(me, 1, 0.9, e = makeXonoticSlider(0.10, 1, 0.1, "crosshair_dot_alpha"));
  			setDependent(e, "crosshair_dot", 1, 1);
  	me.TR(me);