Merge branch 'master' into Mario/rainbow_crosshair

diff --combined qcsrc/client/View.qc
index 06ee7d94b3f52b30bda8703614f4ee5b14d4fb94,d27fd4d98e8927cddc2fa255496a39124c2c27af..e6d2f925e4a246cb67cbf5081193bd7181fa678d
--- 1/qcsrc/client/View.qc
--- 2/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@@ -381,9 -381,6 +381,9 @@@ vector damage_blurpostprocess, content_
  
  float checkfail[16];
  
 +float last_flicker;
 +vector previous_color;
 +
  #define BUTTON_3 4
  #define BUTTON_4 8
  float cl_notice_run();
@@@ -898,8 -895,8 +898,8 @@@ void CSQC_UpdateView(float w, float h
                        }
                }
        }
-       
-       if(autocvar_hud_damage)
+ 
+       if(autocvar_hud_damage && !getstati(STAT_FROZEN))
        {
                splash_size_x = max(vid_conwidth, vid_conheight);
                splash_size_y = max(vid_conwidth, vid_conheight);
@@@ -1083,7 -1080,7 +1083,7 @@@
                        if(getstatf(STAT_REVIVE_PROGRESS))
                        {
                                DrawCircleClippedPic(eX * 0.5 * vid_conwidth + eY * 0.6 * vid_conheight, 0.1 * vid_conheight, "gfx/crosshair_ring.tga", getstatf(STAT_REVIVE_PROGRESS), '0.25 0.90 1', autocvar_hud_colorflash_alpha, DRAWFLAG_ADDITIVE);
-                               drawstring_aspect(eY * 0.64 * vid_conheight, "Revival progress", eX * vid_conwidth + eY * 0.025 * vid_conheight, '1 1 1', 1, DRAWFLAG_NORMAL);
+                               drawstring_aspect(eY * 0.64 * vid_conheight, _("Revival progress"), eX * vid_conwidth + eY * 0.025 * vid_conheight, '1 1 1', 1, DRAWFLAG_NORMAL);
                        }
                }
  
@@@ -1406,16 -1403,6 +1406,16 @@@
                                        if (ring_value)
                                                DrawCircleClippedPic(wcross_origin, wcross_size_x * ring_scale, ring_image, ring_value, ring_rgb, wcross_alpha * ring_alpha, DRAWFLAG_ADDITIVE);
                                }
 +                              
 +                              if(autocvar_crosshair_rainbow)
 +                              {
 +                                      if(time >= last_flicker)
 +                                      {
 +                                              previous_color = randomvec() * autocvar_crosshair_rainbow_brightness;
 +                                              last_flicker = time + autocvar_crosshair_rainbow_delay;
 +                                      }
 +                                      wcross_color = previous_color;
 +                              }
  
  #define CROSSHAIR_DO_BLUR(M,sz,wcross_name,wcross_alpha) \
                                do \

diff --combined qcsrc/client/autocvars.qh
index f94846b0bc48afcf887f29f4e7905805cc5b6995,c13e2bf6e837ccb7a8b81817398470b5997d96c0..4bc11f4e35aeb14afa6e225264ffb8f9da375bca
--- 1/qcsrc/client/autocvars.qh
--- 2/qcsrc/client/autocvars.qh
+++ b/qcsrc/client/autocvars.qh
@@@ -130,9 -130,6 +130,9 @@@ float autocvar_crosshair_ring_reload
  float autocvar_crosshair_ring_reload_alpha;
  float autocvar_crosshair_ring_reload_size;
  float autocvar_crosshair_size;
 +float autocvar_crosshair_rainbow;
 +var float autocvar_crosshair_rainbow_brightness = 2;
 +var float autocvar_crosshair_rainbow_delay = 0.1;
  float autocvar_ekg;
  float autocvar_fov;
  float autocvar_g_balance_damagepush_speedfactor;
@@@ -256,7 -253,9 +256,9 @@@ float autocvar_hud_panel_healtharmor_te
  float autocvar_hud_panel_infomessages;
  float autocvar_hud_panel_infomessages_flip;
  float autocvar_hud_panel_modicons;
+ float autocvar_hud_panel_modicons_ca_layout;
  float autocvar_hud_panel_modicons_dom_layout;
+ float autocvar_hud_panel_modicons_freezetag_layout;
  float autocvar_hud_panel_notify;
  float autocvar_hud_panel_notify_fadetime;
  float autocvar_hud_panel_notify_flip;