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

diff --combined balance25.cfg
index e0763be45fc289ae43e34837c887acc29d969b65,81381f4638cbc21084ac14e196e476554331e121..1630a405ce1a7e2466c196fab138f8b11c3b8848
--- 1/balance25.cfg
--- 2/balance25.cfg
+++ b/balance25.cfg
@@@ -258,15 -258,11 +258,15 @@@ set g_balance_shotgun_primary_ammo 
  set g_balance_shotgun_primary_speed 12000
  set g_balance_shotgun_primary_bulletconstant 75 // 3.8qu
  set g_balance_shotgun_secondary 1
 -set g_balance_shotgun_secondary_melee_delay 0.35 // match the anim
 -set g_balance_shotgun_secondary_melee_range 60
 -set g_balance_shotgun_secondary_melee_swing 50
 -set g_balance_shotgun_secondary_melee_time 0.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_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_melee_nonplayerdamage 0
 +set g_balance_shotgun_secondary_melee_multihit 1
  set g_balance_shotgun_secondary_damage 115
  set g_balance_shotgun_secondary_force 150
  set g_balance_shotgun_secondary_refire 1.1
@@@ -701,6 -697,7 +701,7 @@@ set g_balance_tuba_damage 
  set g_balance_tuba_edgedamage 0
  set g_balance_tuba_radius 200
  set g_balance_tuba_force 40
+ set g_balance_tuba_pitchstep 6
  // }}}
  // {{{ fireball
  set g_balance_fireball_primary_ammo 40

diff --combined balanceFruit.cfg
index ba22e635fbb6e621941c522a2ea4442a90d7f8e2,9e73743e9d6bf5a695c860dad883467d0c4ad8f3..9562170a2d685d9b2509bc5cda20116ce8e65a47
--- 1/balanceFruit.cfg
--- 2/balanceFruit.cfg
+++ b/balanceFruit.cfg
@@@ -258,15 -258,11 +258,15 @@@ set g_balance_shotgun_primary_ammo 
  set g_balance_shotgun_primary_speed 12000
  set g_balance_shotgun_primary_bulletconstant 75 // 3.8qu
  set g_balance_shotgun_secondary 1
 -set g_balance_shotgun_secondary_melee_delay 0.35 // match the anim
 -set g_balance_shotgun_secondary_melee_range 85
 -set g_balance_shotgun_secondary_melee_swing 50
 -set g_balance_shotgun_secondary_melee_time 0.1
 -set g_balance_shotgun_secondary_melee_no_doubleslap 0
 +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_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_melee_nonplayerdamage 0
 +set g_balance_shotgun_secondary_melee_multihit 1
  set g_balance_shotgun_secondary_damage 110
  set g_balance_shotgun_secondary_force 150
  set g_balance_shotgun_secondary_refire 1.1
@@@ -701,6 -697,7 +701,7 @@@ set g_balance_tuba_damage 
  set g_balance_tuba_edgedamage 0
  set g_balance_tuba_radius 200
  set g_balance_tuba_force 40
+ set g_balance_tuba_pitchstep 6
  // }}}
  // {{{ fireball
  set g_balance_fireball_primary_ammo 40

diff --combined balanceLeeStricklin.cfg
index 7ed6c97982772d3eb20c5bfebc0afad6cbed2196,b73360f204f479af25598a4ecb83559a3abd4a94..f9f15ab106dd3549f94fa53cfc2b8f47d0fb3170
--- 1/balanceLeeStricklin.cfg
--- 2/balanceLeeStricklin.cfg
+++ b/balanceLeeStricklin.cfg
@@@ -258,15 -258,11 +258,15 @@@ set g_balance_shotgun_primary_ammo 
  set g_balance_shotgun_primary_speed 12000
  set g_balance_shotgun_primary_bulletconstant 75 // 3.8qu
  set g_balance_shotgun_secondary 1
 -set g_balance_shotgun_secondary_melee_delay 0.35 // match the anim
 -set g_balance_shotgun_secondary_melee_range 85
 -set g_balance_shotgun_secondary_melee_swing 50
 -set g_balance_shotgun_secondary_melee_time 0.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_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_melee_nonplayerdamage 0
 +set g_balance_shotgun_secondary_melee_multihit 1
  set g_balance_shotgun_secondary_damage 84
  set g_balance_shotgun_secondary_force 147
  set g_balance_shotgun_secondary_refire 1.1
@@@ -701,6 -697,7 +701,7 @@@ set g_balance_tuba_damage 
  set g_balance_tuba_edgedamage 0
  set g_balance_tuba_radius 200
  set g_balance_tuba_force 40
+ set g_balance_tuba_pitchstep 6
  // }}}
  // {{{ fireball
  set g_balance_fireball_primary_ammo 5

diff --combined balanceXonotic.cfg
index 520849375adcc8edb6497cae6b4be34673153c5e,182e66cb1ccb486be92967163d2036a128321033..c6f78b6cc7a945f14181e82fcf323a16ff044cae
--- 1/balanceXonotic.cfg
--- 2/balanceXonotic.cfg
+++ b/balanceXonotic.cfg
@@@ -260,16 -260,12 +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
@@@ -701,6 -697,7 +701,7 @@@ set g_balance_tuba_damage 
  set g_balance_tuba_edgedamage 0
  set g_balance_tuba_radius 200
  set g_balance_tuba_force 40
+ set g_balance_tuba_pitchstep 6
  // }}}
  // {{{ fireball // this is a superweapon -- lets make it behave as one. 
  set g_balance_fireball_primary_ammo 20

diff --combined balancetZork.cfg
index 7b4746b05e7d975d0007a35d9727ccea83e8f67f,fd229feb9f394aa8157e749d210ab8cd0b751e57..b72343cb940e0db7b5abe3e272d8183bfbce83f7
--- 1/balancetZork.cfg
--- 2/balancetZork.cfg
+++ b/balancetZork.cfg
@@@ -258,15 -258,11 +258,15 @@@ set g_balance_shotgun_primary_ammo 
  set g_balance_shotgun_primary_speed 12000
  set g_balance_shotgun_primary_bulletconstant 75 // 3.8qu
  set g_balance_shotgun_secondary 1
 -set g_balance_shotgun_secondary_melee_delay 0.35 // match the anim
 -set g_balance_shotgun_secondary_melee_range 85
 -set g_balance_shotgun_secondary_melee_swing 50
 -set g_balance_shotgun_secondary_melee_time 0.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_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_melee_nonplayerdamage 0
 +set g_balance_shotgun_secondary_melee_multihit 1
  set g_balance_shotgun_secondary_damage 110
  set g_balance_shotgun_secondary_force 150
  set g_balance_shotgun_secondary_refire 1.1
@@@ -700,6 -696,7 +700,7 @@@ set g_balance_tuba_damage 
  set g_balance_tuba_edgedamage 0
  set g_balance_tuba_radius 200
  set g_balance_tuba_force 40
+ set g_balance_tuba_pitchstep 6
  // }}}
  // {{{ fireball
  set g_balance_fireball_primary_ammo 40