From: terencehill <piuntn@gmail.com>
Date: Sat, 17 Sep 2011 15:51:05 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/menu_tooltips_2
X-Git-Tag: xonotic-v0.6.0~40^2~108^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=80cd34d0a48e975018605aabebacba50e8029585;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/menu_tooltips_2

Conflicts:
	defaultXonotic.cfg
---

80cd34d0a48e975018605aabebacba50e8029585
diff --cc defaultXonotic.cfg
index 139654ea8,759a512e7..02ddde8b0
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -1377,7 -1410,7 +1410,8 @@@ seta slowmo 
  seta menu_skin "luminos"
  set menu_slowmo 1
  seta menu_sounds 0 "enables menu sound effects. 1 enables click sounds, 2 also enables hover sounds"
 +seta menu_tooltips 1 "menu tooltips: 0 disabled, 1 enabled, 2 also shows cvar or console command (when available) changed or executed by the item"
+ set menu_picmip_bypass 0 "bypass texture quality enforcement based on system resources, not recommended and may cause crashes!"
  
  r_textbrightness 0.2
  r_textcontrast 0.8
diff --cc qcsrc/menu/xonotic/dialog_settings_misc.c
index 9a0b8e060,72af4dce1..54abcf47c
--- a/qcsrc/menu/xonotic/dialog_settings_misc.c
+++ b/qcsrc/menu/xonotic/dialog_settings_misc.c
@@@ -49,41 -49,8 +49,14 @@@ void XonoticMiscSettingsTab_fill(entit
  		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "showdate", _("Show current date")));
  	me.TR(me);
  		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "showfps", _("Show frames per second")));
- 	me.TR(me);
- 		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "cl_showspeed", _("Speedometer")));
- 	me.TR(me);
- 		me.TDempty(me, 0.2);
- 		me.TD(me, 1, 2.8/3, e = makeXonoticRadioButton(1, "cl_showspeed_unit", "0", _("qu/s (hidden)")));
- 			setDependent(e, "cl_showspeed", 1, 1);
- 		me.TD(me, 1, 2.8/3, e = makeXonoticRadioButton(1, "cl_showspeed_unit", "1", _("qu/s")));
- 			setDependent(e, "cl_showspeed", 1, 1);
- 		me.TD(me, 1, 2.8/3, e = makeXonoticRadioButton(1, "cl_showspeed_unit", "2", _("m/s")));
- 			setDependent(e, "cl_showspeed", 1, 1);
- 	me.TR(me);
- 		me.TDempty(me, 0.2);
- 		me.TD(me, 1, 2.8/3, e = makeXonoticRadioButton(1, "cl_showspeed_unit", "3", _("km/h")));
- 			setDependent(e, "cl_showspeed", 1, 1);
- 		me.TD(me, 1, 2.8/3, e = makeXonoticRadioButton(1, "cl_showspeed_unit", "4", _("mph")));
- 			setDependent(e, "cl_showspeed", 1, 1);
- 		me.TD(me, 1, 2.8/3, e = makeXonoticRadioButton(1, "cl_showspeed_unit", "5", _("knots")));
- 			setDependent(e, "cl_showspeed", 1, 1);
- 	me.TR(me);
- 		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "cl_showacceleration", _("Show accelerometer")));
- 	me.TR(me);
- 		me.TDempty(me, 0.2);
- 		me.TD(me, 1, 2.8/2, e = makeXonoticTextLabel(0, _("Accelerometer scale:")));
- 			setDependent(e, "cl_showacceleration", 1, 1);
- 		me.TD(me, 1, 2.8/2, e = makeXonoticSlider(0.2, 2, 0.2, "cl_showacceleration_scale"));
- 			setDependent(e, "cl_showacceleration", 1, 1);
- 	me.TR(me);
  	me.TR(me);
  		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "cl_maxfps_alwayssleep", _("Minimize input latency")));
 +/* 	me.TR(me);
 +	me.TR(me);
 +		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Menu Tooltips:")));
 +		me.TD(me, 1, 0.4, e = makeXonoticRadioButton(2, "menu_tooltips", "0", _("Off")));
 +		me.TD(me, 1, 0.8, e = makeXonoticRadioButton(2, "menu_tooltips", "1", _("Standard")));
 +		me.TD(me, 1, 0.8, e = makeXonoticRadioButton(2, "menu_tooltips", "2", _("Advanced"))); */
  	me.TR(me);
  	me.TR(me);
  		me.TDempty(me, 0.5);