]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'martin-t/powerups' into 'master'
authorMario <zacjardine@y7mail.com>
Thu, 8 Feb 2018 00:18:05 +0000 (00:18 +0000)
committerMario <zacjardine@y7mail.com>
Thu, 8 Feb 2018 00:18:05 +0000 (00:18 +0000)
commit44583141c8a87415dc3bf3a9865da77d608b4585
tree0ea2cf091c81c3852ddd3dc169df20548aef889c
parenta3f256a0abdd73217621c9fa6d81bdc03019a545
parent343c42534f49eae166c209946752ab26359381f7
Merge branch 'martin-t/powerups' into 'master'

Option to spawn quad and shield at the same time

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