r2135 - trunk/pro

[DONOTREPLY at icculus.org]

Author: div0
Date: 2007-01-21 08:18:43 -0500 (Sun, 21 Jan 2007)
New Revision: 2135

Modified:
   trunk/pro/default.cfg
Log:
merge default.cfg -> pro


Modified: trunk/pro/default.cfg
===================================================================
--- trunk/pro/default.cfg	2007-01-21 10:58:36 UTC (rev 2134)
+++ trunk/pro/default.cfg	2007-01-21 13:18:43 UTC (rev 2135)
@@ -81,6 +81,13 @@
 scr_menuforcewhiledisconnected 1
 v_deathtilt 0 // needed for spectators (who are dead to avoid prediction)
 
+// nexuiz-linux-*.sh will use this
+seta vid_x11_display ""
+// This can have three possible settings:
+//   ""            run as usual
+//   ":n"          use DISPLAY=:n, create it if needed
+//   ":n/layout"   use DISPLAY=:n, create it if needed with ServerLayout layout
+
 // server settings
 seta hostname "Nexuiz Server"
 seta sv_maxrate 10000
@@ -250,6 +257,24 @@
 seta g_domination_point_limit -1
 seta g_runematch_point_limit -1
 
+// respawn delay
+set g_respawn_delay 0.5
+set g_respawn_waves 0
+// when variables are set to 0, they take over the global setting...
+// to force disable delay or waves, set them to 0.125
+set g_ctf_respawn_delay 0
+set g_ctf_respawn_waves 0
+set g_dm_respawn_delay 0
+set g_dm_respawn_waves 0
+set g_dom_respawn_delay 0
+set g_dom_respawn_waves 0
+set g_lms_respawn_delay 0
+set g_lms_respawn_waves 0
+set g_rune_respawn_delay 0
+set g_rune_respawn_waves 0
+set g_tdm_respawn_delay 0
+set g_tdm_respawn_waves 0
+
 // maximum overtime
 seta timelimit_maxovertime 5
 
@@ -686,6 +711,8 @@
 set sv_vote_call 1
 // users can call a vote to become master
 set sv_vote_master 1
+// when set, users can use "vdo master (password)" to log in as master
+set sv_vote_master_password ""
 // set to 1 to allow to change you vote/mind
 set sv_vote_change 0
 // set to 1 to count votes once after timeout or to 0 to count with every vote
@@ -784,3 +811,6 @@
 alias teamstatus "set _scoreboard 1"
 
 con_chatwidth 1.0
+
+net_banlist ""
+seta _alientrap_net_banlist ""