From: TimePath <andrew.hardaker1995@gmail.com>
Date: Sun, 10 May 2015 03:27:55 +0000 (+1000)
Subject: Merge remote-tracking branch 'origin/master' into BuddyFriendGuy/mapStringFilter
X-Git-Tag: xonotic-v0.8.1~23^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=853b6160a59c1e6f1b67af9abd43cf98d25b8625;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/master' into BuddyFriendGuy/mapStringFilter
---

853b6160a59c1e6f1b67af9abd43cf98d25b8625
diff --cc qcsrc/menu/xonotic/maplist.qc
index e06c3084c,ec9aa1f4c..f7da84362
--- a/qcsrc/menu/xonotic/maplist.qc
+++ b/qcsrc/menu/xonotic/maplist.qc
@@@ -43,15 -42,11 +45,15 @@@ CLASS(XonoticMapList, XonoticListBox
  
  	METHOD(XonoticMapList, destroy, void(entity))
  
- 	ATTRIB(XonoticListBox, alphaBG, float, 0)
+ 	ATTRIB(XonoticMapList, alphaBG, float, 0)
  ENDCLASS(XonoticMapList)
  entity makeXonoticMapList();
 -void MapList_All(entity btn, entity me);
 -void MapList_None(entity btn, entity me);
 +entity makeXonoticMapListStringFilterBox(entity me, float doEditColorCodes, string theCvar);
 +void MapList_StringFilterBox_Change(entity box, entity me);
 +float MapList_StringFilterBox_keyDown(entity me, float key, float ascii, float shift);
 +void MapList_Add_Shown(entity btn, entity me);
 +void MapList_Remove_Shown(entity btn, entity me);
 +void MapList_Remove_All(entity btn, entity me);
  void MapList_LoadMap(entity btn, entity me);
  #endif