Merge branch 'martin-t/shield' into 'master'
authorMario <zacjardine@y7mail.com>
Thu, 8 Feb 2018 00:58:09 +0000 (00:58 +0000)
committerMario <zacjardine@y7mail.com>
Thu, 8 Feb 2018 00:58:09 +0000 (00:58 +0000)
commit5a85c24fccad878b5dbf92c0e98160afe91f8d1b
treeee6627e8bc1a3c02bb24f8466d4c1f16f6a90469
parent9366bc8fa80268a5cc80044db3f38f98ecfea3e6
parent9bf20155ebfc6d7090ac1d317a487393ee9b5468
Merge branch 'martin-t/shield' into 'master'

Make shield reduce force as well (unless selfpush)

See merge request xonotic/xonotic-data.pk3dir!526
balance-mario.cfg
balance-nexuiz25.cfg
balance-overkill.cfg
balance-samual.cfg
balance-xdf.cfg
balance-xonotic.cfg
balance-xpm.cfg
qcsrc/server/autocvars.qh