Merge branch 'master' into fruitiex/fruitbalance

diff --cc balance25.cfg
index 673f08ab74348d2590880b15c6e4b5bbe5642faf,1df67732efaff258f9ea300ca2b4d9e8fd0ba3a2..09e987a5ecc24cb06d5385eb74650be53b05294e
--- 1/balance25.cfg
--- 2/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 a6e66c8d8b93e58c49137e5491ef63a7ccd8b134,7defd001f794853cd137d0b40e8184d751276465..a5e894b4be1c37f9a04e08b3f5be2c357d595c1f
--- 1/balanceTest.cfg
--- 2/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

diff --cc defaultXonotic.cfg
Simple merge