Merge branch 'master' into terencehill/accuracy_shotgun
authorterencehill <piuntn@gmail.com>
Sun, 18 Feb 2018 00:16:40 +0000 (01:16 +0100)
committerterencehill <piuntn@gmail.com>
Sun, 18 Feb 2018 00:16:40 +0000 (01:16 +0100)
commit6e4c0c69ce16c05cdc8ce97c5287c848acfc3b1f
tree3d52a71ca0f60475425ff67ca62adac3f61363ee
parentb945d959784e5b249c66aea4f3326d8ae048f1cd
parentcbd5749bf3064a7b8cde93d3e366719fc9ca1f6a
Merge branch 'master' into terencehill/accuracy_shotgun

# Conflicts:
# qcsrc/common/weapons/weapon/hagar.qc
# qcsrc/server/player.qc
# qcsrc/server/weapons/tracing.qc
qcsrc/common/mutators/mutator/nades/nades.qc
qcsrc/common/weapons/weapon/hagar.qc
qcsrc/server/client.qc
qcsrc/server/defs.qh
qcsrc/server/g_damage.qc
qcsrc/server/player.qc
qcsrc/server/weapons/accuracy.qc
qcsrc/server/weapons/tracing.qc