]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - qcsrc/common/mutators/mutator/sandbox/sv_sandbox.qc
Merge branch 'master' into bones_was_here/q3compat
authorbones_was_here <bones_was_here@xa.org.au>
Wed, 23 Sep 2020 11:48:29 +0000 (21:48 +1000)
committerbones_was_here <bones_was_here@xa.org.au>
Wed, 23 Sep 2020 11:48:29 +0000 (21:48 +1000)
commit86f963161de59765b280c58aa25e73c1ea42284e
tree1542636ebd4d483a2fd4e8403293c6d7f836487d
parent9f91a4082527d6debbdc1b6045106126777a7f65
parentd5d4ae770852682ee35f90eb9f856aaf73301b50
Merge branch 'master' into bones_was_here/q3compat
qcsrc/common/physics/player.qc
qcsrc/common/weapons/all.qc
qcsrc/common/weapons/weapon/shotgun.qc
qcsrc/lib/spawnfunc.qh
qcsrc/server/autocvars.qh
qcsrc/server/client.qc
qcsrc/server/main.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/race.qc
qcsrc/server/world.qc