Merge branch 'master' into Mario/teams_bitflag

diff --cc qcsrc/common/gamemodes/gamemode/nexball/nexball.qc
index d06c48a44d830d0f72273d25ba63a974119284e6,07479cc19714a13487c7ed49fc49ae41bc93e089..1636965e0b79ab70e12d086587a7e20a84eb2443
--- 1/qcsrc/common/gamemodes/gamemode/nexball/nexball.qc
--- 2/qcsrc/common/gamemodes/gamemode/nexball/nexball.qc
+++ b/qcsrc/common/gamemodes/gamemode/nexball/nexball.qc
@@@ -373,10 -373,10 +373,10 @@@ void GoalTouch(entity this, entity touc
                        return;
        if((!ball.pusher && this.team != GOAL_OUT) || ball.cnt)
                return;
-       EXACTTRIGGER_TOUCH;
+       EXACTTRIGGER_TOUCH(this, toucher);
  
  
 -      if(nb_teams == 2)
 +      if(NumTeams(nb_teams) == 2)
                otherteam = OtherTeam(ball.team);
        else
                otherteam = 0;

diff --cc qcsrc/common/gamemodes/gamemode/onslaught/onslaught.qc
Simple merge

diff --cc qcsrc/server/mutators/mutator/gamemode_ca.qc
Simple merge

diff --cc qcsrc/server/mutators/mutator/gamemode_ctf.qc
Simple merge

diff --cc qcsrc/server/mutators/mutator/gamemode_domination.qc
Simple merge

diff --cc qcsrc/server/mutators/mutator/gamemode_keyhunt.qc
Simple merge

diff --cc qcsrc/server/mutators/mutator/gamemode_tdm.qc
Simple merge