Merge branch 'master' into terencehill/quickmenu

diff --cc defaultXonotic.cfg
Simple merge

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

diff --cc qcsrc/client/View.qc
index ee5c56e02767060902e517897e9ee9b4eb98b14f,d9f6df7ee77281fdf2e52b650d25680dec5f72a9..66fdd710bc308846a13510872c91cfa232d56761
--- 1/qcsrc/client/View.qc
--- 2/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@@ -445,10 -457,10 +457,10 @@@ void CSQC_UpdateView(float w, float h
        }
        
        // do lockview after event chase camera so that it still applies whenever necessary.
 -      if(autocvar_cl_lockview || (autocvar__hud_configure && spectatee_status <= 0) || intermission > 1)
 +      if(autocvar_cl_lockview || (autocvar__hud_configure && spectatee_status <= 0) || intermission > 1 || HUD_QuickMenu_IsOpened())
        {
-               R_SetView(VF_ORIGIN, freeze_org);
-               R_SetView(VF_ANGLES, freeze_ang);
+               setproperty(VF_ORIGIN, freeze_org);
+               setproperty(VF_ANGLES, freeze_ang);
        }
        else
        {
@@@ -1410,24 -1426,21 +1426,24 @@@
  
        if(autocvar__hud_configure)
                HUD_Panel_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_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();
 +      }
 +
        // let's reset the view back to normal for the end
-       R_SetView(VF_MIN, '0 0 0');
-       R_SetView(VF_SIZE, '1 0 0' * w + '0 1 0' * h);
+       setproperty(VF_MIN, '0 0 0');
+       setproperty(VF_SIZE, '1 0 0' * w + '0 1 0' * h);
  }
  
  

diff --cc qcsrc/client/autocvars.qh
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/constants.qh
Simple merge