]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - qcsrc/common/deathtypes/all.qh
Merge branch 'master' into Lyberta/TeamplayOverhaul
authorLyberta <lyberta@lyberta.net>
Wed, 6 Jun 2018 10:54:50 +0000 (13:54 +0300)
committerLyberta <lyberta@lyberta.net>
Wed, 6 Jun 2018 10:54:50 +0000 (13:54 +0300)
commit073cc17f87486bec59ac2b6f9c26bf1155dbd7d8
tree7668d8f32559af81499b218d48207518103eba80
parentb8ad7477ca022feff76a1634c7ca8dcaaf54937c
parent033d44f4bc134eae5f0d65f75d1807159d6042cd
Merge branch 'master' into Lyberta/TeamplayOverhaul
qcsrc/common/gamemodes/gamemode/nexball/nexball.qc
qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc
qcsrc/common/t_items.qc
qcsrc/server/client.qc
qcsrc/server/command/cmd.qc
qcsrc/server/defs.qh
qcsrc/server/g_world.qc
qcsrc/server/mutators/events.qh
qcsrc/server/mutators/mutator/gamemode_ca.qc
qcsrc/server/player.qc