From: Rudolf Polzer <divverent@alientrap.org>
Date: Sat, 6 Nov 2010 21:38:22 +0000 (+0100)
Subject: Merge branch 'master' into fruitiex/fruitbalance
X-Git-Tag: xonotic-v0.1.0preview~183^2~5
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=cdf4fd224cc017619bae2b01f07a5c5dff74af18;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into fruitiex/fruitbalance
---

cdf4fd224cc017619bae2b01f07a5c5dff74af18
diff --cc balance25.cfg
index 673f08ab7,1df67732e..09e987a5e
--- a/balance25.cfg
+++ b/balance25.cfg
@@@ -222,10 -222,8 +222,10 @@@ set g_balance_laser_primary_refire 0.
  set g_balance_laser_primary_animtime 0.3
  set g_balance_laser_primary_lifetime 30
  set g_balance_laser_primary_shotangle 0
- set g_balance_laser_primary_delay 0
+ set g_balance_laser_primary_delay 0.05
  set g_balance_laser_primary_gauntlet 0
 +set g_balance_laser_primary_force_zscale 1
 +set g_balance_laser_primary_force_velocitybias 0
  set g_balance_laser_secondary 0 // when 1, a secondary laser mode exists
  set g_balance_laser_secondary_damage 35
  set g_balance_laser_secondary_edgedamage 10
diff --cc balanceTest.cfg
index a6e66c8d8,7defd001f..a5e894b4b
--- a/balanceTest.cfg
+++ b/balanceTest.cfg
@@@ -222,10 -222,8 +222,10 @@@ set g_balance_laser_primary_refire 0.
  set g_balance_laser_primary_animtime 0.6
  set g_balance_laser_primary_lifetime 5
  set g_balance_laser_primary_shotangle 0
- set g_balance_laser_primary_delay 0
+ set g_balance_laser_primary_delay 0.03
  set g_balance_laser_primary_gauntlet 0
 +set g_balance_laser_primary_force_zscale 1
 +set g_balance_laser_primary_force_velocitybias 0.25
  set g_balance_laser_secondary 0 // when 1, a secondary laser mode exists
  set g_balance_laser_secondary_damage 35
  set g_balance_laser_secondary_edgedamage 10