]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 359f6e1 bf1d2b1)
Merge branch 'drjaska/shotgun-animation-time' into 'master'
authorDr. Jaska <drjaska83@gmail.com>
Tue, 3 Sep 2024 10:56:40 +0000 (10:56 +0000)
committerDr. Jaska <drjaska83@gmail.com>
Tue, 3 Sep 2024 10:56:40 +0000 (10:56 +0000)
Opt-in cvar to block shotgun melee directly after a shot

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


Trivial merge