Merge branch 'master' into bones_was_here/q3compat
authorbones_was_here <bones_was_here@xa.org.au>
Sat, 6 Mar 2021 10:15:39 +0000 (20:15 +1000)
committerbones_was_here <bones_was_here@xa.org.au>
Sat, 6 Mar 2021 10:15:39 +0000 (20:15 +1000)
commit3e6e644488b54b638078fb88b88c643e103ac8e1
tree83d440aaf0ba44a537576cc9020d7d0929d74989
parentf6efc137bef946957459ddfcd447114bc2c9b7a5
parent1bfd56504a32a960cec5a7f3721dec87b8abedf5
Merge branch 'master' into bones_was_here/q3compat
18 files changed:
qcsrc/common/items/item/powerup.qh
qcsrc/common/mapobjects/trigger/jumppads.qc
qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
qcsrc/common/mutators/mutator/buffs/sv_buffs.qh
qcsrc/common/physics/player.qc
qcsrc/common/stats.qh
qcsrc/common/weapons/all.qc
qcsrc/common/weapons/weapon/shockwave.qc
qcsrc/lib/spawnfunc.qh
qcsrc/server/client.qc
qcsrc/server/compat/quake3.qh
qcsrc/server/items/items.qc
qcsrc/server/items/items.qh
qcsrc/server/race.qc
qcsrc/server/teamplay.qc
qcsrc/server/teamplay.qh
qcsrc/server/world.qc
xonotic-server.cfg