Merge branch 'master' into bones_was_here/q3compat
authorbones_was_here <bones_was_here@yahoo.com.au>
Sun, 9 Aug 2020 06:55:54 +0000 (16:55 +1000)
committerbones_was_here <bones_was_here@yahoo.com.au>
Sun, 9 Aug 2020 06:55:54 +0000 (16:55 +1000)
commit5ea8bccb50ca76ead04bde011b2f64bb6afa7286
treea988a4b3a5829ba72bb1d3f6a25066308f1b2158
parent724a0d4b1b05b4ce0139109a97b85d2dfe416d43
parent44fce4d9bafc19dfdd77d135280e96c91a60db89
Merge branch 'master' into bones_was_here/q3compat
qcsrc/common/mapobjects/trigger/jumppads.qc
qcsrc/common/physics/player.qc
qcsrc/common/stats.qh
qcsrc/common/weapons/weapon/shockwave.qc
qcsrc/server/client.qc
qcsrc/server/compat/quake.qc
qcsrc/server/compat/quake3.qc
qcsrc/server/items/spawning.qc
qcsrc/server/world.qc
xonotic-server.cfg