Merge remote branch 'origin/master' into mirceakitsune/damage_effects

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

diff --git a/effects-ultra.cfg b/effects-ultra.cfg
index 94d47fab2e7cfcf4a600c625ecf6b8b401d99760..9dda230cad36e1773a39083b3cc46b33d67d2fd4 100644 (file)
--- a/effects-ultra.cfg
+++ b/effects-ultra.cfg
@@ -2,6 +2,7 @@ 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
@@ -17,7 +18,6 @@ r_drawparticles_drawdistance 2000
 r_glsl_deluxemapping 1
 r_glsl_offsetmapping 1
 r_glsl_offsetmapping_reliefmapping 0
-r_hdr 0
 r_motionblur 0.5
 r_shadow_gloss 1
 r_shadow_realtime_dlight 1
@@ -31,6 +31,7 @@ r_subdivisions_tolerance 2
 r_texture_dds_load 0
 r_water 1
 r_water_resolutionmultiplier 0.5
-vid_samples 4
+vid_samples 1
+r_viewfbo 2
 
 menu_sync