From: terencehill <piuntn@gmail.com>
Date: Thu, 25 May 2023 15:12:25 +0000 (+0000)
Subject: Merge branch 'drjaska/2809-splashdmgforcecalcfix' into 'master'
X-Git-Tag: xonotic-v0.8.6~68
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=90b21340c6f5678a7b0ea3dda116ec7f4fa4352e;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'drjaska/2809-splashdmgforcecalcfix' into 'master'

Resolve "Setting a weapon's primary damage to 1 causes extremely overpowered push"

Closes #2809

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

90b21340c6f5678a7b0ea3dda116ec7f4fa4352e