]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eafa105 574c7cb)
Merge branch 'Lyberta/PlayerDied' into 'master'
authorMario <zacjardine@y7mail.com>
Fri, 7 Apr 2017 22:56:54 +0000 (22:56 +0000)
committerMario <zacjardine@y7mail.com>
Fri, 7 Apr 2017 22:56:54 +0000 (22:56 +0000)
Added PlayerDied event.

See merge request !427

1  2 
qcsrc/server/mutators/events.qh patch | diff1 | diff2 | blob | history
qcsrc/server/player.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/server/mutators/events.qh
Simple merge
diff --cc qcsrc/server/player.qc
Simple merge