Merge branch 'master' into bones_was_here/q3compat
authorbones_was_here <bones_was_here@yahoo.com.au>
Sun, 2 Aug 2020 06:02:52 +0000 (16:02 +1000)
committerbones_was_here <bones_was_here@yahoo.com.au>
Sun, 2 Aug 2020 06:02:52 +0000 (16:02 +1000)
commit0b9df86c9a55dd9ed9031b21e430fc3094fac709
treec1ebd85b7151b44fbd9f76799b4b2a7c79f91815
parent8e7d21da2c1a5f8701f3abde89c8dc4fa7da5100
parent969dc49d01d650a812706aba16c765af488605d0
Merge branch 'master' into bones_was_here/q3compat
qcsrc/common/mapobjects/trigger/jumppads.qc
qcsrc/common/mapobjects/trigger/multi.qc
qcsrc/common/physics/player.qc
qcsrc/common/stats.qh
qcsrc/common/weapons/weapon/shotgun.qc
qcsrc/server/client.qc
qcsrc/server/compat/quake3.qc
qcsrc/server/g_world.qc
qcsrc/server/items/spawning.qc
xonotic-server.cfg