]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/master' into morosophos/server-current4
authorNick S <nick@teichisma.info>
Thu, 24 Aug 2023 09:06:43 +0000 (12:06 +0300)
committerNick S <nick@teichisma.info>
Thu, 24 Aug 2023 09:06:43 +0000 (12:06 +0300)
commit44935eb6ab78264d8a38e52e9eed3171833ee081
treed0320a766eb8b4482f3427995e733493bba8a7ec
parentefe77d9fc618bb8f89b28bb062ebf523a3bcd670
parent37e02e5ff4531696eddaf3edf90abeb88a36ef3e
Merge remote-tracking branch 'origin/master' into morosophos/server-current4
bal-wep-mario.cfg
bal-wep-xdf.cfg
bal-wep-xonotic.cfg
qcsrc/client/hud/panel/strafehud.qc
qcsrc/common/gamemodes/gamemode/cts/sv_cts.qc
qcsrc/common/mapobjects/func/door.qc
qcsrc/common/stats.qh
qcsrc/server/damage.qc
qcsrc/server/main.qc
xonotic-server.cfg