]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote branch 'remotes/origin/terencehill/newpanelhud' into terencehill/newpanelhud
authorterencehill <piuntn@gmail.com>
Sat, 18 Dec 2010 01:00:58 +0000 (02:00 +0100)
committerterencehill <piuntn@gmail.com>
Sat, 18 Dec 2010 01:00:58 +0000 (02:00 +0100)
1  2 
_hud_descriptions.cfg
qcsrc/client/autocvars.qh
qcsrc/client/hud.qc

Simple merge
Simple merge
index ff15da526407d4e98a05f7595691dd6144f41b4e,0551fd284881d141f1931a2c73b40f0d8a248391..1504a0388d65352f831466c06a847b99ccdb907e
@@@ -3610,10 -3624,9 +3616,10 @@@ void HUD_Score(void
        if(!autocvar__hud_configure)
        {
                if(!autocvar_hud_panel_score) return;
 +              if(spectatee_status == -1 && (gametype == GAME_RACE || gametype == GAME_CTS)) return;
        }
-       else
-               hud_configure_active_panel = HUD_PANEL_SCORE;
+     hud_configure_active_panel = HUD_PANEL_SCORE;
  
        HUD_Panel_UpdateCvars(score);
        vector pos, mySize;
@@@ -5174,10 -5286,9 +5280,10 @@@ void HUD_Physics(void
        if(!autocvar_hud_panel_physics)
        {
                if(!autocvar__hud_configure) return;
 +              if(spectatee_status <= 0 && autocvar_hud_panel_physics < 2) return;
        }
-       else
-               hud_configure_active_panel = HUD_PANEL_PHYSICS;
+     hud_configure_active_panel = HUD_PANEL_PHYSICS;
  
        HUD_Panel_UpdateCvars(physics);