From: Samual <samual@xonotic.org>
Date: Fri, 29 Apr 2011 05:35:24 +0000 (-0400)
Subject: Merge remote branch 'origin/master' into mirceakitsune/event_chasecam
X-Git-Tag: xonotic-v0.5.0~268^2^2~3
X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=bd9b670cca7d94ed61720b5d5231bef96f00ef52;hp=-c;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/master' into mirceakitsune/event_chasecam
---

bd9b670cca7d94ed61720b5d5231bef96f00ef52
diff --combined defaultXonotic.cfg
index e823386ef,14c52f922..546bbf4d0
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -242,7 -242,7 +242,7 @@@ v_deathtilt 0 // needed for spectators 
  
  // 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 1 // fade screen to dark red when dead, value represents how fast the fade is (higher is faster)
+ cl_deathfade 0 // fade screen to dark red when dead, value represents how fast the fade is (higher is faster)
  cl_bobcycle 0 // how long the cycle of up/down view movement takes (only works if cl_bob is not 0), default is 0.6
  cl_bob 0.01 // how much view moves up/down when moving (does not move if cl_bobcycle is 0, but still enables cl_bobmodel), default is 0.02
  cl_bob2cycle 0 // how long the cycle of left/right view movement takes (only works if cl_bob2 is not 0), default is 0.6
@@@ -316,11 -316,6 +316,11 @@@ set sv_ready_restart_repeatable 0	"allo
  seta cl_hitsound 1 "play a hit notifier sound when you have hit an enemy"
  set cl_hitsound_antispam_time 0.05 "don't play the hitsound more often than this"
  
 +seta cl_eventchase_death 1 "camera goes into 3rd person mode when the player is dead"
 +seta cl_eventchase_intermission 1 "camera goes into 3rd person mode when the match ends"
 +seta cl_eventchase_distance 140 "final camera distance"
 +seta cl_eventchase_speed 1.3 "how fast the camera slides back, 0 is instant"
 +
  //nifreks lockonrestart feature, used in team-based game modes, if set to 1 and all players readied up no other player can then join the game anymore, useful to block spectators from joining
  set teamplay_lockonrestart 0 "it set to 1 in a team-based game, the teams are locked once all players readied up and the game restarted (no new players can join after restart unless using the server-command unlockteams)"
  
@@@ -1190,7 -1185,7 +1190,7 @@@ seta sv_servermodelsonly 
  cl_curl_enabled 1
  cl_curl_maxspeed 300
  sv_curl_defaulturl "http://www.xonotic.com/contentdownload/getmap.php?file="
- set sv_curl_serverpackages_auto 0 "automatically add packs with *.serverpackage files to sv_curl_serverpackages"
+ set sv_curl_serverpackages_auto 1 "automatically add packs with *.serverpackage files to sv_curl_serverpackages"
  
  set sv_motd ""
  
diff --combined qcsrc/client/Main.qc
index 3e7ef814e,81a713c32..8500cc58b
--- a/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@@ -63,7 -63,7 +63,7 @@@ void CSQC_Init(void
  	check_unacceptable_compiler_bugs();
  
  #ifdef WATERMARK
- 	print(sprintf(_("^4CSQC Build information: %s\n"), WATERMARK()));
+ 	print(sprintf(_("^4CSQC Build information: ^1%s\n"), WATERMARK()));
  #endif
  
  	float i;
@@@ -203,10 -203,6 +203,10 @@@ void CSQC_Shutdown(void
  	if(camera_active)
  		cvar_set("chase_active",ftos(chase_active_backup));
  
 +	// unset the event chasecam's chase_active
 +	if(autocvar_chase_active < 0)
 +		cvar_set("chase_active", "0");
 +
  	if not(isdemo())
  	{
  		if not(calledhooks & HOOK_START)