X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=defaultXonotic.cfg;h=fb50f791c3118025a8d0235f394d29771a07f68b;hp=d60ca8c3936fdd6479b0dc3f1242f6b2065af03d;hb=a46374b4d18ea074e2b4cd361fcdb2a0ea08a339;hpb=ed3c425853ea07edf78e249a16313bdbe01dc6ac diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index d60ca8c393..fb50f791c3 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -38,6 +38,16 @@ alias if_dedicated "${* asis}" _if_dedicated alias if_client "" if_client alias if_dedicated "" +if_dedicated "alias" qc_cmd_svmenu "sv_cmd $$*" +if_client "alias" qc_cmd_svmenu "menu_cmd $$*" +if_dedicated "alias" qc_cmd_svcl "sv_cmd $$*" +if_client "alias" qc_cmd_svcl "cl_cmd $$*" +if_dedicated "alias" qc_cmd_svcmd "sv_cmd $$*" +if_client "alias" qc_cmd_svcmd "cmd $$*" + +// shorthand for the most usual case +alias qc_cmd "qc_cmd_svmenu $*" + seta g_configversion 0 "Configuration file version (used to upgrade settings) 0: first run, or previous start was <2.4.1 Later, it's overridden by config.cfg, version ranges are defined in config_update.cfg" // say aliases @@ -332,9 +342,9 @@ set g_maxplayers_spectator_blocktime 5 "if the players voted for the \"nospectat //tournament mod set g_warmup 0 "split the game into a warmup- and match-stage when set to 1" -set g_warmup_limit 60 "if set to -1 the warmup-stage is not affected by any timelimit, if set to 0 the usual timelimit also affects warmup-stage, otherwise warmup will be limited to this time in SECONDS (useful for public matches)" +set g_warmup_limit 0 "if set to -1 the warmup-stage is not affected by any timelimit, if set to 0 the usual timelimit also affects warmup-stage, otherwise warmup will be limited to this time in SECONDS (useful for public matches)" set g_warmup_allow_timeout 0 "if set to 1 timeouts can also be called in the warmup-stage, when sv_timeout is set to 1" -set g_warmup_allguns 0 "if set players start with all guns in warmup mode" +set g_warmup_allguns 1 "if set players start with all guns in warmup mode" 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)" @@ -606,8 +616,6 @@ seta fraglimit_override -1 "Frag limit overriding the mapinfo specified one (use seta leadlimit_override -1 "Lead limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)" seta capturelimit_override -1 "Capture limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)" seta captureleadlimit_override -1 "Capture llead imit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)" -seta g_ctf_capture_limit -1 "CTF capture limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)" -seta g_ctf_capture_leadlimit -1 "CTF capture lead limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)" seta g_arena_point_limit -1 "Arena point limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)" seta g_arena_point_leadlimit -1 "Arena point lead limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)" seta g_domination_point_limit -1 "Domination point limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)" @@ -620,7 +628,6 @@ seta g_race_laps_limit -1 "Race laps limit overriding the mapinfo specified one 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_ctf_win_mode 0 "0: captures only, 1: captures, then points, 2: points only" seta g_ctf_ignore_frags 0 "1: regular frags give no points" set g_freezetag 0 "Freeze Tag: Freeze the opposing team(s) to win, unfreeze teammates by standing next to them" @@ -1244,7 +1251,10 @@ alias sv_fbskin_off "sv_defaultcharacter 0; sv_defaultplayerskin 0; sv_defaultpl seta sv_servermodelsonly 1 cl_curl_enabled 1 -cl_curl_maxspeed 400 +cl_curl_maxspeed 500 +cl_curl_useragent 1 +cl_curl_useragent_append "$g_xonoticversion" + sv_curl_defaulturl "http://www.xonotic.org/contentdownload/getmap.php?file=" set sv_curl_serverpackages_auto 1 "automatically add packs with *.serverpackage files to sv_curl_serverpackages" @@ -1326,7 +1336,6 @@ seta g_waypointsprites_turrets 1 "disable turret waypoints" seta g_waypointsprites_turrets_maxdist 4000 "max distace for turret sprites" // command extension -alias qc_cmd "sv_cmd $*" // menu QC will override this to menu_cmd alias adminmsg "sv_cmd adminmsg $*" alias teamstatus "cmd teamstatus; sv_cmd teamstatus" // yes, it is broken on listen servers that way, but well, who cares :P alias printstats "sv_cmd printstats" // print status on demand @@ -1400,14 +1409,8 @@ alias unban "sv_cmd unban $*" // usage: unban 3 (number from bans) r_labelsprites_scale 0.40625 // labels sprites get displayed at 0.5x from 640x480 to 1280x1024, and at 1x from 1600x1200 onwards // settemp subsystem. Do not touch. Usage: settemp variable value, next map resets it. -set settemp_list 0 -set settemp_idx 0 -set _settemp_var UNUSED -alias settemp "_settemp_var \"_settemp_x$settemp_idx\"; qc_cmd rpn /settemp_idx settemp_idx 1 add def; _settemp \"$1\" \"$2\"" -alias _settemp "settemp_list \"1 $1 $_settemp_var $settemp_list\"; set $_settemp_var \"${$1}\"; $1 \"$2\"" -alias settemp_restore "_settemp_restore_${settemp_list asis}" -alias _settemp_restore_0 "set settemp_var 0; set settemp_list 0" -alias _settemp_restore_1 "$1 \"${$2}\"; _settemp_restore_${3- asis}" +alias settemp "qc_cmd_svcl settemp $$*" +alias settemp_restore "qc_cmd_svcl settemp_restore" // usercommands. These can be edited and bound by the menu. seta "userbind1_press" "say_team quad soon"; seta "userbind1_release" ""; seta "userbind1_description" "team: quad soon" @@ -1569,6 +1572,8 @@ seta skill 4 seta gl_finish $gl_finish seta v_kicktime $v_kicktime seta r_subdivisions_tolerance $r_subdivisions_tolerance +seta vid_gl20 $vid_gl20 +seta vid_gl13 $vid_gl13 // ticrate //sys_ticrate 0.0166667 @@ -1885,8 +1890,8 @@ set g_triggerimpulse_directional_multiplier 1 "trigger_impulse directional field set g_triggerimpulse_radial_multiplier 1 "trigger_impulse radial field multiplier" set the_goggles "they do nothing" "but the googles, they do" -seta g_ghost_items 1 "enable ghosted items (when between 0 and 1, overrides the alpha value)" -seta g_ghost_items_color "-1 -1 -1" "color of ghosted items, 0 0 0 leaves the color unchanged" +set g_ghost_items 1 "enable ghosted items (when between 0 and 1, overrides the alpha value)" +set g_ghost_items_color "-1 -1 -1" "color of ghosted items, 0 0 0 leaves the color unchanged" set sv_weaponstats_file "" "when set to a file name, per-weapon stats get written to that file" @@ -1898,7 +1903,7 @@ set sv_pitch_fixyaw 0 "workaround to fix the aiming direction on stupidly made p set rescan_pending 0 "set to 1 to schedule a fs_rescan at the end of this match" -seta g_mapinfo_allow_unsupported_modes_and_let_stuff_break "0" "set to 1 to be able to force game types using g_ cvars even if the map does not support them" +set g_mapinfo_allow_unsupported_modes_and_let_stuff_break "0" "set to 1 to be able to force game types using g_ cvars even if the map does not support them" // weapon accuracy stats set sv_accuracy_data_share 1 "1 send weapon accuracy data statistics to spectating clients, depends on cl_accuracy_data_share" @@ -1918,7 +1923,8 @@ set waypoint_benchmark 0 "quit after waypoint loading to benchmark bot navigatio set g_debug_bot_commands 0 "print scripted bot commands before executing" set g_debug_defaultsounds 0 "always use default sounds" set sv_use_csqc_players 1 "set to 0 to disable CSQC players for better Xonotic 0.5 compat" -set cl_forceplayermodels 0 "set to 1 to make everyone look like yourself (requires server to have sv_use_csqc_players 1)" +set cl_forceplayermodels 0 "make everyone look like your own model (requires server to have sv_use_csqc_players 1 and sv_defaultcharacter 0)" +set cl_forceplayercolors 0 "make everyone look like your own color (requires server to have sv_use_csqc_players 1 and sv_defaultcharacter 0, and is ignored in teamplay)" set cl_precacheplayermodels 0 "TODO please check if this needs to be 1 or if precaching a model the server already requested is fast enough to do it at runtime" // debug cvars for keyhunt attaching