From: terencehill <piuntn@gmail.com>
Date: Sun, 14 Apr 2019 15:43:39 +0000 (+0200)
Subject: Merge branch 'terencehill/ForbidWeaponUse'
X-Git-Tag: xonotic-v0.8.5~1551
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ab8141544c2cacf1e647072ea64749625cc13b00;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/ForbidWeaponUse'

Fix #2201 "ForbidWeaponUse mutator hook can leave the player holding a weapon they no longer possess". ForbidWeaponUse now forbids weapon use but allows switching to another weapon, while the new mutator hook LockWeapon applies both restrictions

Closes #2201

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

ab8141544c2cacf1e647072ea64749625cc13b00