From: Samual <samual@xonotic.org>
Date: Tue, 17 Jan 2012 01:36:05 +0000 (-0500)
Subject: Fix some various things
X-Git-Tag: xonotic-v0.6.0~151
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ae4de8e0de5bde9daac675c2c79a5c080fa356f5;p=xonotic%2Fxonotic-data.pk3dir.git

Fix some various things
---

diff --git a/gfx/menu/luminos/skinvalues.txt b/gfx/menu/luminos/skinvalues.txt
index 5a89653e3..24bf6303c 100755
--- a/gfx/menu/luminos/skinvalues.txt
+++ b/gfx/menu/luminos/skinvalues.txt
@@ -1,4 +1,4 @@
-title Luminos
+title Luminos (default)
 author sev
 
 // Colors: 'Red Green Blue'
diff --git a/gfx/menu/wickedx/skinvalues.txt b/gfx/menu/wickedx/skinvalues.txt
index 40cf103dc..ba04902f5 100755
--- a/gfx/menu/wickedx/skinvalues.txt
+++ b/gfx/menu/wickedx/skinvalues.txt
@@ -1,4 +1,4 @@
-title Default // "WickedX"
+title WickedX
 author sev
 
 // Colors: 'Red Green Blue'
diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_view.c b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_view.c
index e2f919ea0..935aa7484 100644
--- a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_view.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_view.c
@@ -85,7 +85,7 @@ void XonoticViewDialog_fill(entity me)
 		setDependent(e, "chase_active", -1, 0);
 	me.TR(me);
 		me.TDempty(me, 0.2);
-		me.TD(me, 1, 2.8, e = makeXonoticCheckBoxEx(2, 0, "v_idlescale", _("View waving while idle")));
+		me.TD(me, 1, 2.8, e = makeXonoticCheckBoxEx(1, 0, "v_idlescale", _("View waving while idle")));
 		setDependent(e, "chase_active", -1, 0);
 	me.TR(me);
 		me.TDempty(me, 0.2);
diff --git a/qcsrc/menu/xonotic/dialog_settings_effects.c b/qcsrc/menu/xonotic/dialog_settings_effects.c
index da1dbef47..bfa100017 100644
--- a/qcsrc/menu/xonotic/dialog_settings_effects.c
+++ b/qcsrc/menu/xonotic/dialog_settings_effects.c
@@ -151,7 +151,7 @@ void XonoticEffectsSettingsTab_fill(entity me)
 		me.TD(me, 1, 1, e = makeXonoticCheckBox(0, "r_glsl_offsetmapping_lod", _("LOD")));
 			setDependentAND(e, "vid_gl20", 1, 1, "r_glsl_offsetmapping", 1, 1);
 	me.TR(me);
-		me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "r_bloom", _("Bloom (High Dynamic Range/HDR)")));
+		me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "r_bloom", _("Bloom (High dynamic range/HDR)")));
 	me.TR(me);
 		me.TD(me, 1, 1, e = makeXonoticCheckBox(0, "r_water", _("Reflections:")));
 			setDependent(e, "vid_gl20", 1, 1);
diff --git a/qcsrc/menu/xonotic/dialog_settings_video.c b/qcsrc/menu/xonotic/dialog_settings_video.c
index 42973888c..5d4133435 100644
--- a/qcsrc/menu/xonotic/dialog_settings_video.c
+++ b/qcsrc/menu/xonotic/dialog_settings_video.c
@@ -112,11 +112,6 @@ void XonoticVideoSettingsTab_fill(entity me)
 		me.TD(me, 1, 2, e = makeXonoticSlider(0.5, 2.0, 0.05, "r_glsl_saturation"));
 			setDependent(e, "vid_gl20", 1, 1);
 	me.TR(me);
-		if(cvar("developer"))
-		{
-			me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "v_psycho", _("Psycho coloring (easter egg)")));
-				setDependent(e, "vid_gl20", 1, 1);
-		}
 	me.TR(me);
 		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, ZCTX(_("LIT^Ambient:"))));
 		me.TD(me, 1, 2, e = makeXonoticSlider(0, 20.0, 0.25, "r_ambient"));
@@ -131,8 +126,17 @@ void XonoticVideoSettingsTab_fill(entity me)
 			setDependent(e, "vid_gl20", 1, 1);
 	me.TR(me);
 		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "gl_finish", _("Wait for GPU to finish each frame")));
-	me.TR(me);
-		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "v_flipped", _("Flip view horizontally")));
+	if(cvar("developer"))
+	{
+		me.TR(me);
+			me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "v_psycho", _("Psycho coloring (easter egg)")));
+				setDependent(e, "vid_gl20", 1, 1);
+		me.TR(me);
+			me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "r_trippy", _("Trippy vertices (easter egg)")));
+				setDependent(e, "vid_gl20", 1, 1);
+		me.TR(me);
+			me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "v_flipped", _("Flip view horizontally")));
+	}
 
 	me.gotoRC(me, me.rows - 1, 0);
 		me.TD(me, 1, me.columns, makeXonoticCommandButton(_("Apply immediately"), '0 0 0', "menu_cmd sync; vid_restart; menu_restart; togglemenu; defer 0.1 \"menu_cmd videosettings\"", COMMANDBUTTON_APPLY));