]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
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)
Merge branch z411/powerups_dropondeath (improves on Mario's implementation)

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

1  2 
qcsrc/server/items/items.qc
qcsrc/server/items/items.qh
qcsrc/server/items/spawning.qc
qcsrc/server/world.qc
xonotic-server.cfg

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge