]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'z411/powerups_dropondeath' into 'master'
authorterencehill <piuntn@gmail.com>
Sat, 4 Dec 2021 22:45:51 +0000 (22:45 +0000)
committerterencehill <piuntn@gmail.com>
Sat, 4 Dec 2021 22:45:51 +0000 (22:45 +0000)
commitcb8c9f9915bdaff154b2cf3d757c3b3bcbcbaa1c
treece08ee08de170255b31761cc4ce90402d9cd4f47
parent46b2a3030ea163e9e4277ea286fbc55a66259d00
parent72bc8051f38b76082dfaef5118ec9c93551ded22
Merge branch 'z411/powerups_dropondeath' into 'master'

Merge branch z411/powerups_dropondeath (improves on Mario's implementation)

See merge request xonotic/xonotic-data.pk3dir!943
qcsrc/server/items/items.qc
qcsrc/server/items/items.qh
qcsrc/server/items/spawning.qc
qcsrc/server/world.qc
xonotic-server.cfg