Check to see if the vote has only JUST been called when doing the player count evalua...

[xonotic/xonotic-data.pk3dir.git] / defaultXonotic.cfg

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index e4899175eba72fe36d90ce2ff26ac9aa465ca3a4..24c2383975c83720c8491169708aa344b25e5251 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -192,7 +192,7 @@ set g_warmup_allguns 1      "if set players start with all guns in warmup mode"
 set g_warmup_majority_factor 0.8 "minimum percentage of players ready needed for warmup to end"
 
 set g_chat_nospectators 0      "if 0 spec/observer chat is always visible to the player, if 1 it is never visible to players, if 2 it is only visible to players during warmup stage"
-set sv_vote_nospectators 0     "if set only players can call a vote (thus spectators and observers can't call a vote)"
+set sv_vote_nospectators 0     "Only players can call a vote (thus spectators and observers can't call a vote): 0 = all people can vote, 1 = spectators can vote in warmup stage, 2 = only players can vote (no exceptions)."
 
 alias g_tourney "g_tourney_$1"
 alias g_tourney_1 "g_warmup 1; g_chat_nospectators 2; sv_vote_nospectators 1"
@@ -475,6 +475,13 @@ seta g_keyhunt_point_leadlimit -1  "Keyhunt point lead limit overriding the mapin
 seta g_race_laps_limit -1      "Race laps limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
 seta g_nexball_goallimit -1 "Nexball goal limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
 seta g_nexball_goalleadlimit -1 "Nexball goal lead limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
+seta g_nexball_safepass_maxdist 5000    // Max distance to allow save fassping (0 to turn off safe passing)
+seta g_nexball_safepass_turnrate 0.1    // How fast the safe-pass ball can habge direction
+seta g_nexball_safepass_holdtime 0.75   // How long to remeber last teammate you pointed at
+seta g_nexball_viewmodel_scale 0.25     // How large the ball for the carrier
+seta g_nexball_viewmodel_offset "8 8 0" // Where the ball is located on carrier "forward right up"
+seta g_nexball_tackling 1               // Allow ball theft?
+
 
 seta g_ctf_ignore_frags 0      "1: regular frags give no points"
 
@@ -525,9 +532,9 @@ set g_ca_respawn_waves 0
 set g_ca_weapon_stay 0
 set g_ca_damage2score_multiplier 0.01
 set g_ca_round_timelimit 180
-set g_nexball_respawn_delay 0
-set g_nexball_respawn_waves 0
-set g_nexball_weapon_stay 0
+set g_nb_respawn_delay 0
+set g_nb_respawn_waves 0
+set g_nb_weapon_stay 0
 set g_as_respawn_delay 0
 set g_as_respawn_waves 0
 set g_as_weapon_stay 0
@@ -542,12 +549,12 @@ set g_cts_respawn_delay 0
 set g_cts_selfdamage 1 "0 = disable all selfdamage and falldamage in cts"
 set g_cts_finish_kill_delay 10 "prevent cheating by running back to the start line, and starting out with more speed than otherwise possible"
 set g_cts_weapon_stay 2
-set g_freezetag_respawn_waves 0
-set g_freezetag_respawn_delay 0
-set g_freezetag_weapon_stay 0
-set g_keepaway_respawn_delay 0
-set g_keepaway_respawn_waves 0
-set g_keepaway_weapon_stay 0
+set g_ft_respawn_waves 0
+set g_ft_respawn_delay 0
+set g_ft_weapon_stay 0
+set g_ft_respawn_delay 0
+set g_ft_respawn_waves 0
+set g_ft_weapon_stay 0
 
 // overtime
 seta timelimit_overtime 2 "duration in minutes of one added overtime, added to the timelimit"