Merge branch 'samual/new_shotgun_tracing' into samual/balance

diff --combined balanceXonotic.cfg
index 38c84c2d17f795ff3dead80ffe94386e64af77ca,c6f78b6cc7a945f14181e82fcf323a16ff044cae..8f38e3040d682e493921fc14657f24e3fccdc791
--- 1/balanceXonotic.cfg
--- 2/balanceXonotic.cfg
+++ b/balanceXonotic.cfg
@@@ -260,12 -260,16 +260,16 @@@ set g_balance_shotgun_primary_bulletcon
  set g_balance_shotgun_secondary 1
  set g_balance_shotgun_secondary_melee_delay 0.25 // 0.35 was too slow
  set g_balance_shotgun_secondary_melee_range 120
- set g_balance_shotgun_secondary_melee_swing 50
- set g_balance_shotgun_secondary_melee_time 0.1
+ set g_balance_shotgun_secondary_melee_swing_side 120
+ set g_balance_shotgun_secondary_melee_swing_up 30
+ set g_balance_shotgun_secondary_melee_time 0.15
+ set g_balance_shotgun_secondary_melee_traces 10
  set g_balance_shotgun_secondary_melee_no_doubleslap 1
- set g_balance_shotgun_secondary_damage 110
+ set g_balance_shotgun_secondary_melee_nonplayerdamage 40
+ set g_balance_shotgun_secondary_melee_multihit 1
+ set g_balance_shotgun_secondary_damage 100
  set g_balance_shotgun_secondary_force 200
- set g_balance_shotgun_secondary_refire 1.1
+ set g_balance_shotgun_secondary_refire 1.25
  set g_balance_shotgun_secondary_animtime 1
  set g_balance_shotgun_reload_ammo 0 //default: 5
  set g_balance_shotgun_reload_time 2
@@@ -375,8 -379,8 +379,8 @@@ set g_balance_minelayer_reload_time 
  // }}}
  // {{{ electro
  set g_balance_electro_lightning 0
 -set g_balance_electro_primary_damage 55
 -set g_balance_electro_primary_edgedamage 27.5
 +set g_balance_electro_primary_damage 40
 +set g_balance_electro_primary_edgedamage 20
  set g_balance_electro_primary_force 200
  set g_balance_electro_primary_force_up 0
  set g_balance_electro_primary_radius 100
@@@ -409,8 -413,8 +413,8 @@@ set g_balance_electro_secondary_damagef
  set g_balance_electro_secondary_count 3
  set g_balance_electro_secondary_bouncefactor 0.4
  set g_balance_electro_secondary_bouncestop 0.05
 -set g_balance_electro_combo_damage 40
 -set g_balance_electro_combo_edgedamage 20
 +set g_balance_electro_combo_damage 50
 +set g_balance_electro_combo_edgedamage 25
  set g_balance_electro_combo_force 120
  set g_balance_electro_combo_radius 175
  set g_balance_electro_combo_comboradius 275
@@@ -552,7 -556,7 +556,7 @@@ set g_balance_hagar_secondary_damage 4
  set g_balance_hagar_secondary_edgedamage 20
  set g_balance_hagar_secondary_force 50
  set g_balance_hagar_secondary_radius 80
 -set g_balance_hagar_secondary_spread 0.06
 +set g_balance_hagar_secondary_spread 0.05
  set g_balance_hagar_secondary_speed 2000
  set g_balance_hagar_secondary_lifetime_min 10
  set g_balance_hagar_secondary_lifetime_rand 0