]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
projects / xonotic / xonotic-data.pk3dir.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: 6339d96 93a9447)
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)
commit530e29e1a8395e12b8b8b44ac1030a84546eb903
tree163632fea0a47e8d9acdb30488e0af5737ccb1dftree | snapshot
parent6339d96deaae4960cea32c7eff9ecf85c2eb0752commit | diff
parent93a94476643d1790b67c1426b73b7c9b126d1b97commit | diff
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
defaultXonotic.cfg diff1 | diff2 | blob | history
qcsrc/server/mutators/events.qh diff1 | diff2 | blob | history
qcsrc/server/player.qc diff1 | diff2 | blob | history