From: Mario <zacjardine@y7mail.com>
Date: Fri, 10 Mar 2017 16:59:18 +0000 (+0000)
Subject: Merge branch 'martin-t/spec' into 'master'
X-Git-Tag: xonotic-v0.8.2~101
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=78b0634a8cfc4d1b6d24af825ac15d27d607e593;hp=-c

Merge branch 'martin-t/spec' into 'master'

Toggle {sv,cl}_showspectators

See merge request !413
---

78b0634a8cfc4d1b6d24af825ac15d27d607e593
diff --combined defaultXonotic.cfg
index 47f42fd29b,c351176d38..0c916558e4
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -478,7 -478,6 +478,7 @@@ set g_playerclip_collisions 1 "0 = disa
  set g_botclip_collisions 1 "0 = disable collision testing against botclips, might be useful on some defrag maps"
  
  set g_grappling_hook 0 "let players spawn with the grappling hook which allows them to pull themselves up"
 +set g_grappling_hook_useammo 0 "use ammunition with the off-hand grappling hook"
  
  set g_spawn_alloweffects 1 "allow clients to enable spawn point and event effects such as particles and sounds, see cl_spawn_ cvars for more info"
  set g_spawn_furthest 0.5 "this amount of the spawns shall be far away from any players"
@@@ -792,13 -791,9 +792,13 @@@ seta g_waypointsprite_tactical 1 "tacti
  seta cl_damagetext "1" "Draw damage dealt where you hit the enemy"
  seta cl_damagetext_format "-{total}" "How to format the damage text. {health}, {armor}, {total}, {potential}: full damage not capped to target's health, {potential_health}: health damage not capped to target's health"
  seta cl_damagetext_format_verbose 0 "{health} shows {potential_health} too when they differ; {total} shows {potential} too when they differ"
 +seta cl_damagetext_format_hide_redundant 0 "hide {armor} if 0; hide {potential} and {potential_health} when same as actual"
  seta cl_damagetext_color "1 1 0" "Damage text color"
  seta cl_damagetext_color_per_weapon "0" "Damage text uses weapon color"
 -seta cl_damagetext_size "8" "Damage text font size"
 +seta cl_damagetext_size_min 10 "Damage text font size for small damage"
 +seta cl_damagetext_size_min_damage 25 "How much damage is considered small"
 +seta cl_damagetext_size_max 16 "Damage text font size for large damage"
 +seta cl_damagetext_size_max_damage 140 "How much damage is considered large"
  seta cl_damagetext_alpha_start "1" "Damage text initial alpha"
  seta cl_damagetext_alpha_lifetime "3" "Damage text lifetime in seconds"
  seta cl_damagetext_velocity "0 0 20" "Damage text move direction"
@@@ -1495,8 -1490,8 +1495,8 @@@ set cl_fullbright_items 0 "enable fullb
  set cl_weapon_stay_color "2 0.5 0.5" "Color of picked up weapons when g_weapon_stay > 0"
  set cl_weapon_stay_alpha 0.75 "Alpha of picked up weapons when g_weapon_stay > 0"
  
- set sv_showspectators 0 "Show who's spectating who in the player info panel. Shouldn't be used on competitive servers, also disable when watching a suspected cheater"
- seta cl_showspectators 1
+ set sv_showspectators 1 "Show who's spectating who in the player info panel when client has cl_showspectators on. Shouldn't be used on competitive servers, also disable when watching a suspected cheater"
+ seta cl_showspectators 0 "Show who's spectating you if server has sv_showspectators enabled"
  
  // Facility for config.cfg use ONLY.
  // Interpreted in post-config.cfg.