]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ff21935 05007c9)
Merge branch 'z411/ctf_relative' into 'pending-release'
authorDr. Jaska <drjaska83@gmail.com>
Tue, 21 May 2024 20:35:06 +0000 (20:35 +0000)
committerDr. Jaska <drjaska83@gmail.com>
Tue, 21 May 2024 20:35:06 +0000 (20:35 +0000)
Implemented relative team announcing and a smarter CTF announcer

See merge request xonotic/xonotic-data.pk3dir!1085

1  2 
qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc patch | diff1 | diff2 | blob | history
qcsrc/common/notifications/all.inc patch | diff1 | diff2 | blob | history
qcsrc/common/notifications/all.qc patch | diff1 | diff2 | blob | history
qcsrc/common/notifications/all.qh patch | diff1 | diff2 | blob | history

diff --cc qcsrc/common/notifications/all.inc
Simple merge
diff --cc qcsrc/common/notifications/all.qc
Simple merge
diff --cc qcsrc/common/notifications/all.qh
Simple merge