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

Conflicts:
	balancetZork.cfg
	qcsrc/server/w_crylink.qc

diff --cc balance25.cfg
Simple merge

diff --cc balanceLeeStricklin.cfg
Simple merge

diff --cc balanceNexSVN.cfg
Simple merge

diff --cc balanceSamual.cfg
Simple merge

diff --cc balanceTest.cfg
Simple merge

diff --cc balanceXonotic.cfg
Simple merge

diff --cc balancetZork.cfg
index 11733c3fa429a2479e47140c685cef624c8497ad,ab53f475339e2d06d2b511c3d6f01d9ea8fefde2..22371f25e67f91e8cf5f735edd9ae6b4bf636911
--- 1/balancetZork.cfg
--- 2/balancetZork.cfg
+++ b/balancetZork.cfg
@@@ -429,15 -394,12 +428,20 @@@ 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 0
 +set g_balance_crylink_primary_joinspeed 2000
 +set g_balance_crylink_primary_joinboost 2
  
 -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
++<<<<<<< HEAD
 +set g_balance_crylink_primary_star_lifetime   5 
 +set g_balance_crylink_primary_star_fadetime   5
 +set g_balance_crylink_primary_other_lifetime  5 
 +set g_balance_crylink_primary_other_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
++>>>>>>> origin/master
  
  set g_balance_crylink_secondary 1
  set g_balance_crylink_secondary_damage 2
@@@ -542,14 -503,9 +546,20 @@@ set g_balance_rocketlauncher_guiderated
  set g_balance_rocketlauncher_guidegoal 512 // goal distance for (non-laser) guiding (higher = less control, lower = erratic)
  set g_balance_rocketlauncher_guidedelay 0.15 // delay before guiding kicks in
  set g_balance_rocketlauncher_guidestop 0 // stop guiding when firing again
++<<<<<<< HEAD
 +set g_balance_rocketlauncher_laserguided_speed 1000 //650
 +set g_balance_rocketlauncher_laserguided_speedaccel 0
 +set g_balance_rocketlauncher_laserguided_speedstart 1000
 +set g_balance_rocketlauncher_laserguided_turnrate 0.75 //0.5
 +set g_balance_rocketlauncher_laserguided_allow_steal 1
 +set g_balance_rocketlauncher_remote_damage 120
 +set g_balance_rocketlauncher_remote_edgedamage 25
 +set g_balance_rocketlauncher_remote_radius 130
++=======
+ set g_balance_rocketlauncher_remote_damage 90
+ set g_balance_rocketlauncher_remote_edgedamage 20
+ set g_balance_rocketlauncher_remote_radius 125
++>>>>>>> origin/master
  set g_balance_rocketlauncher_remote_force 350
  // }}}
  // {{{ porto

diff --cc qcsrc/server/cl_client.qc
Simple merge

diff --cc qcsrc/server/defs.qh
index fc01718ca10102692114dee3b0235097aa975296,95fce0ade3b7a284ad646a88e56001f55ab4a6b4..5302aef503b1b851ff1a17437aa7135bec98d2d8
--- 1/qcsrc/server/defs.qh
--- 2/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@@ -658,6 -654,7 +654,8 @@@ string deathmessage
  .entity realowner;
  
  .float nex_charge;
 +.float nex_charge_rottime;
  
  float allowed_to_spawn; // boolean variable used by the clan arena code to determine if a player can spawn (after the round has ended)
+ 
+ float serverflags;

diff --cc qcsrc/server/w_crylink.qc
index bf65d03b8f071ebfe3cd4ada1cdb8c6a52aed827,566563487b768b7e82fe761df97b9b3f3cbf3b68..f3d9a6cbf97881aeccc07f77e8a97107047b40ae
--- 1/qcsrc/server/w_crylink.qc
--- 2/qcsrc/server/w_crylink.qc
+++ b/qcsrc/server/w_crylink.qc
@@@ -518,4 -562,4 +562,4 @@@ float w_crylink(float req
        return TRUE;
  }
  #endif
--#endif
++#endif