From: Mario Date: Thu, 10 Nov 2016 15:58:10 +0000 (+0000) Subject: Merge branch 'DefaultUser/more_damagetext' into 'master' X-Git-Tag: xonotic-v0.8.2~455 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=530e29e1a8395e12b8b8b44ac1030a84546eb903;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'DefaultUser/more_damagetext' into 'master' Add more options for damagetext {potential} describes the full damage the target took without capping it when the target dies {potential_health} describes the health damage the target took without capping it when the target dies See merge request !382 --- 530e29e1a8395e12b8b8b44ac1030a84546eb903