]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'DefaultUser/more_damagetext' into 'master'
authorMario <zacjardine@y7mail.com>
Thu, 10 Nov 2016 15:58:10 +0000 (15:58 +0000)
committerMario <zacjardine@y7mail.com>
Thu, 10 Nov 2016 15:58:10 +0000 (15:58 +0000)
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

1  2 
defaultXonotic.cfg
qcsrc/server/mutators/events.qh
qcsrc/server/player.qc

Simple merge
Simple merge
Simple merge