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)
commit87cbf00c7734cf2910502c217b5c5157511ba5ea
tree250880e9a38ed1713b82c45065adb559c6faaaba
parenta4bcbda7a1eb2367fae1c2514d474d426803a673
parentccf145b9b0372a5b402465ab578ca48d943ffd88
Merge branch 'Mario/teams_bitflag' into 'master'

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
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