Following the Xonotic menu, anisotropy is also a video setting, not an effect (which...

diff --git a/data/effects-high.cfg b/data/effects-high.cfg
index 31164a5a61423f2a99cd324e9763062845b6d0f2..0ff8022469d6fcfa14ebfc2cae90928da7f229da 100644 (file)
--- a/data/effects-high.cfg
+++ b/data/effects-high.cfg
@@ -6,7 +6,6 @@ cl_particles_rain 1
 cl_particles_snow 1\r
 gl_flashblend 0\r
 gl_picmip 1\r
-gl_texture_anisotropy 16\r
 mod_q3bsp_nolightmaps 0\r
 r_bloom 1\r
 r_coronas 1\r

diff --git a/data/effects-low.cfg b/data/effects-low.cfg
index 160899b296ec056d754fdec9c6d3591745a628c1..8462e43255a77b44ea2c099dbb177f8876238a80 100644 (file)
--- a/data/effects-low.cfg
+++ b/data/effects-low.cfg
@@ -6,7 +6,6 @@ cl_particles_rain 0
 cl_particles_snow 0\r
 gl_flashblend 1\r
 gl_picmip 2\r
-gl_texture_anisotropy 1\r
 mod_q3bsp_nolightmaps 1\r
 r_bloom 0\r
 r_coronas 1\r

diff --git a/data/effects-med.cfg b/data/effects-med.cfg
index 4c72d37ecca8cf9438b3b299cf5ce81e3452cff6..2ce167655b01695998dd043f0e88d449ea62f734 100644 (file)
--- a/data/effects-med.cfg
+++ b/data/effects-med.cfg
@@ -6,7 +6,6 @@ cl_particles_rain 1
 cl_particles_snow 1\r
 gl_flashblend 0\r
 gl_picmip 1\r
-gl_texture_anisotropy 1\r
 mod_q3bsp_nolightmaps 0\r
 r_bloom 0\r
 r_coronas 1\r

diff --git a/data/effects-normal.cfg b/data/effects-normal.cfg
index 38428c77a8c5ad373f1021a510aa9e2b79119482..210405365737e6491fcb495e09f61bd57eaaf0d7 100644 (file)
--- a/data/effects-normal.cfg
+++ b/data/effects-normal.cfg
@@ -6,7 +6,6 @@ cl_particles_rain 1
 cl_particles_snow 1\r
 gl_flashblend 0\r
 gl_picmip 1\r
-gl_texture_anisotropy 1\r
 mod_q3bsp_nolightmaps 0\r
 r_bloom 0\r
 r_coronas 1\r

diff --git a/data/effects-omg.cfg b/data/effects-omg.cfg
index 7cf611cf3a04c210c3f425ab279d3aa5390f4ab3..119102e9637d3c6bf1d2d7d24aa58226fe6fae05 100644 (file)
--- a/data/effects-omg.cfg
+++ b/data/effects-omg.cfg
@@ -6,7 +6,6 @@ cl_particles_rain 0
 cl_particles_snow 0\r
 gl_flashblend 1\r
 gl_picmip 1337\r
-gl_texture_anisotropy 1\r
 mod_q3bsp_nolightmaps 1\r
 r_bloom 0\r
 r_coronas 1\r

diff --git a/data/effects-ultimate.cfg b/data/effects-ultimate.cfg
index 6181467b8e1f6f1febb859f841c7d4cbc83317d2..d87f341e6cb4e90418f186a19a3ed4aec1b4b6f2 100644 (file)
--- a/data/effects-ultimate.cfg
+++ b/data/effects-ultimate.cfg
@@ -6,7 +6,6 @@ cl_particles_rain 1
 cl_particles_snow 1\r
 gl_flashblend 0\r
 gl_picmip 0\r
-gl_texture_anisotropy 16\r
 mod_q3bsp_nolightmaps 0\r
 r_bloom 1\r
 r_coronas 1\r

diff --git a/data/effects-ultra.cfg b/data/effects-ultra.cfg
index f5c0177fc37a5cf77c37a0d5473c8a750e239b57..9e06bd9d25b46e78b0b9f94cdb1440be84399845 100644 (file)
--- a/data/effects-ultra.cfg
+++ b/data/effects-ultra.cfg
@@ -6,7 +6,6 @@ cl_particles_rain 1
 cl_particles_snow 1\r
 gl_flashblend 0\r
 gl_picmip 0\r
-gl_texture_anisotropy 16\r
 mod_q3bsp_nolightmaps 0\r
 r_bloom 1\r
 r_coronas 1\r

diff --git a/data/qcsrc/menu/voret/dialog_settings_effects.c b/data/qcsrc/menu/voret/dialog_settings_effects.c
index ba2fc385b8e44f10c24e6f5c7e30dd63fa9022bb..80d93ce5bee39322fd04a58f511f2e91fdf84596 100644 (file)
--- a/data/qcsrc/menu/voret/dialog_settings_effects.c
+++ b/data/qcsrc/menu/voret/dialog_settings_effects.c
@@ -74,15 +74,6 @@ void fillVoretEffectsSettingsTab(entity me)
                me.TD(me, 1, 2.8, e = makeVoretCheckBox(1, "r_picmipworld", "Reduce model texture quality only"));\r
                        setDependent(e, "gl_picmip", 0.5, -0.5);\r
        me.TR(me);\r
-       me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Anisotropy:"));\r
-               me.TD(me, 1, 2, e = makeVoretTextSlider("gl_texture_anisotropy"));\r
-                       e.addValue(e, "Disabled", "1");\r
-                       e.addValue(e, "2x", "2");\r
-                       e.addValue(e, "4x", "4");\r
-                       e.addValue(e, "8x", "8");\r
-                       e.addValue(e, "16x", "16");\r
-                       e.configureVoretTextSliderValues(e);\r
-       me.TR(me);\r
        me.TR(me);\r
                me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Particle quality:"));\r
                me.TD(me, 1, 2, e = makeVoretSlider(0.1, 1.0, 0.05, "cl_particles_quality"));\r

diff --git a/data/qcsrc/menu/voret/dialog_settings_video.c b/data/qcsrc/menu/voret/dialog_settings_video.c
index 4a0a59d6d3028e2ec9475de0ec74d3b1a2f03a5e..8e7437fe243ccd1248b2e50ef4e4be2ce75b2d91 100644 (file)
--- a/data/qcsrc/menu/voret/dialog_settings_video.c
+++ b/data/qcsrc/menu/voret/dialog_settings_video.c
@@ -50,6 +50,15 @@ void fillVoretVideoSettingsTab(entity me)
                me.TD(me, 1, 1, e = makeVoretCheckBox(0, "vid_fullscreen", "Full screen"));\r
                me.TD(me, 1, 2, e = makeVoretCheckBox(0, "vid_vsync", "Vertical Synchronization"));\r
        me.TR(me);\r
+       me.TR(me);\r
+       me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Anisotropy:"));\r
+               me.TD(me, 1, 2, e = makeVoretTextSlider("gl_texture_anisotropy"));\r
+                       e.addValue(e, "Disabled", "1");\r
+                       e.addValue(e, "2x", "2");\r
+                       e.addValue(e, "4x", "4");\r
+                       e.addValue(e, "8x", "8");\r
+                       e.addValue(e, "16x", "16");\r
+                       e.configureVoretTextSliderValues(e);\r
        me.TR(me);\r
                me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Antialiasing:"));\r
                me.TD(me, 1, 2, e = makeVoretTextSlider("vid_samples"));\r