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)
Make shield reduce force as well (unless selfpush)

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

1  2 
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

Simple merge
Simple merge
Simple merge
Simple merge
diff --cc balance-xdf.cfg
Simple merge
Simple merge
diff --cc balance-xpm.cfg
Simple merge
Simple merge