From: Mario Date: Sat, 31 Dec 2016 01:28:57 +0000 (+1000) Subject: Merge branch 'master' into martin-t/maxshotdist X-Git-Tag: xonotic-v0.8.2~341^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=80afa8735de5af3e81d880e9980c7d9fbc3e481c;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into martin-t/maxshotdist --- 80afa8735de5af3e81d880e9980c7d9fbc3e481c diff --cc qcsrc/server/mutators/mutator/gamemode_assault.qc index f4b896401,399874143..28e91f26a --- a/qcsrc/server/mutators/mutator/gamemode_assault.qc +++ b/qcsrc/server/mutators/mutator/gamemode_assault.qc @@@ -1,8 -1,7 +1,9 @@@ #include "gamemode_assault.qh" +#include + .entity sprite; + #define AS_ROUND_DELAY 5 // random functions void assault_objective_use(entity this, entity actor, entity trigger)