Merge branch 'master' into bones_was_here/q3compat
authorbones_was_here <bones_was_here@xa.org.au>
Sun, 18 Oct 2020 11:18:12 +0000 (21:18 +1000)
committerbones_was_here <bones_was_here@xa.org.au>
Sun, 18 Oct 2020 11:18:12 +0000 (21:18 +1000)
commitd24e46b65c1fe73fae4cf8034f4e7f318a17053a
treea5934e7175813cec94c21fa6f5aece82828fa375
parent824dde5a5388816a57e8a9897b3b612a380a482c
parent2ad7a79250d682efda53246cb74df7cf7d55dd82
Merge branch 'master' into bones_was_here/q3compat
18 files changed:
qcsrc/common/mapobjects/func/door.qc
qcsrc/common/mapobjects/trigger/jumppads.qc
qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
qcsrc/common/physics/player.qc
qcsrc/common/weapons/all.qc
qcsrc/common/weapons/weapon/shockwave.qc
qcsrc/lib/spawnfunc.qh
qcsrc/lib/warpzone/common.qc
qcsrc/server/client.qc
qcsrc/server/compat/quake.qc
qcsrc/server/compat/quake3.qc
qcsrc/server/items/items.qc
qcsrc/server/items/spawning.qc
qcsrc/server/main.qc
qcsrc/server/race.qc
qcsrc/server/teamplay.qc
qcsrc/server/weapons/spawning.qc
qcsrc/server/world.qc