X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fdialog_settings_misc.c;h=b9aab55ab74dda5cf007353946118592572a78f1;hb=2f7b0095fa29fa4c49e0e6b88e6e7b432cfb6a31;hp=bb46fdba32edf09a5abccce362da3e1f1500633d;hpb=a913e63f1c1558e31e66f7dc33901524c446a92c;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/dialog_settings_misc.c b/qcsrc/menu/xonotic/dialog_settings_misc.c
index bb46fdba3..b9aab55ab 100644
--- a/qcsrc/menu/xonotic/dialog_settings_misc.c
+++ b/qcsrc/menu/xonotic/dialog_settings_misc.c
@@ -20,7 +20,7 @@ entity makeXonoticMiscSettingsTab()
 void XonoticMiscSettingsTab_fill(entity me)
 {
 	entity e;
-	entity sk;
+	//entity sk;
 
 	me.TR(me);
 		me.TD(me, 1, 3, e = makeXonoticTextLabel(0, _("Network:")));
@@ -39,6 +39,12 @@ void XonoticMiscSettingsTab_fill(entity me)
 		me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Input packets/s:")));
 		me.TD(me, 1, 2, e = makeXonoticSlider(20, 100, 5, "cl_netfps"));
 	me.TR(me);
+		if(cvar("developer"))
+		{
+			me.TDempty(me, 0.2);
+			me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Local latency:")));
+			me.TD(me, 1, 2, e = makeXonoticSlider(0, 1000, 25, "cl_netlocalping"));
+		}
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 1.8, e = makeXonoticTextLabel(0, _("Client UDP port:")));
@@ -53,7 +59,7 @@ void XonoticMiscSettingsTab_fill(entity me)
 		me.TD(me, 1, 2.8, e = makeXonoticCheckBox(0, "cl_movement", _("Client-side movement prediction")));
 	me.TR(me);
 		me.TDempty(me, 0.2);
-		me.TD(me, 1, 2.8, e = makeXonoticCheckBox(0, "cl_movement_errorcompensation", _("Compensate for prediction errors")));
+		me.TD(me, 1, 2.8, e = makeXonoticCheckBox(0, "cl_movement_errorcompensation", _("Movement error compensation")));
 		setDependent(e, "cl_movement", 1, 1);
 	me.TR(me);
 	me.TR(me);
@@ -69,14 +75,70 @@ void XonoticMiscSettingsTab_fill(entity me)
 	me.TR(me);
 
 	me.gotoRC(me, 0, 3.2); me.setFirstColumn(me, me.currentColumn);
+		me.TD(me, 1, 3, e = makeXonoticTextLabel(0, _("Framerate:")));
+	me.TR(me);
+		me.TDempty(me, 0.2);
+		me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Maximum:")));
+		me.TD(me, 1, 2, e = makeXonoticTextSlider("cl_maxfps"));
+			e.addValue(e, ZCTX(_("MAXFPS^5 fps")), "5");
+			e.addValue(e, ZCTX(_("MAXFPS^10 fps")), "10");
+			e.addValue(e, ZCTX(_("MAXFPS^20 fps")), "20");
+			e.addValue(e, ZCTX(_("MAXFPS^30 fps")), "30");
+			e.addValue(e, ZCTX(_("MAXFPS^40 fps")), "40");
+			e.addValue(e, ZCTX(_("MAXFPS^50 fps")), "50");
+			e.addValue(e, ZCTX(_("MAXFPS^60 fps")), "60");
+			e.addValue(e, ZCTX(_("MAXFPS^70 fps")), "70");
+			e.addValue(e, ZCTX(_("MAXFPS^100 fps")), "100");
+			e.addValue(e, ZCTX(_("MAXFPS^125 fps")), "125");
+			e.addValue(e, ZCTX(_("MAXFPS^200 fps")), "200");
+			e.addValue(e, ZCTX(_("MAXFPS^Unlimited")), "0");
+			e.configureXonoticTextSliderValues(e);
+	me.TR(me);
+		me.TDempty(me, 0.2);
+		me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Target:")));
+		me.TD(me, 1, 2, e = makeXonoticTextSlider("cl_minfps"));
+			e.addValue(e, ZCTX(_("TRGT^Disabled")), "0");
+			e.addValue(e, ZCTX(_("TRGT^30 fps")), "30");
+			e.addValue(e, ZCTX(_("TRGT^40 fps")), "40");
+			e.addValue(e, ZCTX(_("TRGT^50 fps")), "50");
+			e.addValue(e, ZCTX(_("TRGT^60 fps")), "60");
+			e.addValue(e, ZCTX(_("TRGT^100 fps")), "100");
+			e.addValue(e, ZCTX(_("TRGT^125 fps")), "125");
+			e.addValue(e, ZCTX(_("TRGT^200 fps")), "200");
+			e.configureXonoticTextSliderValues(e);
+	me.TR(me);
+		me.TDempty(me, 0.2);
+		me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Idle limit:")));
+		me.TD(me, 1, 2, e = makeXonoticTextSlider("cl_maxidlefps"));
+			e.addValue(e, ZCTX(_("IDLFPS^10 fps")), "10");
+			e.addValue(e, ZCTX(_("IDLFPS^20 fps")), "20");
+			e.addValue(e, ZCTX(_("IDLFPS^30 fps")), "30");
+			e.addValue(e, ZCTX(_("IDLFPS^60 fps")), "60");
+			e.addValue(e, ZCTX(_("IDLFPS^Unlimited")), "0");
+			e.configureXonoticTextSliderValues(e);
+	me.TR(me);
+	me.TR(me);
+		me.TDempty(me, 0.2);
+		me.TD(me, 1, 2.8, e = makeXonoticCheckBox(0, "showfps", _("Show frames per second")));
+	me.TR(me);
+		me.TDempty(me, 0.2);
+		me.TD(me, 1, 2.8, e = makeXonoticCheckBox(0, "cl_maxfps_alwayssleep", _("Save processing time for other apps")));
+		setDependent(e, "cl_maxfps", 1, 1000);
+	me.TR(me);
+	me.TR(me);
+		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Menu tooltips:")));
+		me.TD(me, 1, 2, e = makeXonoticTextSlider("menu_tooltips"));
+			e.addValue(e, ZCTX(_("TLTIP^Disabled")), "0");
+			e.addValue(e, ZCTX(_("TLTIP^Standard")), "1");
+			e.addValue(e, ZCTX(_("TLTIP^Advanced")), "2");
+			e.configureXonoticTextSliderValues(e);
+	me.TR(me);
+	me.TR(me);
 		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "showtime", _("Show current time")));
 	me.TR(me);
 		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "showdate", _("Show current date")));
 	me.TR(me);
-		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "showfps", _("Show frames per second")));
-	me.TR(me);
-		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "cl_maxfps_alwayssleep", _("Minimize input latency")));
-		
+		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "developer", _("Enable developer mode")));
 	me.TR(me);
 	me.TR(me);
 		me.TDempty(me, 0.5);