Merge remote branch 'origin/master' into samual/updatecommands

[xonotic/xonotic-data.pk3dir.git] / defaultXonotic.cfg

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 6909037f675c67ce866d09e3cea1135c87fa4ade..82511d4e587f3abb3ad572a476674e5d6c71e882 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -259,13 +259,6 @@ gl_polyblend 0 // whether to use screen tints, this has now been replaced by a b
 r_motionblur 0 // motion blur value, default is 0
 r_damageblur 0 // motion blur when damaged, default is 0 (removed in Xonotic)
 
-r_bloom_blur 6
-r_bloom_brighten 1.5
-r_bloom_colorexponent 2
-r_bloom_colorscale 1.75
-r_bloom_colorsubtract 0.1
-r_bloom_resolution 320
-
 seta vid_x11_display ""        "xonotic-linux-*.sh will use this to start xonotic on an other/new X display"
 // This can have three possible settings:
 //     ""              run as usual