]> 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: b65d63b cac7a0f)
Merge branch 'Lyberta/GiveResourceWithLimit' into 'master'
authorMario <zacjardine@y7mail.com>
Wed, 4 Apr 2018 22:56:29 +0000 (22:56 +0000)
committerMario <zacjardine@y7mail.com>
Wed, 4 Apr 2018 22:56:29 +0000 (22:56 +0000)
Added GiveResourceWithLimit, ResourceAmountChanged and ResourceWasted hooks

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


Trivial merge