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

diff --combined defaultXonotic.cfg
index 9f0c44d3a36d245bd677bfe896133fa47932f450,d038dc523c1df5762333a6c82066c39f789511e4..95adfb723c0b06a4f0ab9111cd5d2e120d80ed5a
--- 1/defaultXonotic.cfg
--- 2/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -188,16 -188,12 +188,16 @@@ seta crosshair_fireball_size 1  "crossha
  seta crosshair_color_by_health 0 "if enabled, crosshair color will depend on current health"
  
  // ring around crosshair, used for various purposes (such as indicating bullets left in clip, nex charge)
 +seta crosshair_ring 1 "main cvar to enable or disable crosshair rings"
 +seta crosshair_ring_inner 0 "allow inner rings to be drawn too"
  seta crosshair_ring_size 2    "bullet counter ring size for Rifle, velocity ring for Nex"
  seta crosshair_ring_alpha 0.2 "ring alpha"
  
 +seta crosshair_ring_sniperrifle 1 "draw a ring showing the ammount of ammo left in the sniperrifle
  seta crosshair_ring_sniperrifle_alpha 0.15
  
 -seta crosshair_ring_nex_outer_alpha 0.15
 +seta crosshair_ring_nex 1 "draw a ring showing the current charge of the nexgun"
 +seta crosshair_ring_nex_alpha 0.15
  seta crosshair_ring_nex_inner_alpha 0.15
  seta crosshair_ring_nex_inner_color_red 0.8
  seta crosshair_ring_nex_inner_color_green 0
@@@ -205,9 -201,6 +205,9 @@@ seta crosshair_ring_nex_inner_color_blu
  seta crosshair_ring_nex_currentcharge_scale 30
  seta crosshair_ring_nex_currentcharge_movingavg_rate 0.05
  
 +seta crosshair_ring_minelayer 1
 +seta crosshair_ring_minelayer_alpha 0.15
 +
  seta cl_reticle_stretch 0 "whether to stretch reticles so they fit the screen (brakes image proportions)"
  seta cl_reticle_item_nex 1 "draw aiming reticle for the nex weapon's zoom, 0 disables and values between 0 and 1 change alpha"
  seta cl_reticle_item_normal 1 "draw reticle when zooming with the zoom button, 0 disables and values between 0 and 1 change alpha"
@@@ -2110,7 -2103,6 +2110,6 @@@ exec ctfscoring-ai.cf
  exec effects-normal.cfg
  exec physicsX0.cfg
  exec turrets.cfg
- exec font-xolonium.cfg
  
  // hud cvar descriptions
  exec _hud_descriptions.cfg

diff --combined qcsrc/client/autocvars.qh
index 01bcce10edbb478da3d1be84bbad3dc4e2921c86,0cf1e4bf8dc8d5f76652fa0141d269ce66ff358f..867859c571de307787db1182970cb8a201619f30
--- 1/qcsrc/client/autocvars.qh
--- 2/qcsrc/client/autocvars.qh
+++ b/qcsrc/client/autocvars.qh
@@@ -108,21 -108,15 +108,21 @@@ float autocvar_crosshair_hittest_showim
  float autocvar_crosshair_per_weapon;
  float autocvar_crosshair_pickup;
  float autocvar_crosshair_pickup_speed;
 -float autocvar_crosshair_ring_sniperrifle_alpha;
 +float autocvar_crosshair_ring;
 +float autocvar_crosshair_ring_inner;
 +float autocvar_crosshair_ring_minelayer;
 +float autocvar_crosshair_ring_minelayer_alpha;
 +float autocvar_crosshair_ring_nex;
 +float autocvar_crosshair_ring_nex_alpha;
  float autocvar_crosshair_ring_nex_currentcharge_movingavg_rate;
  float autocvar_crosshair_ring_nex_currentcharge_scale;
  float autocvar_crosshair_ring_nex_inner_alpha;
  float autocvar_crosshair_ring_nex_inner_color_blue;
  float autocvar_crosshair_ring_nex_inner_color_green;
  float autocvar_crosshair_ring_nex_inner_color_red;
 -float autocvar_crosshair_ring_nex_outer_alpha;
  float autocvar_crosshair_ring_size;
 +float autocvar_crosshair_ring_sniperrifle;
 +float autocvar_crosshair_ring_sniperrifle_alpha;
  float autocvar_crosshair_size;
  float autocvar_ekg;
  float autocvar_fov;
@@@ -215,6 -209,7 +215,7 @@@ float autocvar_hud_panel_modicons
  float autocvar_hud_panel_notify;
  float autocvar_hud_panel_notify_fadetime;
  float autocvar_hud_panel_notify_flip;
+ float autocvar_hud_panel_notify_fontsize;
  float autocvar_hud_panel_notify_print;
  float autocvar_hud_panel_notify_time;
  float autocvar_hud_panel_powerups;

diff --combined qcsrc/server/defs.qh
index ee961d6664d06cd8cd84b6892d18fb446fb40fe4,32ff5ab9879b081ac040d18da992e4442a3feeb1..d008f15d9530d5abf8f45375dae48eafd48ce9fc
--- 1/qcsrc/server/defs.qh
--- 2/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@@ -84,8 -84,6 +84,6 @@@ float maxclients
  .vector       pos1, pos2;
  .vector       mangle;
  
- .float cvar_cl_hitsound;
- 
  .float        pain_finished;                  //Added by Supajoe
  .float        pain_frame;                     //"
  .float        statdraintime;                  // record the one-second intervals between draining health and armour when they're over 100
@@@ -402,10 -400,6 +400,6 @@@ float assault_attacker_team
  .float speedrunning;
  
  // Q3 support
- .float notteam;
- .float notsingle;
- .float notfree;
- .float notq3a;
  float q3acompat_machineshotgunswap;
  
  // database
@@@ -617,7 -611,6 +611,7 @@@ float client_cefc_accumulator
  float client_cefc_accumulatortime;
  #endif
  
 +.float minelayer_mines;
  .float sniperrifle_bulletcounter;
  .float wish_reload;
  

diff --combined qcsrc/server/g_world.qc
index 51c98ec46274982be1335595a14fdcf58718d0ee,84402f0139441e3eda2e1e2945443006a013c67a..374f17c7bbe3d334f27f2e83c3a99dda6a4e24f7
--- 1/qcsrc/server/g_world.qc
--- 2/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@@ -827,7 -827,6 +827,7 @@@ void spawnfunc_worldspawn (void
        addstat(STAT_LAST_PICKUP, AS_FLOAT, last_pickup);
        addstat(STAT_HIT_TIME, AS_FLOAT, hit_time);
        addstat(STAT_TYPEHIT_TIME, AS_FLOAT, typehit_time);
 +      addstat(STAT_LAYED_MINES, AS_INT, minelayer_mines);
  
        addstat(STAT_NEX_CHARGE, AS_FLOAT, nex_charge);
        addstat(STAT_NEX_CHARGEPOOL, AS_FLOAT, nex_chargepool_ammo);
@@@ -2844,14 -2843,14 +2844,14 @@@ void EndFrame(
                {
                        if(self.enemy.typehitsound)
                                self.typehit_time = time;
-                       else if(self.enemy.hitsound && self.cvar_cl_hitsound)
+                       else if(self.enemy.hitsound)
                                self.hit_time = time;
                }
                else
                {
                        if(self.typehitsound)
                                self.typehit_time = time;
-                       else if(self.hitsound && self.cvar_cl_hitsound)
+                       else if(self.hitsound)
                                self.hit_time = time;
                }
        }