Merge remote branch 'origin/master' into samual/balance

diff --cc defaultXonotic.cfg
Simple merge

diff --cc qcsrc/client/Main.qc
index 4fdb5078ff961a4f9b1c7f6eafc410efc068c37c,58dfe22830b1701ff4406784e4a5a7533c723c4b..6fb5f65859fab6707db7248ccaa3f7e79548d99a
--- 1/qcsrc/client/Main.qc
--- 2/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@@ -140,12 -137,21 +136,15 @@@ void CSQC_Init(void
        DamageInfo_Precache();
        Vehicles_Precache();
        turrets_precache();
 -
 -      if(autocvar_cl_announcer != cl_announcer_prev) {
 -              Announcer_Precache();
 -              if(cl_announcer_prev)
 -                      strunzone(cl_announcer_prev);
 -              cl_announcer_prev = strzone(autocvar_cl_announcer);
 -      }
 +  Announcer_Precache();
        Tuba_Precache();
- 
-       if(autocvar_cl_reticle_item_normal) precache_pic("gfx/reticle_normal");
-       if(autocvar_cl_reticle_item_nex) precache_pic("gfx/reticle_nex");
- 
+       
+       if(autocvar_cl_reticle)
+       {
+               if(autocvar_cl_reticle_item_normal) { precache_pic("gfx/reticle_normal"); }
+               if(autocvar_cl_reticle_item_nex) { precache_pic("gfx/reticle_nex"); }
+       }
+       
        get_mi_min_max_texcoords(1); // try the CLEVER way first
        minimapname = strcat("gfx/", mi_shortname, "_radar.tga");
        shortmapname = mi_shortname;

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

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

diff --cc qcsrc/server/autocvars.qh
Simple merge

diff --cc qcsrc/server/w_uzi.qc
Simple merge