X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=xonotic-server.cfg;h=c7b63f536cafb6cb442c89bd17d6716295c8f31b;hb=cc7bbb72a133063d00a1bdf75ae5d3855b68f353;hp=187de7e364460e5e81c60b2726f6fd4c1f2cca8f;hpb=3c08700f00a014d84ffe1bb64305ca5da7594cea;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/xonotic-server.cfg b/xonotic-server.cfg
index 187de7e36..c7b63f536 100644
--- a/xonotic-server.cfg
+++ b/xonotic-server.cfg
@@ -58,7 +58,9 @@ set g_teleport_maxspeed 0 "maximum speed that a player can keep when going throu
 
 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"
+set g_respawn_ghosts_time 4.5 "amount of time a respawn ghost lasts before it starts fading out. 0 disables and ghosts fade when the body would"
+set g_respawn_ghosts_fadetime 1.5 "amount of time a respawn ghost takes to fade out"
+set g_respawn_ghosts_alpha 1 "respawn ghost alpha"
 
 set sv_gibhealth 100 "Minus health a dead body must have in order to get gibbed"
 
@@ -205,7 +207,7 @@ set g_pickup_respawntime_scaling_linear 1 "Multiply respawn time by `reciprocal
 set g_weaponarena "0" "put in a list of weapons to enable a weapon arena mode, or try \"all\", \"most\", \"all_available\" or \"most_available\" (available only gives the weapon if the map normally has it as a pickup item)"
 set g_weaponarena_random "0" "if set to a number, only that weapon count is given on every spawn (randomly)"
 set g_weaponarena_random_with_blaster "1" "additionally, always provide the blaster in random weapon arena games"
-set g_spawnpoints_auto_move_out_of_solid 0 "if set to 1 you will see a warning if a spawn point was placed inside a solid"
+set g_spawnpoints_auto_move_out_of_solid 1 "show a warning if a spawn point was placed inside a solid, disabling this setting causes such spawn points to be removed and produce a more verbose error message"
 set g_forced_respawn 0 "if set to 1 and a player died, that player gets automatically respawned once <g_respawn_delay> seconds are over"
 set g_fullbrightplayers 0 "brightens up player models (note that the color, skin or model of the players does not change!)"
 set g_fullbrightitems 0 "disables lighting effects on items, making them appear bright for visibility"
@@ -220,6 +222,7 @@ set g_maplist_selectrandom 0 "if 1, a random map will be chosen as next map - DE
 set g_maplist_shuffle 1 "new randomization method: like selectrandom, but avoid playing the same maps in short succession. This works by taking out the first element and inserting it into g_maplist with a bias to the end of the list"
 set g_maplist_check_waypoints 0 "when 1, maps are skipped if there currently are bots, but the map has no waypoints"
 set g_maplist_ignore_sizes 0 "when 1, all maps are shown in the map list regardless of player count"
+set g_maplist_sizes_count_maxplayers 1 "check the player limit when getting the player count so forced spectators don't affect the size restrictions"
 set g_maplist_sizes_count_bots 1 "include the number of bots currently in the server when counting the number of players for size restrictions"
 
 set g_items_mindist 4000 "starting distance for the fading of items"
@@ -533,7 +536,7 @@ alias g_forced_team_matchsetup "map $1; settemp g_forced_team_red \"$2\"; settem
 // frozen
 set g_frozen_revive_falldamage 0 "Enable reviving from this amount of fall damage"
 set g_frozen_revive_falldamage_health 40 "Amount of health player has if they revived from falling"
-set g_frozen_damage_trigger 1 "if 1, frozen players falling into the void will die instead of teleporting to spawn"
+set g_frozen_damage_trigger 1 "if 1, frozen players falling into the void/lava/slime will die instead of teleporting to spawn"
 set g_frozen_force 0.6 "How much to multiply the force on a frozen player with"
 
 // player statistics
@@ -578,3 +581,6 @@ set sv_showfps 5 "Show player's FPS counters in the scoreboard. This setting act
 set sv_doors_always_open 0 "If set to 1 don't close doors which after they were open"
 
 set sv_warpzone_allow_selftarget 0 "do not touch"
+
+// don't notify cvar changes in the chat
+sv_disablenotify 1