Merge branch 'master' into divVerent/desktopfullscreen

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

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index f5ac49f6e837e127214dfa00c680363ef99bc51f..2faa816de2f56df0097390ca559033132e499a92 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -101,6 +101,7 @@ set _menu_vid_width "$vid_width"
 set _menu_vid_height "$vid_height"
 set _menu_vid_pixelheight "$vid_pixelheight"
 seta menu_vid_scale 0
 set _menu_vid_height "$vid_height"
 set _menu_vid_pixelheight "$vid_pixelheight"
 seta menu_vid_scale 0

+seta menu_vid_allowdualscreenresolution 0

 // 2D resolution 800x600
 vid_conwidth 800
 vid_conheight 600
 // 2D resolution 800x600
 vid_conwidth 800
 vid_conheight 600


@@ -286,7 +287,7 @@ seta sv_defaultplayermodel_pink "" "\"\" means see sv_defaultplayermodel"
 seta sv_defaultplayerskin_pink 0
 seta sv_defaultplayercolors "" "set to 16*shirt+pants to force a color, note: it does NOT depend on defaultcharacter! Set to \"\" to disable"
 set sv_autoscreenshot 0 "if set to 1, the server forces all clients to create a local screenshot once the map ended"
 seta sv_defaultplayerskin_pink 0
 seta sv_defaultplayercolors "" "set to 16*shirt+pants to force a color, note: it does NOT depend on defaultcharacter! Set to \"\" to disable"
 set sv_autoscreenshot 0 "if set to 1, the server forces all clients to create a local screenshot once the map ended"

-net_messagetimeout 300
+net_messagetimeout 30

 net_connecttimeout 30
 sv_jumpstep 1 // step up stairs while jumping, makes it easier to reach ledges
 set ekg 0      "Throw huge amounts of gibs"
 net_connecttimeout 30
 sv_jumpstep 1 // step up stairs while jumping, makes it easier to reach ledges
 set ekg 0      "Throw huge amounts of gibs"


@@ -1016,8 +1017,8 @@ makesaved v_idlescale
 makesaved v_kicktime
 
 // ticrate
 makesaved v_kicktime
 
 // ticrate

-//sys_ticrate 0.0166667
-sys_ticrate 0.0333333
+//sys_ticrate 0.0166667 // 60fps. This would be ideal, but kills home routers.
+sys_ticrate 0.0333333 // Use 30fps instead.

 cl_netfps 60 // should match or be a multiple
 sv_gameplayfix_delayprojectiles 0
 sv_gameplayfix_q2airaccelerate 1
 cl_netfps 60 // should match or be a multiple
 sv_gameplayfix_delayprojectiles 0
 sv_gameplayfix_q2airaccelerate 1


@@ -1433,7 +1434,7 @@ mod_q3shader_default_polygonoffset -14
 mod_q3shader_default_polygonfactor 0
 
 // allow fullbright
 mod_q3shader_default_polygonfactor 0
 
 // allow fullbright

-set sv_allow_fullbright 0 "when set, clients may use r_fullbright on this server without getting a night vision effect overlay"
+set sv_allow_fullbright 1 "when set, clients may use r_fullbright on this server without getting a night vision effect overlay"

 
 // auto-teams (team selection by player ID)
 // any player not listed is forced to spectate
 
 // auto-teams (team selection by player ID)
 // any player not listed is forced to spectate