]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
projects / xonotic / xonotic-data.pk3dir.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: 86a030f 1276f1c)
Merge branch 'BuddyFriendGuy/mapStringFilter' into 'master'
authorMario <zacjardine@y7mail.com>
Tue, 4 Aug 2015 05:23:22 +0000 (05:23 +0000)
committerMario <zacjardine@y7mail.com>
Tue, 4 Aug 2015 05:23:22 +0000 (05:23 +0000)
commitff442844108257ce535eae6dc08eaf659ff5efd7
treebd004637daf821e6535ac5ab1f46a7e9b462ca92tree | snapshot
parent86a030f5ba6b51c42a20c930ba07470baf12221ccommit | diff
parent1276f1c63191620822d76d253d7964f0e15f4129commit | diff
Merge branch 'BuddyFriendGuy/mapStringFilter' into 'master'

request merging BuddyFriendGuy's map string filter

This is the feature for the multi-user game creation tab. It filters the list of the maps by a user-provided string.

See merge request !117
qcsrc/common/mapinfo.qc diff1 | diff2 | blob | history
qcsrc/menu/xonotic/dialog_multiplayer_create.qc diff1 | diff2 | blob | history
qcsrc/menu/xonotic/maplist.qc diff1 | diff2 | blob | history