From: Mario <mario.mario@y7mail.com>
Date: Sat, 28 Dec 2019 13:51:37 +0000 (+1000)
Subject: Add an option to the effects menu to toggle skyboxes, only disabled by the OMG effect... 
X-Git-Tag: xonotic-v0.8.5~1176
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e7fe27a187ebcc637ca289fe5008daca8df6f44d;p=xonotic%2Fxonotic-data.pk3dir.git

Add an option to the effects menu to toggle skyboxes, only disabled by the OMG effects configuration
---

diff --git a/effects-high.cfg b/effects-high.cfg
index 597bb4660..b935b03b1 100644
--- a/effects-high.cfg
+++ b/effects-high.cfg
@@ -31,6 +31,7 @@ r_shadow_realtime_world_shadows 0
 r_shadow_shadowmapping 0
 r_shadow_usenormalmap 1
 r_showsurfaces 0
+r_sky 1
 r_subdivisions_tolerance 3
 r_texture_dds_load 1
 r_water 1
diff --git a/effects-low.cfg b/effects-low.cfg
index c9549581b..7c9921a32 100644
--- a/effects-low.cfg
+++ b/effects-low.cfg
@@ -31,6 +31,7 @@ r_shadow_realtime_world_shadows 0
 r_shadow_shadowmapping 0
 r_shadow_usenormalmap 0
 r_showsurfaces 0
+r_sky 1
 r_subdivisions_tolerance 8
 r_texture_dds_load 1
 r_water 0
diff --git a/effects-med.cfg b/effects-med.cfg
index 4ea20a169..b70167469 100644
--- a/effects-med.cfg
+++ b/effects-med.cfg
@@ -31,6 +31,7 @@ r_shadow_realtime_world_shadows 0
 r_shadow_shadowmapping 0
 r_shadow_usenormalmap 0
 r_showsurfaces 0
+r_sky 1
 r_subdivisions_tolerance 4
 r_texture_dds_load 1
 r_water 0
diff --git a/effects-normal.cfg b/effects-normal.cfg
index ba708cb9f..c519617f6 100644
--- a/effects-normal.cfg
+++ b/effects-normal.cfg
@@ -31,6 +31,7 @@ r_shadow_realtime_world_shadows 0
 r_shadow_shadowmapping 0
 r_shadow_usenormalmap 1
 r_showsurfaces 0
+r_sky 1
 r_subdivisions_tolerance 3
 r_texture_dds_load 1
 r_water 0
diff --git a/effects-omg.cfg b/effects-omg.cfg
index 7614417ce..7b05a1eaa 100644
--- a/effects-omg.cfg
+++ b/effects-omg.cfg
@@ -31,6 +31,7 @@ r_shadow_realtime_world_shadows 0
 r_shadow_shadowmapping 0
 r_shadow_usenormalmap 0
 r_showsurfaces 3
+r_sky 0
 r_subdivisions_tolerance 16
 r_texture_dds_load 1
 r_water 0
diff --git a/qcsrc/menu/xonotic/dialog_settings_effects.qc b/qcsrc/menu/xonotic/dialog_settings_effects.qc
index 1776ed479..9841f66ff 100644
--- a/qcsrc/menu/xonotic/dialog_settings_effects.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_effects.qc
@@ -125,10 +125,11 @@ void XonoticEffectsSettingsTab_fill(entity me)
 			}
 		}
 	me.TR(me);
+		me.TDempty(me, 0.2);
+		me.TD(me, 1, 1, e = makeXonoticCheckBoxEx_T(1, 0, "r_sky", _("Show skyboxes"), _("Disable skyboxes for performance and visibility")));
 		if(cvar("developer") > 0)
 		{
-			me.TDempty(me, 0.2);
-			me.TD(me, 1, 2.8, e = makeXonoticCheckBoxEx_T(3, 0, "r_showsurfaces", _("Show surfaces"),
+			me.TD(me, 1, 1, e = makeXonoticCheckBoxEx_T(3, 0, "r_showsurfaces", _("Show surfaces"),
 				_("Disable textures completely for very slow hardware. This gives a huge performance boost, but looks very ugly.")));
 		}
 	me.TR(me);