Move anti-aliasing and FBO to the Video menu instead of Effects

diff --git a/data/effects-high.cfg b/data/effects-high.cfg
index bb04d0baf914acde15299191c7c80aa790d510de..31164a5a61423f2a99cd324e9763062845b6d0f2 100644 (file)
--- a/data/effects-high.cfg
+++ b/data/effects-high.cfg
@@ -33,6 +33,5 @@ r_subdivisions_tolerance 3
 r_water 1\r
 r_water_resolutionmultiplier 0.5\r
 r_hdr_irisadaptation 1\r
-vid_samples 2\r
 \r
 menu_sync\r

diff --git a/data/effects-low.cfg b/data/effects-low.cfg
index 5fd255fd4c4b337f4b40836a1f1d1deebcd22a58..160899b296ec056d754fdec9c6d3591745a628c1 100644 (file)
--- a/data/effects-low.cfg
+++ b/data/effects-low.cfg
@@ -33,6 +33,5 @@ r_subdivisions_tolerance 8
 r_water 0\r
 r_water_resolutionmultiplier 0.5\r
 r_hdr_irisadaptation 0\r
-vid_samples 1\r
 \r
 menu_sync\r

diff --git a/data/effects-med.cfg b/data/effects-med.cfg
index e73b44b5ed3fd82c1f1b4428bf5d6d81e21a546a..4c72d37ecca8cf9438b3b299cf5ce81e3452cff6 100644 (file)
--- a/data/effects-med.cfg
+++ b/data/effects-med.cfg
@@ -33,6 +33,5 @@ r_subdivisions_tolerance 4
 r_water 0\r
 r_water_resolutionmultiplier 0.5\r
 r_hdr_irisadaptation 0\r
-vid_samples 1\r
 \r
 menu_sync\r

diff --git a/data/effects-normal.cfg b/data/effects-normal.cfg
index 7a8c735d6fa5880f5d83fd1916b71af19b534d94..38428c77a8c5ad373f1021a510aa9e2b79119482 100644 (file)
--- a/data/effects-normal.cfg
+++ b/data/effects-normal.cfg
@@ -33,6 +33,5 @@ r_subdivisions_tolerance 3
 r_water 0\r
 r_water_resolutionmultiplier 0.5\r
 r_hdr_irisadaptation 1\r
-vid_samples 1\r
 \r
 menu_sync\r

diff --git a/data/effects-omg.cfg b/data/effects-omg.cfg
index 70a60f0c20f2120c0f6e85b277464b52a895f227..7cf611cf3a04c210c3f425ab279d3aa5390f4ab3 100644 (file)
--- a/data/effects-omg.cfg
+++ b/data/effects-omg.cfg
@@ -33,6 +33,5 @@ r_subdivisions_tolerance 16
 r_water 0\r
 r_water_resolutionmultiplier 0.5\r
 r_hdr_irisadaptation 0\r
-vid_samples 1\r
 \r
 menu_sync\r

diff --git a/data/effects-ultimate.cfg b/data/effects-ultimate.cfg
index 0c74e755905287301e1621df3e91eed486a71f8e..6181467b8e1f6f1febb859f841c7d4cbc83317d2 100644 (file)
--- a/data/effects-ultimate.cfg
+++ b/data/effects-ultimate.cfg
@@ -33,6 +33,5 @@ r_subdivisions_tolerance 1
 r_water 1\r
 r_water_resolutionmultiplier 1\r
 r_hdr_irisadaptation 1\r
-vid_samples 4\r
 \r
 menu_sync\r

diff --git a/data/effects-ultra.cfg b/data/effects-ultra.cfg
index 91b76a45eb78b0dd5c58c5be4edbce7b9a4c3b6a..f5c0177fc37a5cf77c37a0d5473c8a750e239b57 100644 (file)
--- a/data/effects-ultra.cfg
+++ b/data/effects-ultra.cfg
@@ -33,6 +33,5 @@ r_subdivisions_tolerance 2
 r_water 1\r
 r_water_resolutionmultiplier 0.5\r
 r_hdr_irisadaptation 1\r
-vid_samples 4\r
 \r
 menu_sync\r

diff --git a/data/qcsrc/menu/voret/dialog_settings_effects.c b/data/qcsrc/menu/voret/dialog_settings_effects.c
index cb920e6ea62d402d2fa68bafd50850d23f5bbe33..ba2fc385b8e44f10c24e6f5c7e30dd63fa9022bb 100644 (file)
--- a/data/qcsrc/menu/voret/dialog_settings_effects.c
+++ b/data/qcsrc/menu/voret/dialog_settings_effects.c
@@ -57,17 +57,6 @@ void fillVoretEffectsSettingsTab(entity me)
                        e.addValue(e, "Best", "2");\r
                        e.addValue(e, "Insane", "1");\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
-                       e.addValue(e, "Disabled", "1");\r
-                       e.addValue(e, "2x", "2");\r
-                       e.addValue(e, "4x", "4");\r
-                       e.configureVoretTextSliderValues(e);\r
-                       setDependent(e, "r_viewfbo", 0, 0);\r
-       me.TR(me);\r
-               me.TD(me, 1, 3, e = makeVoretCheckBoxEx(2, 0, "r_viewfbo", _("High-quality frame buffer")));\r
-                       setDependent(e, "vid_samples", 1, 1);\r
        me.TR(me);\r
        me.TR(me);\r
                me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Texture quality:"));\r

diff --git a/data/qcsrc/menu/voret/dialog_settings_video.c b/data/qcsrc/menu/voret/dialog_settings_video.c
index dbba13159061d491ec95dc1275e5132175f6f5af..4a0a59d6d3028e2ec9475de0ec74d3b1a2f03a5e 100644 (file)
--- a/data/qcsrc/menu/voret/dialog_settings_video.c
+++ b/data/qcsrc/menu/voret/dialog_settings_video.c
@@ -50,6 +50,18 @@ 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, "Antialiasing:"));\r
+               me.TD(me, 1, 2, e = makeVoretTextSlider("vid_samples"));\r
+                       e.addValue(e, "Disabled", "1");\r
+                       e.addValue(e, "2x", "2");\r
+                       e.addValue(e, "4x", "4");\r
+                       e.configureVoretTextSliderValues(e);\r
+                       setDependent(e, "r_viewfbo", 0, 0);\r
+       me.TR(me);\r
+               me.TD(me, 1, 3, e = makeVoretCheckBoxEx(2, 0, "r_viewfbo", _("High-quality frame buffer")));\r
+                       setDependent(e, "vid_samples", 1, 1);\r
+       me.TR(me);\r
        me.TR(me);\r
                me.TD(me, 1, 3, e = makeVoretCheckBox(0, "vid_gl20", "Use OpenGL 2.0 shaders (GLSL)"));\r
        me.TR(me);\r

diff --git a/docs/TODO.txt b/docs/TODO.txt
index 8ff7e2b6590905d3b99ae1b3190b7953dfee42f1..7c87f7eeeb4e38c270b1d69d3ed443529526b636 100644 (file)
--- a/docs/TODO.txt
+++ b/docs/TODO.txt
@@ -82,12 +82,8 @@
 \r
 - +0.8: Add icons to indicate live prey + dead prey + items\r
 \r
-- 0.7: Create missing player / map / skin preview images\r
-\r
 - 0.7 | 0.8: Make sure the new blood leaves stains\r
 \r
-- 0.7: Does r_viewfbo belong in the effect presets too?\r
-\r
 - 0.7 | 0.8: Add cubemap reflections for eX and trak5\r
 \r
 - 0.7 | 0.8: Maybe find better footstep sounds?\r