From: Mario <mario.mario@y7mail.com>
Date: Mon, 3 Aug 2020 07:55:59 +0000 (+0000)
Subject: Merge branch 'terencehill/cl_forceplayercolors_3' into 'master'
X-Git-Tag: xonotic-v0.8.5~790
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c05104bde1e758c4022f9755f02f177aa0476134;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/cl_forceplayercolors_3' into 'master'

cl_forceplayercolors 3 forces player colors to mine only in Duel

See merge request xonotic/xonotic-data.pk3dir!848
---

c05104bde1e758c4022f9755f02f177aa0476134
diff --cc qcsrc/client/csqcmodel_hooks.qc
index 10287ce6e,048669bd2..82b045801
--- a/qcsrc/client/csqcmodel_hooks.qc
+++ b/qcsrc/client/csqcmodel_hooks.qc
@@@ -8,8 -6,9 +8,10 @@@
  #include "weapons/projectile.qh"
  #include <common/animdecide.qh>
  #include <common/ent_cs.qh>
+ #include <common/gamemodes/_mod.qh>
+ #include <common/mapinfo.qh>
  #include <common/physics/movetypes/movetypes.qh>
 +#include <common/physics/player.qh>
  #include <common/viewloc.qh>
  #include <common/effects/all.qh>
  #include <common/effects/all.inc>