projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a4bcbda
ccf145b
)
Merge branch 'Mario/teams_bitflag' into 'master'
author
Mario <zacjardine@y7mail.com>
Thu, 28 Jul 2016 15:02:30 +0000
(15:02 +0000)
committer
Mario <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
patch
|
diff1
|
diff2
|
blob
|
history
qcsrc/common/gamemodes/gamemode/nexball/nexball.qc
patch
|
diff1
|
diff2
|
blob
|
history
qcsrc/common/gamemodes/gamemode/onslaught/onslaught.qc
patch
|
diff1
|
diff2
|
blob
|
history
qcsrc/server/bot/bot.qc
patch
|
diff1
|
diff2
|
blob
|
history
qcsrc/server/cl_client.qc
patch
|
diff1
|
diff2
|
blob
|
history
qcsrc/server/mutators/mutator/gamemode_assault.qc
patch
|
diff1
|
diff2
|
blob
|
history
qcsrc/server/mutators/mutator/gamemode_ctf.qc
patch
|
diff1
|
diff2
|
blob
|
history
qcsrc/server/mutators/mutator/gamemode_invasion.qc
patch
|
diff1
|
diff2
|
blob
|
history
qcsrc/server/mutators/mutator/gamemode_keyhunt.qc
patch
|
diff1
|
diff2
|
blob
|
history
qcsrc/server/mutators/mutator/gamemode_race.qc
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
qcsrc/client/hud/panel/modicons.qc
Simple merge
diff --cc
qcsrc/common/gamemodes/gamemode/nexball/nexball.qc
Simple merge
diff --cc
qcsrc/common/gamemodes/gamemode/onslaught/onslaught.qc
Simple merge
diff --cc
qcsrc/server/bot/bot.qc
Simple merge
diff --cc
qcsrc/server/cl_client.qc
Simple merge
diff --cc
qcsrc/server/mutators/mutator/gamemode_assault.qc
Simple merge
diff --cc
qcsrc/server/mutators/mutator/gamemode_ctf.qc
Simple merge
diff --cc
qcsrc/server/mutators/mutator/gamemode_invasion.qc
Simple merge
diff --cc
qcsrc/server/mutators/mutator/gamemode_keyhunt.qc
Simple merge
diff --cc
qcsrc/server/mutators/mutator/gamemode_race.qc
Simple merge