From: terencehill <piuntn@gmail.com>
Date: Thu, 20 Jan 2011 23:23:13 +0000 (+0100)
Subject: Merge branch 'master' into terencehill/menu_tooltips_2
X-Git-Tag: xonotic-v0.6.0~40^2~108^2~10
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=2886ed5676755f4242704d64d3315124026496bb

Merge branch 'master' into terencehill/menu_tooltips_2

Conflicts:
	defaultXonotic.cfg
---

2886ed5676755f4242704d64d3315124026496bb
diff --cc defaultXonotic.cfg
index 930087a220,d2e91235e6..e09eb1f11a
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -1360,7 -1365,7 +1365,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 5c76953a55,7fa3dc66b3..2113783ed0
--- a/qcsrc/menu/xonotic/dialog_settings_misc.c
+++ b/qcsrc/menu/xonotic/dialog_settings_misc.c
@@@ -65,18 -77,11 +77,17 @@@ void XonoticMiscSettingsTab_fill(entit
  			setDependent(e, "cl_showacceleration", 1, 1);
  	me.TR(me);
  	me.TR(me);
- 		me.TDempty(me, 0.2);
- 		me.TD(me, 1, 2.8, e = makeXonoticCheckBox(0, "cl_maxfps_alwayssleep", "Minimize input latency"));
+ 		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);
- 		me.TD(me, 1, 2, e = makeXonoticButton("Advanced settings...", '0 0 0'));
+ 		me.TD(me, 1, 2, e = makeXonoticButton(_("Advanced settings..."), '0 0 0'));
  			e.onClick = DialogOpenButton_Click;
  			e.onClickEntity = main.cvarsDialog;
  }
diff --cc qcsrc/menu/xonotic/util.qc
index 3bfdb85525,b9d6a08d5f..4ca1bdc667
--- a/qcsrc/menu/xonotic/util.qc
+++ b/qcsrc/menu/xonotic/util.qc
@@@ -21,16 -22,22 +22,22 @@@ void unloadTooltips(
  string getZonedTooltipForIdentifier(string s)
  {
  	string t;
 -	if(s == "")
 +	if(s == "" || tooltipdb < 0)
  		return string_null;
- 	t = db_get(tooltipdb, s);
- 	if(t == "-")
- 		return string_null;
- 	if(t != "")
- 		return strzone(t);
- 	t = cvar_description(s);
- 	if(t != "" && t != "custom cvar")
- 		return strzone(t);
+ 	if(tooltipdb >= 0)
+ 	{
+ 		t = db_get(tooltipdb, s);
+ 		if(t == "-")
+ 			return string_null;
+ 		if(t != "")
+ 			return strzone(t);
+ 	}
+ 	if(prvm_language == "en" || prvm_language == "")
+ 	{
+ 		t = cvar_description(s);
+ 		if(t != "" && t != "custom cvar")
+ 			return strzone(t);
+ 	}
  	dprint("WARNING: no tooltip set for ", s, "\n");
  	return string_null;
  }