Merge branch 'martin-t/globals' into 'master'
authorMario <mario.mario@y7mail.com>
Sun, 29 Sep 2019 08:29:53 +0000 (08:29 +0000)
committerMario <mario.mario@y7mail.com>
Sun, 29 Sep 2019 08:29:53 +0000 (08:29 +0000)
Deglobalization - part 1

See merge request xonotic/xonotic-data.pk3dir!623

1  2 
qcsrc/client/view.qc
qcsrc/common/mutators/mutator/dodging/sv_dodging.qc
qcsrc/common/weapons/weapon/shockwave.qc
qcsrc/server/weapons/tracing.qc
qcsrc/server/weapons/weaponsystem.qc

Simple merge
Simple merge
Simple merge