Merge branch 'martin-t/weapon_switch' into 'master'
authorMario <zacjardine@y7mail.com>
Sun, 21 Oct 2018 16:47:21 +0000 (16:47 +0000)
committerMario <zacjardine@y7mail.com>
Sun, 21 Oct 2018 16:47:21 +0000 (16:47 +0000)
commite2516570a59a8cfb46c528d6d50cbb2d6a39b32b
treeb21c4c02d832c4666d180f0b2dd427a50c43a162
parent2ed18f83d8ee7479c3c3a0e86497bdcc85bb39a4
parentca28b3282b10ed5651fbd2e2e03912f8a591ecc0
Merge branch 'martin-t/weapon_switch' into 'master'

Option to not reload by weapswitch and not fallback to other weaps from the impulse

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