]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - qcsrc/server/command/common.qh
projects / xonotic / xonotic-data.pk3dir.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: 692cb75 2b3a986)
Merge branch 'terencehill/menu_fixes' into 'master'
authorMario <zacjardine@y7mail.com>
Mon, 4 Jan 2016 11:51:32 +0000 (11:51 +0000)
committerMario <zacjardine@y7mail.com>
Mon, 4 Jan 2016 11:51:32 +0000 (11:51 +0000)
commit7bcb3a89b3271e018da4d92437dc5ba125ea8698
tree7b5d3081b893214a640f129e3f8ae0d26f2a2a0etree | snapshot
parent692cb758fe8f25fa078bfd5885333ee031885600commit | diff
parent2b3a986c0cf9289a4552d4ab3f4c5e4514bea067commit | diff
Merge branch 'terencehill/menu_fixes' into 'master'

Menu fixes

Misc bug fixes, most notable ones are in the first 2 commits:
* Increase number of rows of Game Settings tabs so they match Settings tab rows and add back items that long time ago got removed when nested tabs were introduced
* Add back a few Apply buttons and update/fix their commands

See merge request !264
qcsrc/common/mutators/mutator/damagetext/damagetext.qc diff1 | diff2 | blob | history
qcsrc/menu/xonotic/dialog_teamselect.qc diff1 | diff2 | blob | history