]> 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: 51199f1 369dd6b)
Merge branch 'z411/gamemenu_cvar' into 'master'
authorterencehill <piuntn@gmail.com>
Sun, 25 Dec 2022 22:32:31 +0000 (22:32 +0000)
committerterencehill <piuntn@gmail.com>
Sun, 25 Dec 2022 22:32:31 +0000 (22:32 +0000)
Add menu_gamemenu client cvar to enable/disable the in-game menu

Closes #2732

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

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

diff --cc qcsrc/client/main.qc
Simple merge
diff --cc qcsrc/client/main.qh
Simple merge