]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - qcsrc/common/gamemodes/gamemode/invasion/invasion.qh
Merge branch 'master' into terencehill/less_entities
authorterencehill <piuntn@gmail.com>
Wed, 10 Mar 2021 22:52:25 +0000 (23:52 +0100)
committerterencehill <piuntn@gmail.com>
Wed, 10 Mar 2021 22:52:25 +0000 (23:52 +0100)
commitac7deb97b1a0e73ceea4684be73e72912fb3f1aa
tree56d675e6f7ef058d01f7eeda25d879092949f70c
parenta3d9768755c892c5f09680ff47339da38b926dba
parent5cb9126b0ebd2e7ed0ad3a0222603cb99e7594c5
Merge branch 'master' into terencehill/less_entities
15 files changed:
qcsrc/common/gamemodes/gamemode/assault/sv_assault.qc
qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qh
qcsrc/common/gamemodes/gamemode/invasion/sv_invasion.qc
qcsrc/common/gamemodes/gamemode/onslaught/onslaught.qh
qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qh
qcsrc/common/gamemodes/sv_rules.qc
qcsrc/common/mutators/mutator/instagib/sv_instagib.qc
qcsrc/common/mutators/mutator/instagib/sv_instagib.qh
qcsrc/common/mutators/mutator/nades/nades.qc
qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
qcsrc/common/mutators/mutator/overkill/sv_overkill.qh
qcsrc/common/mutators/mutator/sandbox/sv_sandbox.qc
qcsrc/common/sounds/all.inc
qcsrc/server/teamplay.qc
qcsrc/server/teamplay.qh