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

diff --combined defaultXonotic.cfg
index c2697006a58e3a3996268b2d48f0be04c4361cb2,4ea9639e5c3ccdbf81ca2f997586455bb455af4b..49a38f69a2c0ea4553ffd2a204c865a83bc6053f
--- 1/defaultXonotic.cfg
--- 2/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -818,7 -818,6 +818,7 @@@ set g_chat_flood_lmax_tell 2       "private c
  set g_chat_flood_burst_tell 2 "private chat: allow bursts of so many chat lines"
  set g_chat_flood_notify_flooder 1     "when 0, the flooder still can see his own message"
  set g_chat_teamcolors 0       "colorize nicknames in team color for chat"
 +set g_chat_tellprivacy 1 "when disabled, tell messages are also sent to the server console log... otherwise they're kept private between players."
  set g_nick_flood_timeout 120 "time after which nick flood protection resets (set to 0 to disable nick flood checking)"
  set g_nick_flood_penalty 0.5 "duration of the nick flood penalty"
  set g_nick_flood_penalty_yellow 3 "number of changes to allow before warning and movement blocking"
@@@ -1439,6 -1438,8 +1439,8 @@@ r_shadow_glossintensity 
  // use fake light if map has no lightmaps
  r_fakelight 1
  
+ r_water_hideplayer 1 // hide your own feet/player model in refraction views, this way you don't see half of your body under water
+ 
  // strength sound settings
  set sv_strengthsound_antispam_time 0.1 "minimum distance of strength sounds"
  set sv_strengthsound_antispam_refire_threshold 0.04 "apply minimum distance only if refire of the gun is smaller than this"
@@@ -1551,7 -1552,6 +1553,7 @@@ exec turrets.cf
  exec vehicles.cfg
  exec crosshairs.cfg
  exec gamemodes.cfg
 +exec notifications.cfg
  
  // load console command aliases and settings
  exec commands.cfg