]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'Lyberta/TeamplayOverhaul' into Lyberta/Survival
authorLyberta <lyberta@lyberta.net>
Mon, 9 Apr 2018 01:17:16 +0000 (04:17 +0300)
committerLyberta <lyberta@lyberta.net>
Mon, 9 Apr 2018 01:17:16 +0000 (04:17 +0300)
commit268d34ebbdcc883eb98caa129bfda75c950c1489
treec3867cd23f8fd1fdc1148d6ad89ad6b637ace82b
parent25e676aaec3773c33896315128323850500c765c
parent95fd8c7a8e07215b471f5c3c3d63d730f9d09b19
Merge branch 'Lyberta/TeamplayOverhaul' into Lyberta/Survival
qcsrc/client/hud/panel/modicons.qc
qcsrc/menu/xonotic/dialog_multiplayer_create.qc
qcsrc/menu/xonotic/util.qc
qcsrc/server/g_world.qc