Merge branch 'master' into martin-t/effects

diff --git a/_hud_common.cfg b/_hud_common.cfg
index ee1babe195f253b7e6611d69ffef9b8c53015fc0..75e8eb8d6f51a5d4ee6b94b804aea9eaac9a0d45 100644 (file)
--- a/_hud_common.cfg
+++ b/_hud_common.cfg
@@ -159,11 +159,11 @@ seta hud_damage_pain_threshold_lower_health 50 "at which health we start lowerin
 seta hud_damage_pain_threshold_pulsating_min 0.6 "minimum value when calculating the pulse: max(pulsating_min, fabs(sin(PI * time / period))"
 seta hud_damage_pain_threshold_pulsating_period 0.8 "one pulse every X seconds"
 
-seta hud_powerup 0 "power of the sharpen effect when owning the shield or strength powerups, default is 0.5"
+seta hud_powerup 0 "power of the sharpen effect when owning the shield or strength powerups"
 
 seta hud_postprocessing 1 "enables the ability for effects such as hud_damage_blur and hud_contents to apply a postprocessing method upon the screen - enabling this disables manual editing of the postprocess cvars"
-seta hud_postprocessing_maxbluralpha 0 "maximum alpha which the blur postprocess can be, default is 0.5"
-seta hud_postprocessing_maxblurradius 8 "maximum radius which the blur postprocess can be, default is 8"
+seta hud_postprocessing_maxbluralpha 0 "maximum alpha which the blur postprocess can be"
+seta hud_postprocessing_maxblurradius 8 "maximum radius which the blur postprocess can be"
 
 seta hud_contents 1 "an improved version of gl_polyblend for liquids such as water/lava/slime, draw a filler when inside the liquid"
 seta hud_contents_blur 10 "Use postprocessing to blur the screen when you are inside a liquid. Higher values = more blur"

diff --git a/effects-med.cfg b/effects-med.cfg
index 4ea20a1699d110c6742eab52260963c581b9ee66..55526651d71d83c7c61e7701749bff889606721a 100644 (file)
--- a/effects-med.cfg
+++ b/effects-med.cfg
@@ -9,7 +9,7 @@ cl_playerdetailreduction 4
 gl_flashblend 0
 gl_picmip 0
 gl_texturecompression_2d 0
-gl_texturecompression_sky 1
+gl_texturecompression_sky 0
 mod_q3bsp_nolightmaps 0
 r_bloom 0
 r_coronas 1

diff --git a/xonotic-client.cfg b/xonotic-client.cfg
index 68ea9da69a0320dae73e0b3d82b3415530e9edf6..3f9baf571bb2f56366bbeb2c511110ec486a1042 100644 (file)
--- a/xonotic-client.cfg
+++ b/xonotic-client.cfg
@@ -605,11 +605,12 @@ makesaved music_playlist_random0
 
 cl_netfps 60 // should match or be a multiple of sys_ticrate
 
-seta gl_texturecompression 0
+gl_texture_anisotropy 8
+seta gl_texturecompression 0 // FIXME the description is wrong - when this is 0, e.g. gl_texturecompression_sky still takes effect
 gl_texturecompression_color 1
 gl_texturecompression_gloss 1
 gl_texturecompression_glow 1
-gl_texturecompression_lightcubemaps 1
+gl_texturecompression_lightcubemaps 0
 gl_texturecompression_q3bsplightmaps 0
 gl_texturecompression_sky 1