Merge branch 'master' into Mario/cs_clientcvars
authorMario <mario@smbclan.net>
Sat, 5 Aug 2017 10:03:59 +0000 (20:03 +1000)
committerMario <mario@smbclan.net>
Sat, 5 Aug 2017 10:03:59 +0000 (20:03 +1000)
commit3018b03b7ad0decee85f2a659783d0b5309fe5a3
treec7a935ce80eb07d530a51512a7e91f61d7760d59
parent926ed1b0236982412cf330acad1298e0581e4e6e
parent19e5fa4ee9a0bb59c1cec92a1b0501b14f8ccb63
Merge branch 'master' into Mario/cs_clientcvars

# Conflicts:
# qcsrc/server/client.qh
18 files changed:
qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
qcsrc/common/mutators/mutator/nades/nades.qc
qcsrc/common/mutators/mutator/spawn_near_teammate/sv_spawn_near_teammate.qc
qcsrc/common/physics/player.qc
qcsrc/common/t_items.qc
qcsrc/server/bot/default/bot.qc
qcsrc/server/client.qc
qcsrc/server/client.qh
qcsrc/server/command/cmd.qc
qcsrc/server/defs.qh
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/mutator/gamemode_ctf.qc
qcsrc/server/mutators/mutator/gamemode_cts.qc
qcsrc/server/mutators/mutator/gamemode_race.qc
qcsrc/server/player.qc
qcsrc/server/weapons/accuracy.qc
qcsrc/server/weapons/tracing.qc