]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'Lyberta/TeamplayOverhaul' into Lyberta/Survival
authorLyberta <lyberta@lyberta.net>
Mon, 11 Jun 2018 10:18:30 +0000 (13:18 +0300)
committerLyberta <lyberta@lyberta.net>
Mon, 11 Jun 2018 10:18:30 +0000 (13:18 +0300)
commit3d72cc1cbc187d3f6e58aa634603931f23fde1bb
tree564e88bff4098dfd970e0075ea68568b2e480bae
parent6681e63506c9f2e809a8d9ed8a1ce4c95704632a
parent16bb4a51347c40ae0655bba054bc7cf201538e45
Merge branch 'Lyberta/TeamplayOverhaul' into Lyberta/Survival
gamemodes-server.cfg
qcsrc/client/hud/panel/modicons.qc
qcsrc/common/gamemodes/gamemode/_mod.inc
qcsrc/common/gamemodes/gamemode/_mod.qh
qcsrc/common/mapinfo.qh
qcsrc/server/_mod.inc
qcsrc/server/_mod.qh
qcsrc/server/g_world.qc