]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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

1  2 
qcsrc/common/mapinfo.qc patch | diff1 | diff2 | blob | history
qcsrc/menu/xonotic/dialog_multiplayer_create.qc patch | diff1 | diff2 | blob | history
qcsrc/menu/xonotic/maplist.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/common/mapinfo.qc
Simple merge
diff --cc qcsrc/menu/xonotic/maplist.qc
Simple merge