Merge branch 'Mario/teams_bitflag' into 'master'
authorMario <zacjardine@y7mail.com>
Thu, 28 Jul 2016 15:02:30 +0000 (15:02 +0000)
committerMario <zacjardine@y7mail.com>
Thu, 28 Jul 2016 15:02:30 +0000 (15:02 +0000)
Merge branch Mario/teams_bitflag (M merge request)

Adds support for odd team matches, such as pink vs blue and yellow vs red.

See merge request !335

1  2 
qcsrc/client/hud/panel/modicons.qc
qcsrc/common/gamemodes/gamemode/nexball/nexball.qc
qcsrc/common/gamemodes/gamemode/onslaught/onslaught.qc
qcsrc/server/bot/bot.qc
qcsrc/server/cl_client.qc
qcsrc/server/mutators/mutator/gamemode_assault.qc
qcsrc/server/mutators/mutator/gamemode_ctf.qc
qcsrc/server/mutators/mutator/gamemode_invasion.qc
qcsrc/server/mutators/mutator/gamemode_keyhunt.qc
qcsrc/server/mutators/mutator/gamemode_race.qc

Simple merge
Simple merge
Simple merge