Update effects-*.cfg files and effects tab more

diff --git a/effects-high.cfg b/effects-high.cfg
index 0e011fe56be28f6516e54bd5cf76fab65031acac..396eccd91964aa995053cbfea9ecb100f164e973 100644 (file)
--- a/effects-high.cfg
+++ b/effects-high.cfg
@@ -4,7 +4,6 @@ cl_decals_time 4
 cl_particles_quality 1
 gl_flashblend 0
 gl_picmip -1
-gl_texture_anisotropy 16
 mod_q3bsp_nolightmaps 0
 r_bloom 1
 r_coronas 1
@@ -30,7 +29,5 @@ r_subdivisions_tolerance 3
 r_texture_dds_load 1
 r_water 1
 r_water_resolutionmultiplier 0.5
-vid_samples 1
-r_viewfbo 2
 
 menu_sync

diff --git a/effects-low.cfg b/effects-low.cfg
index a9cff5abe5e85b3f5bd38c64bd5a5293cda43e89..5b42f11666373428a5b79fa50d3e0c0dcf536c17 100644 (file)
--- a/effects-low.cfg
+++ b/effects-low.cfg
@@ -4,7 +4,6 @@ cl_decals_time 2
 cl_particles_quality 0.4
 gl_flashblend 1
 gl_picmip 1
-gl_texture_anisotropy 1
 mod_q3bsp_nolightmaps 1
 r_bloom 0
 r_coronas 1
@@ -30,7 +29,5 @@ r_subdivisions_tolerance 8
 r_texture_dds_load 1
 r_water 0
 r_water_resolutionmultiplier 0.5
-vid_samples 1
-r_viewfbo 0
 
 menu_sync

diff --git a/effects-med.cfg b/effects-med.cfg
index 5be8356e2e11c52fca16d0f258372bb05eaddd9f..15f465d46ce3153b2a4c5b76ba51c4675a2102a7 100644 (file)
--- a/effects-med.cfg
+++ b/effects-med.cfg
@@ -4,7 +4,6 @@ cl_decals_time 2
 cl_particles_quality 1
 gl_flashblend 0
 gl_picmip 0
-gl_texture_anisotropy 1
 mod_q3bsp_nolightmaps 0
 r_bloom 0
 r_coronas 1
@@ -30,7 +29,5 @@ r_subdivisions_tolerance 4
 r_texture_dds_load 1
 r_water 0
 r_water_resolutionmultiplier 0.5
-vid_samples 1
-r_viewfbo 0
 
 menu_sync

diff --git a/effects-normal.cfg b/effects-normal.cfg
index 0aebfb79dfd709737399f73b5e83721720415bda..8fe8a31e4b68e6515edc30090d2de015b9668c97 100644 (file)
--- a/effects-normal.cfg
+++ b/effects-normal.cfg
@@ -4,7 +4,6 @@ cl_decals_time 2
 cl_particles_quality 1
 gl_flashblend 0
 gl_picmip 0
-gl_texture_anisotropy 1
 mod_q3bsp_nolightmaps 0
 r_bloom 0
 r_coronas 1
@@ -30,7 +29,5 @@ r_subdivisions_tolerance 3
 r_texture_dds_load 1
 r_water 0
 r_water_resolutionmultiplier 0.5
-vid_samples 1
-r_viewfbo 0
 
 menu_sync

diff --git a/effects-omg.cfg b/effects-omg.cfg
index 350e9b8497afd77ae4b187b01d1e1e7b9fa4ed55..1ee09b4f648148f6101767a285e3407dcd8b194b 100644 (file)
--- a/effects-omg.cfg
+++ b/effects-omg.cfg
@@ -4,7 +4,6 @@ cl_decals_time 2
 cl_particles_quality 0.4
 gl_flashblend 1
 gl_picmip 1337
-gl_texture_anisotropy 1
 mod_q3bsp_nolightmaps 1
 r_bloom 0
 r_coronas 1
@@ -30,7 +29,5 @@ r_subdivisions_tolerance 16
 r_texture_dds_load 1
 r_water 0
 r_water_resolutionmultiplier 0.5
-vid_samples 1
-r_viewfbo 0
 
 menu_sync

diff --git a/effects-ultimate.cfg b/effects-ultimate.cfg
index 7e4125bf45bf224371e234cf601e70c2e46ff1df..e97726ec8ebc7dd19cd9e3825748cea9835d1619 100644 (file)
--- a/effects-ultimate.cfg
+++ b/effects-ultimate.cfg
@@ -4,7 +4,6 @@ cl_decals_time 10
 cl_particles_quality 1
 gl_flashblend 0
 gl_picmip -1
