Merge branch 'master' into terencehill/gameover_stuff
authorterencehill <piuntn@gmail.com>
Thu, 3 Nov 2016 18:58:13 +0000 (19:58 +0100)
committerterencehill <piuntn@gmail.com>
Thu, 3 Nov 2016 18:58:13 +0000 (19:58 +0100)
commit8f08a117d2eada0c38cb1d07a0798daf192dd666
tree06d474e29818210358c91cd08dd89522b8d5d6a5
parent922354d1191d534b0b12516e28561bc70cbe2a87
parent42847fddd58877c481212d07cd914d3741434ecd
Merge branch 'master' into terencehill/gameover_stuff
14 files changed:
qcsrc/client/defs.qh
qcsrc/client/view.qc
qcsrc/common/stats.qh
qcsrc/server/bot/default/bot.qc
qcsrc/server/client.qc
qcsrc/server/command/vote.qc
qcsrc/server/defs.qh
qcsrc/server/g_hook.qc
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/mutator/gamemode_assault.qc
qcsrc/server/mutators/mutator/gamemode_keyhunt.qc
qcsrc/server/player.qc
qcsrc/server/weapons/weaponsystem.qc