Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir

diff --combined defaultXonotic.cfg
index 60f0a78caca7094d1af91ef61b47a2bf39a8f958,b8cb1d689c229c2318d1320040bd8623c2a4e524..3b585d723760ee39c2901578aae1f2e3f5b093b5
--- 1/defaultXonotic.cfg
--- 2/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -848,6 -848,10 +848,10 @@@ set g_deathglow 1.25 "when enabled, pla
  
  // effects
  r_picmipsprites 0 // Xonotic uses sprites that should never be picmipped (team mate, typing, waypoints)
+ r_picmipworld 1
+ gl_picmip_world 0
+ gl_picmip_sprites 0
+ gl_picmip_other 2 // so, picmip -2 is best possible quality
  r_mipsprites 1
  r_mipskins 1
  r_shadow_realtime_world_lightmaps 1
@@@ -1904,6 -1908,3 +1908,6 @@@ scr_conscroll3_x 
  scr_conscroll3_y 0
  scr_conscroll_x -0.1
  scr_conscroll_y -0.3
 +
 +// DP cannot properly detect this, so rather turn off the detection
 +r_texture_dds_load_dxt1_noalpha 1