From: Samual <samual@xonotic.org>
Date: Fri, 13 Jan 2012 08:08:27 +0000 (-0500)
Subject: Update effects-*.cfg files and effects tab more
X-Git-Tag: xonotic-v0.6.0~181
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c7e62b67048659c1966060fe91852a28872c3797;p=xonotic%2Fxonotic-data.pk3dir.git
Update effects-*.cfg files and effects tab more
---
diff --git a/effects-high.cfg b/effects-high.cfg
index 0e011fe56b..396eccd919 100644
--- 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 a9cff5abe5..5b42f11666 100644
--- 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 5be8356e2e..15f465d46c 100644
--- 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 0aebfb79df..8fe8a31e4b 100644
--- 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 350e9b8497..1ee09b4f64 100644
--- 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 7e4125bf45..e97726ec8e 100644
--- 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 1c9b9db301..6fcfdf0e5d 100644
--- 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 5cba08f707..22f0214341 100644
--- 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 661eb8649e..55198d68b0 100644
--- 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);