X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fdialog_multiplayer_join.qc;h=d023221bd5c34d29e10bad72dcf782871e0b4a55;hb=f64d037f9d2f38d874422e04d6147c1876a1c829;hp=bba6d68b086f798675addd0d20e55a7fe0bcb903;hpb=376aeffdd56f07cc22981eaba75bdb4e9b46a9f6;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_join.qc b/qcsrc/menu/xonotic/dialog_multiplayer_join.qc index bba6d68b0..d023221bd 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_join.qc +++ b/qcsrc/menu/xonotic/dialog_multiplayer_join.qc @@ -5,6 +5,7 @@ #include "textlabel.qh" #include "inputbox.qh" #include "checkbox.qh" +#include "commandbutton.qh" #include "button.qh" entity makeXonoticServerListTab() @@ -17,7 +18,8 @@ entity makeXonoticServerListTab() void XonoticServerListTab_refresh(entity this, entity slist) { - slist.refreshServerList(slist, REFRESHSERVERLIST_RESET); + bool clear = false; + slist.refreshServerList(slist, clear ? REFRESHSERVERLIST_RESET : REFRESHSERVERLIST_ASK); } void XonoticServerListTab_fill(entity me) @@ -34,7 +36,7 @@ void XonoticServerListTab_fill(entity me) slist.controlledTextbox = e; me.gotoRC(me, 0.5, 2.6); - me.TD(me, 1, 0.9, e = makeXonoticCheckBox(0, "menu_slist_categories", ZCTX(_("SRVS^Categories")))); + me.TD(me, 1, 0.75, e = makeXonoticCheckBox(0, "menu_slist_categories", ZCTX(_("SRVS^Categories")))); e.onClickEntity = slist; e.onClick = ServerList_Categories_Click; me.TD(me, 1, 0.6, e = makeXonoticCheckBox_T(0, "menu_slist_showempty", ZCTX(_("SRVS^Empty")), @@ -42,11 +44,16 @@ void XonoticServerListTab_fill(entity me) slist.filterShowEmpty = e.checked; e.onClickEntity = slist; e.onClick = ServerList_ShowEmpty_Click; - me.TD(me, 1, 0.6, e = makeXonoticCheckBox_T(0, "menu_slist_showfull", ZCTX(_("SRVS^Full")), + me.TD(me, 1, 0.5, e = makeXonoticCheckBox_T(0, "menu_slist_showfull", ZCTX(_("SRVS^Full")), _("Show full servers that have no slots available"))); slist.filterShowFull = e.checked; e.onClickEntity = slist; e.onClick = ServerList_ShowFull_Click; + me.TD(me, 1, 0.6, e = makeXonoticCheckBox_T(0, "menu_slist_showlaggy", ZCTX(_("SRVS^Laggy")), + _("Show high latency servers"))); + slist.filterShowLaggy = e.checked; + e.onClickEntity = slist; + e.onClick = ServerList_ShowLaggy_Click; me.TD(me, 1, 0.6, e = makeXonoticCheckBox_T(0, "net_slist_pause", _("Pause"), _("Pause updating the server list to prevent servers from \"jumping around\""))); me.TD(me, 1, 1, e = makeXonoticButton_T(_("Refresh"), '0 0 0', _("Reload the server list"))); @@ -80,6 +87,13 @@ void XonoticServerListTab_fill(entity me) e.onClickEntity = slist; slist.infoButton = e; me.TR(me); + + /* + me.TD(me, 1, 1, e = makeXonoticCommandButton_T(_("Disconnect"), '0 0 0', "disconnect", 0, + _("Disconnect from the server"))); + slist.disconnectButton = e; + */ + me.TD(me, 1, me.columns, e = makeXonoticButton(_("Join!"), '0 0 0')); e.onClick = ServerList_Connect_Click; e.onClickEntity = slist;