Merge remote branch 'origin/samual/uzianimtime'
authorRudolf Polzer <divverent@alientrap.org>
Thu, 13 Jan 2011 19:04:12 +0000 (20:04 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 13 Jan 2011 19:04:12 +0000 (20:04 +0100)
1  2 
balance25.cfg
balanceLeeStricklin.cfg
balanceSamual.cfg
balanceXonotic.cfg
balancetZork.cfg
qcsrc/server/autocvars.qh

diff --cc balance25.cfg
Simple merge
Simple merge
Simple merge
@@@ -271,10 -269,11 +271,11 @@@ set g_balance_uzi_spread_max 0.
  set g_balance_uzi_spread_add 0.008
  
  set g_balance_uzi_burst 3                             // # of bullets in a burst (if set to 2 or more)
+ set g_balance_uzi_burst_animtime 0.45
  set g_balance_uzi_burst_refire 0.05           // refire between burst bullets
  set g_balance_uzi_burst_refire2 0.45  // refire after burst
 -set g_balance_uzi_burst_spread 0.05
 -set g_balance_uzi_burst_damage 20       // 100 dps, delivered in 0.15s        
 +set g_balance_uzi_burst_spread 0.07
 +set g_balance_uzi_burst_damage 25
  set g_balance_uzi_burst_force 50
  set g_balance_uzi_burst_ammo 3
  
Simple merge
Simple merge