From: unknown <jm@.(none)>
Date: Thu, 11 Nov 2010 22:12:00 +0000 (+0100)
Subject: Merge remote branch 'origin/master' into tzork/balance-tzork
X-Git-Tag: xonotic-v0.1.0preview~153^2~2^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=50fae2ffe748fce0c54b20ef168a702f9607b8db;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/master' into tzork/balance-tzork

Conflicts:
	balancetZork.cfg
---

50fae2ffe748fce0c54b20ef168a702f9607b8db
diff --cc balancetZork.cfg
index 0386e1dd5,56ea71c18..4de12ee5c
--- a/balancetZork.cfg
+++ b/balancetZork.cfg
@@@ -428,10 -394,11 +428,11 @@@ set g_balance_crylink_primary_refire 
  set g_balance_crylink_primary_animtime 0.4
  set g_balance_crylink_primary_ammo 2
  set g_balance_crylink_primary_bouncedamagefactor 0.2
- set g_balance_crylink_primary_joinspeed 2000
- set g_balance_crylink_primary_joinboost 2
+ set g_balance_crylink_primary_joinspeed 0
+ set g_balance_crylink_primary_jointime 0
+ set g_balance_crylink_secondary_linkexplode 1
  
 -set g_balance_crylink_primary_middle_lifetime 5 // range: 10000 full, fades to 20000
 +set g_balance_crylink_primary_middle_lifetime 5 
  set g_balance_crylink_primary_middle_fadetime 5
  set g_balance_crylink_primary_other_lifetime 2 // range: 800 full, fades to 1300
  set g_balance_crylink_primary_other_fadetime 0.25