]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'terencehill/scoreboard_ui' into 'master'
authorLegendaryGuard <rootuser999@gmail.com>
Fri, 22 Jul 2022 17:11:04 +0000 (17:11 +0000)
committerLegendaryGuard <rootuser999@gmail.com>
Fri, 22 Jul 2022 17:11:04 +0000 (17:11 +0000)
Scoreboard UI and team selection

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

1  2 
qcsrc/client/hud/panel/scoreboard.qc
qcsrc/client/hud/panel/scoreboard.qh
qcsrc/client/main.qc
qcsrc/client/main.qh
qcsrc/client/view.qc
qcsrc/menu/xonotic/keybinder.qc
qcsrc/server/client.qc
qcsrc/server/command/cmd.qc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge