Merge remote branch 'origin/master' into samual/updatecommands

[xonotic/xonotic.git] / server / server.cfg

diff --git a/server/server.cfg b/server/server.cfg
index 8ea3838517dcff4ed8be10cef6527e9d257d2c1a..3e945588e455d8116b605c86dd0895b5f654d270 100644 (file)
--- a/server/server.cfg
+++ b/server/server.cfg
@@ -69,15 +69,15 @@
 //g_maplist_votable_abstain 0  // when 1, people get a "don't care" selection in the vote screen
 //g_maplist_votable_nodetail 1 // when 1, people can't see how many voted for what (to thwart abusive "influential" first votes)
 
-//sv_vote_commands "restart fraglimit chmap gotomap nextmap endmatch reducematchtime extendmatchtime allready kick cointoss movetoteam_auto"   // players can vote for those commands or use them if they are masters. You canm also add 'g_grappling_hook' for hook voting, and 'sv_fbskin_green sv_fbskin_red sv_fbskin_orange sv_fbskin_off' for fbskin voting.
-//sv_vote_master_commands "movetoteam_red movetoteam_blue movetoteam_yellow movetoteam_pink"   // add commands masters can use if logged in or elected. You may want to put 'kickban' here, so masters can keep out punks. It may be good to also put "sv_status_privacy 0" then...
-//rcon_restricted_commands "restart fraglimit chmap gotomap endmatch reducematchtime extendmatchtime allready kick kickban \"sv_cmd bans\" \"sv_cmd unban\" status \"sv_cmd teamstatus\" movetoteam_auto movetoteam_red movetoteam_blue movetoteam_yellow movetoteam_pink"     // commands for the (stronger) rcon restricted
+//sv_vote_commands "restart fraglimit chmap gotomap nextmap endmatch reducematchtime extendmatchtime allready kick cointoss movetoauto"        // players can vote for those commands or use them if they are masters. You canm also add 'g_grappling_hook' for hook voting, and 'sv_fbskin_green sv_fbskin_red sv_fbskin_orange sv_fbskin_off' for fbskin voting.
+//sv_vote_master_commands "movetored movetoblue movetoyellow movetopink"       // add commands masters can use if logged in or elected. You may want to put 'kickban' here, so masters can keep out punks. It may be good to also put "sv_status_privacy 0" then...
+//rcon_restricted_commands "restart fraglimit chmap gotomap endmatch reducematchtime extendmatchtime allready kick kickban \"sv_cmd bans\" \"sv_cmd unban\" status \"sv_cmd teamstatus\" movetoauto movetored movetoblue movetoyellow movetopink"      // commands for the (stronger) rcon restricted
 
 //sv_vote_call 1       // 0 will disable the normal voting
 //sv_vote_master 1     // 0 will disable voting to become master, good if you prefer to use the master password instead
 //sv_vote_master_password ""   // when set, vlogin PWD will allow people to become master to run master commands directly using vdo
-//sv_vote_majority_factor 0.5  // 0.666 will require a 2/3 majority instead of a regular 1/2 one
-//sv_vote_simple_majority_factor 0     // 0.666 will win votes by a 2/3 majority of the VOTERS (not the players!)
+//sv_vote_majority_factor 0.5  // What percentage of the PLAYERS constitute a majority to win a vote? must be at least 0.5
+//sv_vote_majority_factor_of_voted 0   // What percentage of the VOTERS who already voted constitute a majority to win a vote? must be at least 0.5
 // note: to JUST support simple majorities, set these two factors equal
 
 //sv_maxidle 0 // idle time in seconds after which players will get kicked