]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
projects / xonotic / xonotic-data.pk3dir.git / commit
summary | shortlog | log | commit | commitdiff | tree
(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)
commitad73f4204b26b693746936874aa6966debd15534
tree1ba94ffe905e0f255045e6218499c13947413ba5tree | snapshot
parent1e2e1989141a0847be49445ea00c1914de25726ecommit | diff
parentae5efc032de6b092e722e601be6792f0e9e44f03commit | diff
Merge branch 'z411/new_timer' into 'master'

New timer with secondary round timer and sub text indicating game phase

Closes #2636

See merge request xonotic/xonotic-data.pk3dir!978
qcsrc/client/view.qc diff1 | diff2 | blob | history