Merge remote-tracking branch 'origin/master' into samual/update_effects_tab
authorSamual Lenks <samual@xonotic.org>
Wed, 22 May 2013 02:34:46 +0000 (22:34 -0400)
committerSamual Lenks <samual@xonotic.org>
Wed, 22 May 2013 02:34:46 +0000 (22:34 -0400)
Conflicts:
tooltips.db

tooltips.db

index 0f80a81332fc7483c773cdf53627da8c155eb85b..9be8795362b66ed72e60102c6f90458ed6518ddc 100644 (file)
 \r_bloom\Enable bloom effect, which brightens the neighboring pixels of very bright pixels. Has a big impact on performance. (default: disabled)
 \r_hdr\Higher quality version of bloom, which has a huge impact on performance. (default: disabled)
 \r_motionblur\Motion blur strength - 0.4 recommended
+\hud_postprocessing_maxbluralpha\Enables special postprocessing effects for when damaged or under water or using a powerup (default: disabled)
 
 \XonoticSettingsDialog/Audio\Audio settings
 \mastervolume\-