From: Dr. Jaska Date: Tue, 3 Sep 2024 10:56:40 +0000 (+0000) Subject: Merge branch 'drjaska/shotgun-animation-time' into 'master' X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=92b4bd72ed502fe69297411077caa9cf8464cdaf;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'drjaska/shotgun-animation-time' into 'master' Opt-in cvar to block shotgun melee directly after a shot See merge request xonotic/xonotic-data.pk3dir!1173 --- 92b4bd72ed502fe69297411077caa9cf8464cdaf