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

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index b8cb1d689c229c2318d1320040bd8623c2a4e524..3b585d723760ee39c2901578aae1f2e3f5b093b5 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1908,3 +1908,6 @@ scr_conscroll3_x 0
 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