From: Rudolf Polzer <divverent@alientrap.org>
Date: Tue, 4 May 2010 11:17:55 +0000 (+0200)
Subject: Merge remote branch 'origin/mirceakitsune/respawn_ghosts'
X-Git-Tag: xonotic-v0.1.0preview~612^2~5
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=606b7d7b27c6ecd120f68730fc55dcc439dfeabb;hp=-c

Merge remote branch 'origin/mirceakitsune/respawn_ghosts'
---

606b7d7b27c6ecd120f68730fc55dcc439dfeabb
diff --combined defaultXonotic.cfg
index a20178f0f3,9f8855a232..17503f81af
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -245,8 -245,6 +245,8 @@@ cl_deathfade 1 // fade screen to dark r
  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_bobmodel 1 // whether to have gun model move around on screen when moving (only works if cl_bob is not 0), default is 1
 +cl_leanmodel 1 // enables weapon leaning effect when looking around
 +cl_followmodel 1 // enables weapon pushing / pulling effect when walking
  cl_rollangle 0 // amount of view tilt when strafing, default is 2.0
  v_kicktime 0 // how long damage kicks of the view last, default is 0 seconds
  gl_polyblend 0.5 // whether to use screen tints, default is 1
@@@ -313,6 -311,10 +313,10 @@@ set g_telefrags 
  set g_telefrags_avoid 0
  set g_teleport_maxspeed 0 "maximum speed that a player can keep when going through a teleporter (if a misc_teleporter_dest also has a cap the smallest one of these will be used), 0 = don't limit, -1 = keep no speed"
  
+ set g_respawn_ghosts 1 "if 1 dead bodies become ghosts and float away when the player respawns"
+ set g_respawn_ghosts_speed 5 "the speed with which respawn ghosts float and rotate"
+ set g_respawn_ghosts_maxtime 6 "maximum amount of time a respawn ghost can last, minimum time is half this value. 0 disables and ghosts fade when the body would"
+ 
  // fragmessage: This allows extra information to be displayed with the frag centerprints. 
  set sv_fragmessage_information_ping 0 "Enable ping display information, 0 = Never display; 1 = Always display (If the player is a bot, it will say bot instead of the ping.)"
  set sv_fragmessage_information_handicap 1 "Enable handicap display information, 0 = Never display; 1 = Only when the player has handicap on; 2 = Always display (Displays Off if off)"
@@@ -1800,6 -1802,3 +1804,6 @@@ mod_q1bsp_polygoncollisions 
  // improve some minor details
  sv_gameplayfix_gravityunaffectedbyticrate 1
  sv_gameplayfix_nogravityonground 1
 +
 +// autodemo deleting
 +seta cl_autodemo_delete_keeprecords 0 "when 1, records with a newly made race/cts demo are kept even if cl_autodemo_delete is used to delete demos"