Merge branch 'master' into martin-t/effects

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

diff --git a/effects-omg.cfg b/effects-omg.cfg
index a68a15787ded9bb5b8a10003b278054e7e29c3c3..7614417ce2027e42c4d711fce396faaaf7c1cd14 100644 (file)
--- a/effects-omg.cfg
+++ b/effects-omg.cfg
@@ -1,23 +1,27 @@
 cl_decals 0
 cl_decals_models 0
-cl_decals_time 2
+cl_decals_fadetime 2
+cl_particles 1
 cl_particles_quality 0.4
+cl_damageeffect 0
+cl_spawn_point_particles 0
+cl_playerdetailreduction 4
 gl_flashblend 1
 gl_picmip 1337
-gl_texture_anisotropy 1
+gl_texturecompression_2d 1
+gl_texturecompression_sky 1
 mod_q3bsp_nolightmaps 1
 r_bloom 0
 r_coronas 1
 r_coronas_occlusionquery 0
-hud_postprocessing_maxbluralpha 0.5
-hud_powerup 0.5
+hud_postprocessing_maxbluralpha 0
+hud_powerup 0
 r_depthfirst 0
 r_drawdecals_drawdistance 100
 r_drawparticles_drawdistance 250
 r_glsl_deluxemapping 0
 r_glsl_offsetmapping 0
 r_glsl_offsetmapping_reliefmapping 0
-r_hdr 0
 r_motionblur 0
 r_shadow_gloss 0
 r_shadow_realtime_dlight 0
@@ -30,7 +34,6 @@ r_showsurfaces 3
 r_subdivisions_tolerance 16
 r_texture_dds_load 1
 r_water 0
-r_water_resolutionmultiplier 0.5
-vid_samples 1
+r_water_resolutionmultiplier 0.25
 
 menu_sync