Merge branch 'master' into nyov/dedicated-startupscreen

diff --combined defaultXonotic.cfg
index 24e10612642196e14f3f61cadb44d99579ebb4e1,378541e03974c8686855618870b5a57e203db6d4..92d3c74e21c5560b55d553f8bba437b63c9633b7
--- 1/defaultXonotic.cfg
--- 2/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -247,6 -247,11 +247,11 @@@ vid_conheight 60
  // menu_conwidth, menu_conheight are set inside quake.rc
  v_deathtilt 0 // needed for spectators (who are dead to avoid prediction)
  
+ // we want to use sRGB for our maps!
+ exec sRGB-disable.cfg
+ vid_sRGB_fallback 2
+ r_hdr_glowintensity 1
+ 
  // these settings determine how much the view is affected by movement/damage
  cl_smoothviewheight 0.05 // time of the averaging to the viewheight value so that it creates a smooth transition for crouching and such. 0 for instant transition
  cl_deathfade 0 // fade screen to dark red when dead, value represents how fast the fade is (higher is faster)
@@@ -287,13 -292,12 +292,12 @@@ gl_polyblend 0 // whether to use scree
  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 16
- r_bloom_brighten 2.5
- r_bloom_colorexponent 1
- r_bloom_colorscale 1
- r_bloom_colorsubtract 0.15
+ 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
- r_hdr_range 4
  
  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:
@@@ -395,8 -399,8 +399,8 @@@ seta sv_precacheitems 
  set sv_spectator_speed_multiplier 1.5
  seta sv_spectate 1 "if set to 1, new clients are allowed to spectate or observe the game, if set to 0 joining clients spawn as players immediately (no spectating)"
  seta sv_defaultcharacter 0 "master switch, if set to 1 the further configuration for replacing all player models, skins and colors is taken from the sv_defaultplayermodel, sv_defaultplayerskin and sv_defaultplayercolors variables"
- seta sv_defaultplayermodel "models/player/erebus.iqm" "default model selection, only works if sv_defaultcharacter is set to 1"
- seta sv_defaultplayerskin 0 "each model has 1 or more skins (combination of model and skin = character), set which skin of the model you wish the default character to have, only works if sv_defaultcharacter is set to 1"
+ seta sv_defaultplayermodel "models/player/erebus.iqm" "default model selection, only works if sv_defaultcharacter is set to 1; you may append a :<skinnumber> suffix to model names; you can specify multiple, separated by space, and a random one will be chosen"
+ seta sv_defaultplayerskin 0 "each model has 1 or more skins (combination of model and skin = character), set which skin of the model you wish the default character to have, only works if sv_defaultcharacter is set to 1; can be overriden by :<skinnumber> suffix in sv_defaultplayermodel"
  seta sv_defaultplayermodel_red ""     "\"\" means see sv_defaultplayermodel"
  seta sv_defaultplayerskin_red 0
  seta sv_defaultplayermodel_blue "" "\"\" means see sv_defaultplayermodel"
@@@ -603,8 -607,8 +607,8 @@@ seta g_freezetag_revive_clearspeed 1.6 
  seta g_freezetag_revive_extra_size 100 "Distance in qu that you can stand from a frozen teammate to keep reviving him"
  seta g_freezetag_frozen_force 0.6 "How much to multiply the force on a frozen player with"
  
- // 50% of the spawns shall be far away from any players
- set g_spawn_furthest 0.5
+ set g_spawn_furthest 0.5 "this amount of the spawns shall be far away from any players"
+ set g_spawn_useallspawns 0 "use all spawns, e.g. also team spawns in non-teamplay, and all spawns, even enemy spawns, in teamplay"
  // respawn delay
  set g_respawn_delay 2 "number of seconds you have to wait before you can respawn again"
  set g_respawn_waves 0 "respawn in waves (every n seconds), intended to decrease overwhelming base attacks"
@@@ -912,7 -916,6 +916,6 @@@ gl_picmip_other 1 // so, picmip -1 is b
  r_mipsprites 1
  r_mipskins 1
  r_shadow_realtime_world_lightmaps 1
- seta r_ambient 4
  cl_decals_fadetime 5
  cl_decals_time 2
  seta cl_gunalign 3 "Gun alignment; 1 = center (if allowed by g_shootfromclient) or right, 2 = center (if allowed by g_shootfromclient) or left, 3 = right only, 4 = left only"
@@@ -1288,6 -1291,9 +1291,9 @@@ alias "g_waypointsprite_toggle" "toggl
  // key for that?
  seta cl_hidewaypoints 0 "disable static waypoints, only show team waypoints"
  
+ seta g_waypointsprites_turrets 1 "disable turret waypoints"
+ seta g_waypointsprites_turrets_maxdist 4000 "max distace for turret sprites"
+ 
  // command extension
  alias qc_cmd  "sv_cmd $*" // menu QC will override this to menu_cmd
  alias adminmsg        "sv_cmd adminmsg $*"
@@@ -2076,16 -2082,11 +2082,12 @@@ snd_identicalsoundrandomization_tic
  scr_loadingscreen_background 0
  scr_loadingscreen_barcolor "0 0.5 1"
  scr_loadingscreen_barheight 12
 -scr_loadingscreen_count 13
 +scr_loadingscreen_count 14
 +scr_loadingscreen_firstforstartup 1
  scr_loadingscreen_scale 999
  scr_loadingscreen_scale_base 1
  scr_loadingscreen_scale_limit 2
  
- // sRGB configuration (EXPERIMENTAL, needs maps to be relit)
- alias sRGBcorrect_on  "r_texture_sRGB_skin_diffuse 1;r_texture_sRGB_skin_gloss 1;r_texture_sRGB_skin_glow 1;r_texture_sRGB_reflect 1;r_texture_sRGB_skybox 1;v_gamma 2.2;r_restart"
- alias sRGBcorrect_off "r_texture_sRGB_skin_diffuse 0;r_texture_sRGB_skin_gloss 0;r_texture_sRGB_skin_glow 0;r_texture_sRGB_reflect 0;r_texture_sRGB_skybox 0;v_gamma 1.0;r_restart"
- 
  // other config files
  exec balanceXonotic.cfg
  exec ctfscoring-ai.cfg