]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into drjaska/morosophos/server-current4
authordrjaska <drjaska83@gmail.com>
Fri, 31 May 2024 00:23:01 +0000 (03:23 +0300)
committerdrjaska <drjaska83@gmail.com>
Fri, 31 May 2024 00:23:01 +0000 (03:23 +0300)
commitf8cfa15f94f128db6324b0a964efa014dd1fcad0
treeb7b3289f6b72998521fa951b3218d6a1c79d658b
parentf96d3870103c081c404be8eeea4eae6a1ef85b10
parentbe472be4ac42f967d611b4a350aa74cce5182804
Merge branch 'master' into drjaska/morosophos/server-current4
17 files changed:
_hud_common.cfg
bal-wep-mario.cfg
bal-wep-nexuiz25.cfg
bal-wep-samual.cfg
bal-wep-xdf.cfg
bal-wep-xonotic.cfg
qcsrc/client/hud/panel/scoreboard.qc
qcsrc/common/constants.qh
qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc
qcsrc/common/mapobjects/trigger/jumppads.qh
qcsrc/common/scores.qh
qcsrc/server/command/sv_cmd.qc
qcsrc/server/compat/quake3.qc
qcsrc/server/main.qc
qcsrc/server/race.qc
qcsrc/server/race.qh
xonotic-server.cfg