Merge branch 'master' into terencehill/menu_tooltips_2

Conflicts:
	defaultXonotic.cfg

diff --cc defaultXonotic.cfg
index 930087a220c54b395488a3b825a8cbf08b3021e1,d2e91235e657685c503975d60d8a68c82c28395e..e09eb1f11a0dce3cb89ebf1e1d603f93a24affc8
--- 1/defaultXonotic.cfg
--- 2/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/menu.qc
Simple merge

diff --cc qcsrc/menu/xonotic/dialog_settings_misc.c
index 5c76953a5597d0e22a935748ba182fc1fc1b284a,7fa3dc66b329ce71fe66889df08def1fa20fcae7..2113783ed015aa55290455548d2834d817cf5407
--- 1/qcsrc/menu/xonotic/dialog_settings_misc.c
--- 2/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 3bfdb855256f9274542f8a9cfc818c72556a1805,b9d6a08d5f63810246c3ac21a30588d28c5712b2..4ca1bdc667ca220bc3ac02ea995c9b9222e9c5e4
--- 1/qcsrc/menu/xonotic/util.qc
--- 2/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;
  }

diff --cc qcsrc/menu/xonotic/util.qh
Simple merge