Merge remote-tracking branch 'origin/master' into samual/update_effects_tab

Conflicts:
	tooltips.db

diff --cc tooltips.db
index a7915c7269dd791aa7123769e0e50bee08075005,0f80a81332fc7483c773cdf53627da8c155eb85b..9be8795362b66ed72e60102c6f90458ed6518ddc
--- 1/tooltips.db
--- 2/tooltips.db
+++ b/tooltips.db
@@@ -148,20 -146,19 +146,20 @@@
  \r_coronas_occlusionquery\Fade coronas according to visibility (default: enabled)
  \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.5 recommended (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\-
  \bgmvolume\-
- \volume\-
  \snd_staticvolume\-
- \snd_worldchannel0volume\-
- \snd_entchannel3volume\-
- \snd_playerchannel6volume\-
- \snd_playerchannel7volume\-
- \snd_entchannel4volume\-
- \snd_playerchannel2volume\-
- \snd_playerchannel1volume\-
+ \snd_channel0volume\-
+ \snd_channel3volume\-
+ \snd_channel6volume\-
+ \snd_channel7volume\-
+ \snd_channel4volume\-
+ \snd_channel2volume\-
+ \snd_channel1volume\-
  \snd_speed\Sound output frequency
  \snd_channels\Number of channels for the sound output
  \snd_swapstereo\Swap left/right channels