Merge branch 'master' into DefaultUser/kick_teamkiller

# Conflicts:
#	mutators.cfg

diff --cc mutators.cfg
index 1538c684fa8947d7aa4eed368f9b6564b53f1580,c16fda72e32b16f7d7f54df0d66afe772f065147..8bb2d953c719ba6c9a89ff07168a5d1d077d29b6
--- 1/mutators.cfg
--- 2/mutators.cfg
+++ b/mutators.cfg
@@@ -473,8 -478,10 +478,17 @@@ set g_dynamic_handicap_exponent 1 "The 
  set g_dynamic_handicap_min 0 "The minimum value of the handicap."
  set g_dynamic_handicap_max 0 "The maximum value of the handicap."
  
 +// ===============
 +// kick teamkiller
 +// ===============
 +set g_kick_teamkiller_rate 0 "Limit for teamkills per minute before the client gets dropped. 0 means that the teamkillers don't get kicked automatically"
 +set g_kick_teamkiller_lower_limit 5 "Minimum number of teamkills before the teamkill rate is considered"
++
+ // =====================
+ //  stale-move negation
+ // =====================
+ set g_smneg 0 "Stale-move negation: penalize repeated use of the same weapon"
+ set g_smneg_bonus 1 "Stale-move negation: allow weapons to become stronger than their baseline"
+ set g_smneg_bonus_asymptote 4 "Stale-move negation: damage = infinity at this bonus level"
+ set g_smneg_cooldown_factor 0.25 "Stale-move negation: penalty cooldown factor"
++

diff --cc qcsrc/common/mutators/mutator/_mod.inc
Simple merge

diff --cc qcsrc/common/mutators/mutator/_mod.qh
Simple merge

diff --cc qcsrc/common/notifications/all.inc
Simple merge

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

diff --cc qcsrc/server/client.qh
Simple merge

diff --cc qcsrc/server/defs.qh
Simple merge

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

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