From: Rudolf Polzer <divVerent@xonotic.org>
Date: Wed, 6 Oct 2010 08:29:41 +0000 (+0200)
Subject: Merge remote branch 'origin/master'
X-Git-Tag: xonotic-v0.1.0preview~308^2^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b9bede8374a53ef578aefc574672bf9af982ba8b;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/master'
---

b9bede8374a53ef578aefc574672bf9af982ba8b
diff --cc balanceLeeStricklin.cfg
index 2ccca9fcc,c1ff93612..8a0ae6c46
--- a/balanceLeeStricklin.cfg
+++ b/balanceLeeStricklin.cfg
@@@ -279,11 -279,10 +279,10 @@@ set g_balance_uzi_speed 1800
  set g_balance_uzi_bulletconstant 300 // 13.1qu
  // }}}
  // {{{ mortar
- set g_balance_grenadelauncher_primary2secondary 0
- set g_balance_grenadelauncher_primary_sticky 0
+ set g_balance_grenadelauncher_primary_type 0
  set g_balance_grenadelauncher_primary_damage 65
  set g_balance_grenadelauncher_primary_edgedamage 35
 -set g_balance_grenadelauncher_primary_force 400
 +set g_balance_grenadelauncher_primary_force 310
  set g_balance_grenadelauncher_primary_radius 140
  set g_balance_grenadelauncher_primary_speed 2000
  set g_balance_grenadelauncher_primary_speed_up 200
@@@ -295,10 -294,15 +294,15 @@@ set g_balance_grenadelauncher_primary_r
  set g_balance_grenadelauncher_primary_animtime 0.3
  set g_balance_grenadelauncher_primary_ammo 2
  set g_balance_grenadelauncher_primary_health 72
- set g_balance_grenadelauncher_secondary_sticky 0
+ set g_balance_grenadelauncher_primary_damageforcescale 0
+ set g_balance_grenadelauncher_primary_bouncefactor 0.7
+ set g_balance_grenadelauncher_primary_bouncestop 0.12
+ set g_balance_grenadelauncher_primary_remote_minbouncecnt 0
+ 
+ set g_balance_grenadelauncher_secondary_type 1
  set g_balance_grenadelauncher_secondary_damage 65
  set g_balance_grenadelauncher_secondary_edgedamage 35
 -set g_balance_grenadelauncher_secondary_force 400
 +set g_balance_grenadelauncher_secondary_force 320
  set g_balance_grenadelauncher_secondary_radius 140
  set g_balance_grenadelauncher_secondary_speed 1400
  set g_balance_grenadelauncher_secondary_speed_up 200