Merge branch 'master' into Mario/wepent_experimental
authorMario <mario@smbclan.net>
Sat, 31 Dec 2016 05:44:54 +0000 (15:44 +1000)
committerMario <mario@smbclan.net>
Sat, 31 Dec 2016 05:44:54 +0000 (15:44 +1000)
commit707ef9331a9405bbf266ab5aa3a87a175cad8d8f
treed23fe801d6d5c2ca64097cdb36cf102efcafe5f4
parentf03ecd022b871d302176764d819b1a07eeda7997
parent533d6edf085a586bad9635a9ed2cf1102ee58e0c
Merge branch 'master' into Mario/wepent_experimental

# Conflicts:
# qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
# qcsrc/common/turrets/turret/plasma.qc
# qcsrc/common/turrets/turret/plasma_dual.qc
# qcsrc/common/weapons/weapon/vaporizer.qc
# qcsrc/common/weapons/weapon/vortex.qc
21 files changed:
defaultXonotic.cfg
qcsrc/client/view.qc
qcsrc/common/mutators/mutator/breakablehook/sv_breakablehook.qc
qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
qcsrc/common/mutators/mutator/nades/nades.qc
qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
qcsrc/common/turrets/turret/plasma.qc
qcsrc/common/turrets/turret/plasma_dual.qc
qcsrc/common/vehicles/vehicle/bumblebee.qc
qcsrc/common/vehicles/vehicle/raptor.qc
qcsrc/common/vehicles/vehicle/spiderbot.qc
qcsrc/common/weapons/weapon.qh
qcsrc/common/weapons/weapon/vaporizer.qc
qcsrc/common/weapons/weapon/vortex.qc
qcsrc/server/g_damage.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/events.qh
qcsrc/server/player.qc
qcsrc/server/weapons/hitplot.qc
qcsrc/server/weapons/tracing.qc
qcsrc/server/weapons/tracing.qh