Merge branch 'master' into terencehill/cursormode

[xonotic/xonotic-data.pk3dir.git] / effects-ultra.cfg

diff --git a/effects-ultra.cfg b/effects-ultra.cfg
index 47949e551b06203da8447f0425a42023c00eb50e..48c17c3a31eb5961a510d3872f9f9b20d650c16e 100644 (file)
--- a/effects-ultra.cfg
+++ b/effects-ultra.cfg
@@ -1,9 +1,10 @@
 cl_decals 1
+cl_decals_models 1
 cl_decals_time 10
 cl_particles_quality 1
+cl_damageeffect 1
 gl_flashblend 0
 gl_picmip -1
-gl_texture_anisotropy 16
 mod_q3bsp_nolightmaps 0
 r_bloom 1
 r_coronas 1
@@ -15,14 +16,14 @@ r_drawdecals_drawdistance 500
 r_drawparticles_drawdistance 2000
 r_glsl_deluxemapping 1
 r_glsl_offsetmapping 1
+r_glsl_offsetmapping_lod 1
 r_glsl_offsetmapping_reliefmapping 0
-r_hdr 0
-r_motionblur 0.5
+r_motionblur 0.4
 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,6 +31,5 @@ r_subdivisions_tolerance 2
 r_texture_dds_load 0
 r_water 1
 r_water_resolutionmultiplier 0.5
-vid_samples 4
 
 menu_sync