Merge branch 'master' into TimePath/scoreboard_elo
authorTimePath <andrew.hardaker1995@gmail.com>
Sat, 6 Aug 2016 06:59:04 +0000 (16:59 +1000)
committerTimePath <andrew.hardaker1995@gmail.com>
Sat, 6 Aug 2016 06:59:04 +0000 (16:59 +1000)
commit4f133bdb70d13143f2ce4b9de097744371c1f92a
tree692c792fe6ee326d4b6fc0c4a188ba73984692f5
parent10c0e93c75ef6f408e3357bd5fb46c721e7e0576
parent4d9a40898926a8da83b788f9a862f35cdd4c8905
Merge branch 'master' into TimePath/scoreboard_elo

# Conflicts:
# .gitlab-ci.yml
# qcsrc/common/gamemodes/gamemode/nexball/nexball.qc
# qcsrc/server/mutators/mutator/gamemode_freezetag.qc
# qcsrc/server/mutators/mutator/gamemode_keyhunt.qc
# qcsrc/server/scores_rules.qc
22 files changed:
qcsrc/client/hud/panel/infomessages.qc
qcsrc/client/hud/panel/modicons.qc
qcsrc/client/main.qc
qcsrc/client/main.qh
qcsrc/client/scoreboard.qc
qcsrc/common/gamemodes/gamemode/nexball/nexball.qc
qcsrc/common/gamemodes/gamemode/onslaught/onslaught.qc
qcsrc/dpdefs/doc.md
qcsrc/server/defs.qh
qcsrc/server/g_damage.qc
qcsrc/server/mutators/events.qh
qcsrc/server/mutators/mutator/gamemode_assault.qc
qcsrc/server/mutators/mutator/gamemode_ctf.qc
qcsrc/server/mutators/mutator/gamemode_ctf.qh
qcsrc/server/mutators/mutator/gamemode_cts.qc
qcsrc/server/mutators/mutator/gamemode_domination.qc
qcsrc/server/mutators/mutator/gamemode_freezetag.qc
qcsrc/server/mutators/mutator/gamemode_keepaway.qc
qcsrc/server/mutators/mutator/gamemode_keyhunt.qc
qcsrc/server/mutators/mutator/gamemode_race.qc
qcsrc/server/scores.qc
qcsrc/server/scores_rules.qc