Merge branch 'master' into Mario/quickmenu_merge

diff --cc defaultXonotic.cfg
Simple merge

diff --cc qcsrc/client/Main.qc
Simple merge

diff --cc qcsrc/client/View.qc
index 1f6880b8077d562ec46e100becdad5526f5b6b7c,8c9d59dd91f9a77e421d746a0b8193a8c449fb0f..d20619dc7f1e2a69fdaa63062cdff1b376294ba7
--- 1/qcsrc/client/View.qc
--- 2/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@@ -1564,23 -1564,21 +1564,9 @@@ void CSQC_UpdateView(float w, float h
  
        if(autocvar__hud_configure)
                HUD_Panel_Mouse();
-       else if (HUD_QuickMenu_IsOpened())
 -
 -    if(hud && !intermission)
 -    {
 -        if(hud == HUD_SPIDERBOT)
 -            CSQC_SPIDER_HUD();
 -        else if(hud == HUD_WAKIZASHI)
 -            CSQC_WAKIZASHI_HUD();
 -        else if(hud == HUD_RAPTOR)
 -            CSQC_RAPTOR_HUD();
 -        else if(hud == HUD_BUMBLEBEE)
 -            CSQC_BUMBLE_HUD();
 -        else if(hud == HUD_BUMBLEBEE_GUN)
 -            CSQC_BUMBLE_GUN_HUD();
 -    }
++      else if(HUD_QuickMenu_IsOpened())
 +              HUD_QuickMenu_Mouse();
  
-       if(hud && !intermission)
-       {
-               if(hud == HUD_SPIDERBOT)
-                       CSQC_SPIDER_HUD();
-               else if(hud == HUD_WAKIZASHI)
-                       CSQC_WAKIZASHI_HUD();
-               else if(hud == HUD_RAPTOR)
-                       CSQC_RAPTOR_HUD();
-               else if(hud == HUD_BUMBLEBEE)
-                       CSQC_BUMBLE_HUD();
-               else if(hud == HUD_BUMBLEBEE_GUN)
-                       CSQC_BUMBLE_GUN_HUD();
-       }
- 
        cl_notice_run();
  
        // let's reset the view back to normal for the end

diff --cc qcsrc/client/autocvars.qh
index 21ac57b4683a2a568c6630a9d36aa5737521c4bb,403792020ac7c7e08aa6a412f15abd5e98cffa9b..32641494bb69114e632e38f3099976c6c27e165e
--- 1/qcsrc/client/autocvars.qh
--- 2/qcsrc/client/autocvars.qh
+++ b/qcsrc/client/autocvars.qh
@@@ -338,10 -337,8 +338,10 @@@ float autocvar_hud_panel_weapons_timeou
  float autocvar_hud_panel_weapons_timeout_effect;
  float autocvar_hud_panel_weapons_timeout_fadebgmin;
  float autocvar_hud_panel_weapons_timeout_fadefgmin;
- var float autocvar_hud_panel_weapons_timeout_speed_in = 0.25; 
+ var float autocvar_hud_panel_weapons_timeout_speed_in = 0.25;
  var float autocvar_hud_panel_weapons_timeout_speed_out = 0.75;
 +//float autocvar_hud_panel_quickmenu;
 +float autocvar_hud_panel_quickmenu_align;
  float autocvar_hud_progressbar_alpha;
  float autocvar_hud_showbinds;
  float autocvar_hud_showbinds_limit;

diff --cc qcsrc/client/command/cl_cmd.qc
Simple merge

diff --cc qcsrc/client/hud.qc
Simple merge

diff --cc qcsrc/client/hud.qh
Simple merge

diff --cc qcsrc/client/hud_config.qc
Simple merge

diff --cc qcsrc/common/util.qh
Simple merge

diff --cc qcsrc/menu/xonotic/mainwindow.c
Simple merge