From: terencehill <piuntn@gmail.com>
Date: Wed, 9 Mar 2011 20:55:07 +0000 (+0100)
Subject: Merge branch 'master' into terencehill/menu_tooltips_2
X-Git-Tag: xonotic-v0.6.0~40^2~108^2~8
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b8f71d297050680a3b25b063375ca5feec9ff67b;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/menu_tooltips_2

Conflicts:
	defaultXonotic.cfg
---

b8f71d297050680a3b25b063375ca5feec9ff67b
diff --cc defaultXonotic.cfg
index e09eb1f11,e9e2f026c..139654ea8
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -1365,8 -1377,6 +1377,7 @@@ 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