git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit

]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit

projects / xonotic / xonotic-data.pk3dir.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 9366bc8 9bf2015)

author	Mario <zacjardine@y7mail.com>
	Thu, 8 Feb 2018 00:58:09 +0000 (00:58 +0000)
committer	Mario <zacjardine@y7mail.com>
	Thu, 8 Feb 2018 00:58:09 +0000 (00:58 +0000)
commit	5a85c24fccad878b5dbf92c0e98160afe91f8d1b
tree	ee6627e8bc1a3c02bb24f8466d4c1f16f6a90469	tree \| snapshot
parent	9366bc8fa80268a5cc80044db3f38f98ecfea3e6	commit \| diff
parent	9bf20155ebfc6d7090ac1d317a487393ee9b5468	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
balance-nexuiz25.cfg	diff1 \|	diff2 \|	blob \| history
balance-overkill.cfg	diff1 \|	diff2 \|	blob \| history
balance-samual.cfg	diff1 \|	diff2 \|	blob \| history
balance-xdf.cfg	diff1 \|	diff2 \|	blob \| history
balance-xonotic.cfg	diff1 \|	diff2 \|	blob \| history
balance-xpm.cfg	diff1 \|	diff2 \|	blob \| history
qcsrc/server/autocvars.qh	diff1 \|	diff2 \|	blob \| history