]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1e2e198 ae5efc0)
Merge branch 'z411/new_timer' into 'master'
authorterencehill <piuntn@gmail.com>
Sun, 6 Mar 2022 01:09:13 +0000 (01:09 +0000)
committerterencehill <piuntn@gmail.com>
Sun, 6 Mar 2022 01:09:13 +0000 (01:09 +0000)
New timer with secondary round timer and sub text indicating game phase

Closes #2636

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

1  2 
qcsrc/client/view.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/client/view.qc
Simple merge