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

diff --combined defaultXonotic.cfg
index 374876659460815801baea8a9a269d32e22d2d94,a88c4b94d9da216f3c46bbdfd663316725acfd5a..27c160ad9bfdee545b251f9b21ab60c549b763f7
--- 1/defaultXonotic.cfg
--- 2/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -10,7 -10,7 +10,7 @@@
  // e.g. Xonotic 1.5.1 RC1 will be 15101
  set g_xonoticversion git "Xonotic version (formatted for humans)"
  
- gameversion 600 // 0.6.0
+ gameversion 700 // 0.7.0
  gameversion_min 0 // git builds see all versions
  gameversion_max 65535 // git builds see all versions
  
@@@ -566,7 -566,6 +566,7 @@@ cl_particles_smoke 
  vid_gl20 1
  r_glsl_deluxemapping 1
  r_glsl_offsetmapping 0
 +r_glsl_offsetmapping_lod 1
  r_glsl_offsetmapping_reliefmapping 0
  r_glsl_offsetmapping_scale 0.02
  // execute effects-normal.cfg to make sure that all effect settings are reset