-gl_texture_anisotropy 16
 mod_q3bsp_nolightmaps 0
 r_bloom 1
 r_coronas 1
@@ -30,7 +29,5 @@ r_subdivisions_tolerance 1
 r_texture_dds_load 0
 r_water 1
 r_water_resolutionmultiplier 1
-vid_samples 1
-r_viewfbo 2
 
 menu_sync

diff --git a/effects-ultra.cfg b/effects-ultra.cfg
index 1c9b9db3012a4f9d05d76aacac7180feea54880e..6fcfdf0e5dcfc7735596ce925344297bf9a4d768 100644 (file)
--- a/effects-ultra.cfg
+++ b/effects-ultra.cfg
@@ -4,7 +4,6 @@ cl_decals_time 10
 cl_particles_quality 1
 gl_flashblend 0
 gl_picmip -1
-gl_texture_anisotropy 16
 mod_q3bsp_nolightmaps 0
 r_bloom 1
 r_coronas 1
@@ -22,7 +21,7 @@ r_shadow_gloss 1
 r_shadow_realtime_dlight 1
 r_shadow_realtime_dlight_shadows 1
 r_shadow_realtime_world 1
-r_shadow_realtime_world_shadows 1
+r_shadow_realtime_world_shadows 0
 r_shadow_shadowmapping 1
 r_shadow_usenormalmap 1
 r_showsurfaces 0
@@ -30,7 +29,5 @@ r_subdivisions_tolerance 2
 r_texture_dds_load 0
 r_water 1
 r_water_resolutionmultiplier 0.5
-vid_samples 1
-r_viewfbo 2
 
 menu_sync

diff --git a/keybinds.txt b/keybinds.txt
index 5cba08f707132a1332cdd2ed01d3db89b229d49b..22f021434183f8611ae0307dc1b2314874ef6292 100644 (file)
--- a/keybinds.txt
+++ b/keybinds.txt
@@ -47,7 +47,7 @@
 "+show_info"                            "server info"
 "toggleconsole"                         "enter console"
 "disconnect"                            "disconnect"
-"quit"                                  "quit"
+"menu_showquitdialog"                   "quit"
 ""                                      ""
 ""                                      "Teamplay"
 "messagemode2"                          "team chat"

diff --git a/qcsrc/menu/xonotic/dialog_settings_effects.c b/qcsrc/menu/xonotic/dialog_settings_effects.c
index 661eb8649e95380047f37f0c2a4ed50a5e362c1d..55198d68b0acf2c982fccc103f77832c88bba09b 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_effects.c
+++ b/qcsrc/menu/xonotic/dialog_settings_effects.c
@@ -89,25 +89,16 @@ void XonoticEffectsSettingsTab_fill(entity me)
                        }
                }
        me.TR(me);
-       me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Anisotropy:")));
-               me.TD(me, 1, 2, e = makeXonoticTextSlider("gl_texture_anisotropy"));
-                       e.addValue(e, ZCTX(_("ANISO^Disabled")), "1");
-                       e.addValue(e, _("2x"), "2");
-                       e.addValue(e, _("4x"), "4");
-                       e.addValue(e, _("8x"), "8");
-                       e.addValue(e, _("16x"), "16");
-                       e.configureXonoticTextSliderValues(e);
-       me.TR(me);
        me.TR(me);
-               me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Particle quality:")));
+               me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Particles quality:")));
                me.TD(me, 1, 2, e = makeXonoticSlider(0.2, 1.0, 0.1, "cl_particles_quality"));
        me.TR(me);
-               me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Particle distance:")));
+               me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Particles distance:")));
                me.TD(me, 1, 2, e = makeXonoticSlider(500, 2000, 100, "r_drawparticles_drawdistance"));
        me.TR(me);
        me.TR(me);
-               me.TD(me, 1, 1.5, e = makeXonoticCheckBox(0, "cl_decals", _("Decals")));
-               me.TD(me, 1, 1.5, e = makeXonoticCheckBox(0, "cl_decals_models", _("Decals on models")));
+               me.TD(me, 1, 1, e = makeXonoticCheckBox(0, "cl_decals", _("Decals")));
+               me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "cl_decals_models", _("Decals on models")));
                        setDependent(e, "cl_decals", 1, 1);
        me.TR(me);
                me.TDempty(me, 0.2);