]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'drjaska/mayhem' into z411/bai-server z411/inventory
authorz411 <z411@omaera.org>
Fri, 23 Apr 2021 23:54:39 +0000 (19:54 -0400)
committerz411 <z411@omaera.org>
Fri, 23 Apr 2021 23:54:39 +0000 (19:54 -0400)
commit6fc233ea95dd07ed56bf0b67b93c991d29575aa7
tree2ebc5bba516ebb71c9eaadc1e67388b915cc0ca8
parent74ed4cce84191b876f49085d7097240ed5bd8008
parent15de3514379ef0c72b8dff0b9ac6e9aba1891491
Merge branch 'drjaska/mayhem' into z411/bai-server
gamemodes-client.cfg
gamemodes-server.cfg
qcsrc/common/gamemodes/gamemode/_mod.inc
qcsrc/common/gamemodes/gamemode/_mod.qh
qcsrc/menu/xonotic/util.qc
qcsrc/server/world.qc