Merge branch 'master' into mirceakitsune/universal_reload_system

diff --cc balanceXonotic.cfg
index 03712f87075052f4904d9d474fcbc5e07069b67d,e5adab9627bc926ed79ae43fbe94f22305542b7b..bf1eed8529f74e446b3b7dc3a4cac9ff7b132c92
--- 1/balanceXonotic.cfg
--- 2/balanceXonotic.cfg
+++ b/balanceXonotic.cfg
@@@ -411,13 -399,11 +411,13 @@@ set g_balance_electro_combo_force 8
  set g_balance_electro_combo_radius 250
  set g_balance_electro_combo_comboradius 0
  set g_balance_electro_combo_speed 400
 +set g_balance_electro_reload_ammo 20
 +set g_balance_electro_reload_time 2
  // }}}
  // {{{ crylink
- set g_balance_crylink_primary_damage 10
- set g_balance_crylink_primary_edgedamage 6
- set g_balance_crylink_primary_force 40
+ set g_balance_crylink_primary_damage 7 // LOG: 10 -> 7
+ set g_balance_crylink_primary_edgedamage 4 // LOG: 6 -> 4
+ set g_balance_crylink_primary_force 35
  set g_balance_crylink_primary_radius 80
  set g_balance_crylink_primary_speed 1500
  set g_balance_crylink_primary_spread 0.05
@@@ -769,9 -738,7 +769,9 @@@ set g_balance_seeker_tag_animtime 0.
  set g_balance_seeker_tag_damageforcescale 4
  set g_balance_seeker_tag_health 5
  set g_balance_seeker_tag_lifetime 15
- set g_balance_seeker_tag_refire 0.7
+ set g_balance_seeker_tag_refire 0.75 // LOG: 0.7 -> 0.75
  set g_balance_seeker_tag_speed 5000
  set g_balance_seeker_tag_spread 0
 +set g_balance_seeker_reload_ammo 15
 +set g_balance_seeker_reload_time 2
  // End new seeker

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

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

diff --cc qcsrc/server/bot/havocbot/havocbot.qc
Simple merge