X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=defaultXonotic.cfg;h=76975af2918b16c39be6e03eb02c0500e235d6f4;hp=6b0a9be7d9233b766832a72252b3baaca8573dae;hb=0779e42746dd9576b4386f36788a2bc47ef56aa0;hpb=aa4c896acf8088d26fcbd5ff4e3f6e7a0acb0600 diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 6b0a9be7d9..76975af291 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -1,18 +1,3 @@ -set g_xonoticversion 2.5svn "Xonotic version (formatted for humans)" - -// changes a cvar and reports it to the server (for the menu to notify the -// server about changes) -alias setreport "set \"$1\" \"$2\" ; sendcvar \"$1\"" - -// detect dedicated server or client -alias "_detect_dedicated_$qport" "$*" -alias "_detect_dedicated_0" "" -alias if_dedicated "_detect_dedicated_$qport ${* asis}" -alias if_client "${* asis}" -if_dedicated alias if_client "" - -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" - // Xonotic version (formatted for machines) // used to determine if a client version is compatible // this doesn't have to be bumped with every release @@ -23,23 +8,31 @@ seta g_configversion 0 "Configuration file version (used to upgrade settings) 0: // servers either // // e.g. Xonotic 1.5.1 RC1 will be 15101 -gameversion 20000 -gameversion_min 20000 // 2.5.2 still used this -gameversion_max 20699 // 2.5 version allows any 2.6 release, but no more +set g_xonoticversion git "Xonotic version (formatted for humans)" +gameversion 100 // 0.1.0 +gameversion_min 0 // git builds see all versions +gameversion_max 65535 // git builds see all versions // compatibility guideline: // version a.b.c = a0b0c // gameversion_min = a0(b-1)00 // show servers of the previous "line" // gameversion_max = a0(b+1)99 // show servers of the next "line" -// example: 2.6.3 -// gameversion 20603 -// gameversion_min 20500 -// gameversion_max 20799 -// however, in 2.5.x, we will: -// gameversion = 20000 // let other 2.5 clients connect -// gameversion_min = 20000 // 2.5.x still has this, we cannot block it within 2.5 -// however, in 2.6.x, we will just: -// gameversion_min = 20000 // show 2.5 servers +// so, for a given gameversion, _min and _max calculate as follows: +// gameversion_min = (gameversion / 100) * 100 - 100 +// gameversion_max = (gameversion / 100) * 100 + 199 + +// changes a cvar and reports it to the server (for the menu to notify the +// server about changes) +alias setreport "set \"$1\" \"$2\" ; sendcvar \"$1\"" + +// detect dedicated server or client +alias "_detect_dedicated_$qport" "$*" +alias "_detect_dedicated_0" "" +alias if_dedicated "_detect_dedicated_$qport ${* asis}" +alias if_client "${* asis}" +if_dedicated alias if_client "" + +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 alias asay_ctf_flagcarrier "say_team flag carrier at %y" @@ -86,9 +79,8 @@ alias movetoteam_pink "sv_cmd movetoteam $1 pink" alias movetoteam_yellow "sv_cmd movetoteam $1 yellow" alias movetoteam_auto "sv_cmd movetoteam $1 auto" -// merge lightmaps up to 1024x1024 textures -// the default of 2048x2048 is too heavy for my rig (SavageX) -mod_q3bsp_lightmapmergepower 3 +// merge lightmaps up to 2048x2048 textures +mod_q3bsp_lightmapmergepower 4 // player defaults _cl_color 102 @@ -290,8 +282,6 @@ seta cl_voice_directional_taunt_attenuation 0.5 "this defines the distance from hostname "Xonotic $g_xonoticversion Server" set sv_mapchange_delay 5 set minplayers 0 "number of players playing at the same time (if not enough real players are there the remaining slots are filled with bots)" -sv_cullentities_trace 1 -r_cullentities_trace 1 // restart server if all players hit "ready"-button set sv_ready_restart 0 "if set to 1 allow a map to be restarted once all players pressed the \"ready\" button'" @@ -329,11 +319,12 @@ set g_allow_oldnexbeam 0 "If enabled, clients are allowed to use old v2.3 Nexgun seta cl_particles_oldnexbeam 0 "Uses the old v2.3 Nexgun beam instead of the new beam, only works if server allows it (g_allow_oldnexbeam 1)" set sv_qcweaponanimation 0 -set g_telefrags 1 -set g_telefrags_avoid 0 +set g_telefrags 1 "telefragging, i.e. killing someone who stands in the way of someone who is teleporting" +set g_telefrags_teamplay 1 "never telefrag team mates" +set g_telefrags_avoid 1 "when teleporters have a random destination, avoid teleporting to locations where a telefrag would happen" set g_teleport_maxspeed 0 "maximum speed that a player can keep when going through a teleporter (if a misc_teleporter_dest also has a cap the smallest one of these will be used), 0 = don't limit, -1 = keep no speed" -set g_respawn_ghosts 0 "if 1 dead bodies become ghosts and float away when the player respawns" +set g_respawn_ghosts 1 "if 1 dead bodies become ghosts and float away when the player respawns" set g_respawn_ghosts_speed 5 "the speed with which respawn ghosts float and rotate" set g_respawn_ghosts_maxtime 6 "maximum amount of time a respawn ghost can last, minimum time is half this value. 0 disables and ghosts fade when the body would" @@ -345,7 +336,7 @@ set sv_fragmessage_information_typefrag 1 "Enable typefrag display information, // use default physics set sv_friction_on_land 0 -exec physicsNoQWBunny-nexbased.cfg +exec physicsNoQWBunny-xpmbased.cfg set sv_player_viewoffset "0 0 35" "view offset of the player model" set sv_player_mins "-16 -16 -24" "playermodel mins" @@ -516,7 +507,7 @@ set g_casings 2 "specifies which casings (0: none, 1: only shotgun casings, 2: s set g_norecoil 0 "if set to 1 shooting weapons won't make you crosshair to move upwards (recoil)" set g_maplist_mostrecent "" "contains the name of the maps that were most recently played" seta g_maplist_mostrecent_count 3 "number of most recent maps that are blocked from being played again" -seta g_maplist "accident aggressor aneurysm basement basementctf bleach bloodprison bloodprisonctf bluesky cyberparcour01 darkzone desertfactory dieselpower downer eggandbacon evilspace farewell final_rage nr_piece-o-cake ons-reborn racetrack reslimed ruiner runningman runningman_1on1remix runningmanctf silvercity skyway slimepit soylent starship stormkeep2 strength toxic warfare" +seta g_maplist "g-23" "the list of maps to be cycled among (is autogenerated if empty)" seta g_maplist_index 0 "this is used internally for saving position in maplist cycle" seta g_maplist_selectrandom 0 "if 1, a random map will be chosen as next map - DEPRECATED in favor of g_maplist_shuffle" seta g_maplist_shuffle 1 "new randomization method: like selectrandom, but avoid playing the same maps in short succession. This works by taking out the first element and inserting it into g_maplist with a bias to the end of the list" @@ -853,22 +844,30 @@ set g_footsteps 1 "serverside footstep sounds" set g_deathglow 1.25 "when enabled, players stop glowing after they die (the value specifies glow fading speed)" +set g_multijump 0 "Number of multiple jumps to allow (jumping again in the air), -1 allows for infinite jumps" +set g_multijump_add 0 "0 = make the current z velocity equal to jumpvelocity, 1 = add jumpvelocity to the current z velocity" +set g_multijump_speed -999999 "Minimum vertical speed a player must have in order to jump again" + // effects r_picmipsprites 0 // Xonotic uses sprites that should never be picmipped (team mate, typing, waypoints) +r_picmipworld 1 +gl_picmip_world 0 +gl_picmip_sprites 0 +gl_picmip_other 2 // so, picmip -2 is best possible quality r_mipsprites 1 r_mipskins 1 r_shadow_realtime_world_lightmaps 1 seta r_ambient 4 -cl_decals_fadetime 1 +cl_decals_fadetime 5 cl_decals_time 2 seta cl_gunalign 3 "Gun alignment; 1 = right, 2 = left, 3 = center or right, 4 = center or left" seta cl_nogibs 0 "reduce number of violence effects, or remove them totally" seta cl_particlegibs 0 "simpler gibs" seta cl_gibs_damageforcescale 3.5 "force to push around gibs" -seta cl_gibs_lifetime 14 "average lifetime of gibs" +seta cl_gibs_lifetime 5 "average lifetime of gibs" seta cl_gibs_velocity_scale 1 "gib throw velocity force scale" seta cl_gibs_velocity_random 1 "gib throw velocity randomness scale" -seta cl_gibs_velocity_up 0 "extra z velocity for gibs" +seta cl_gibs_velocity_up 1 "extra z velocity for gibs" seta cl_gibs_ticrate 0.1 "ticrate for gibs" seta cl_gibs_sloppy 1 "sloppy gibs, may temporarily penetrate walls" seta cl_casings 1 "enable or disable bullet casings" @@ -1143,6 +1142,7 @@ seta sv_servermodelsonly 1 cl_curl_enabled 1 cl_curl_maxspeed 300 sv_curl_defaulturl "http://www.xonotic.com/contentdownload/getmap.php?file=" +set sv_curl_serverpackages_auto 0 "automatically add packs with *.serverpackage files to sv_curl_serverpackages" set sv_motd "" @@ -1256,6 +1256,7 @@ set cl_gravity 800 "but ignored anyway" set g_ban_default_bantime 5400 "90 minutes" set g_ban_default_masksize 3 "whole 255.255.255.0 networks (set to 4 for single IPs); when UID support is compiled in, masksize 0 means banning by UID" set g_banned_list "" "format: IP remainingtime IP remainingtime ..." +set g_banned_list_idmode "1" "when set, the IP banning system always uses the ID over the IP address (so a user in a banned IP range can connect if they have a valid signed ID)" alias bans "sv_cmd bans" alias ban "sv_cmd ban $*" // usage: ban address(maybe incomplete, like 1.2.3) bantime(seconds) alias kickban "sv_cmd kickban $*" // usage: kickban # playerno bantime(seconds) masksize(bytes) @@ -1310,7 +1311,7 @@ alias _userbind_call "${$1}" alias +userbind "_userbind_call userbind${1}_press" alias -userbind "_userbind_call userbind${1}_release" -seta menu_skin "default" +seta menu_skin "luminos" set menu_slowmo 1 seta menu_sounds 0 "enables menu sound effects. 1 enables click sounds, 2 also enables hover sounds" @@ -1328,7 +1329,7 @@ con_notifyalign 0 // hud variables set _hud_configure 0 "1 = configure the HUD" -seta hud_configure_teamcolorforced 1 "1 = force display of team colors in configure mode" +seta hud_configure_teamcolorforced 0 "1 = force display of team colors in configure mode" seta hud_configure_checkcollisions 1 "check for collisions against other panels when in hud configure mode" seta hud_configure_bg_minalpha 0.25 "minimum panel background alpha when in hud configure mode" seta hud_configure_grid_alpha 0.15 "alpha for visible grid when in configure mode" @@ -1337,8 +1338,9 @@ seta sbar_info_pos 0 "Y-axis distance from lower right corner for engine info pr // hud cvar descriptions exec _hud_descriptions.cfg -// exec the default skin config. remember, NO menu_restart in the deafault cfg (dp segfaults at startup otherwise) -exec hud_default.cfg +// exec the default skin config +// please add any new cvars into the hud_save script in qcsrc/client/hud.qc for consistency +exec hud_luminos.cfg // user preference cvars (i.e. shouldn't be adjusted by a skin config) seta hud_panel_weapons_label 1 "1 = show number of weapon, 2 = show bound key of weapon" @@ -1355,6 +1357,8 @@ seta hud_panel_weapons_ammo_full_nails 200 "show 100% of the status bar at this seta hud_panel_weapons_ammo_full_cells 80 "show 100% of the status bar at this ammo count" seta hud_panel_weapons_ammo_full_rockets 80 "show 100% of the status bar at this ammo count" seta hud_panel_weapons_ammo_full_fuel 100 "show 100% of the status bar at this ammo count" +seta hud_panel_weapons_timeout "3" "panel disappears if you don't switch weapon for this amount of seconds" +seta hud_panel_weapons_timeout_effect "1" "disappearance effect: 0) no effect; 1) panel moves out of screen; 2) panel fades out" seta hud_panel_notify_time 10 "time that a new entry stays until it fades out" seta hud_panel_notify_fadetime 3 "fade out time" @@ -1372,6 +1376,9 @@ seta hud_panel_engineinfo_framecounter_exponentialmovingaverage 1 "use an averag seta hud_panel_engineinfo_framecounter_exponentialmovingaverage_new_weight 0.1 "weight of latest data point" seta hud_panel_engineinfo_framecounter_exponentialmovingaverage_instantupdate_change_threshold 0.5 "threshold for fps change when to update instantly, to make big fps changes update faster" +seta hud_showbinds 1 "the way to show the keys to press in HUD messages: 0 displays commands, 1 bound keys, 2 both" +seta hud_showbinds_limit 2 "maximum number of bound keys to show for a command. 0 for unlimited" + // scoreboard seta scoreboard_columns default seta scoreboard_border_thickness 1 "scoreboard border thickness" @@ -1391,6 +1398,8 @@ seta scoreboard_fadeoutspeed 5 "speed at which scoreboard fades out, higher is f seta scoreboard_highlight 1 "enable highlighting for rows and columns in the scoreboard" seta scoreboard_highlight_alpha 0.10 "highlight alpha value (depends on hud_scoreboard_highlight 1)" seta scoreboard_highlight_alpha_self 0.25 "self highlight alpha value" +seta scoreboard_offset_left 0.04 "how many pixels the scoreboard is offset from the left screen edge" +seta scoreboard_offset_right 0.148 "how many pixels the scoreboard is offset from the right screen edge" // for menu server list (eventually make them have engine support?) seta menu_slist_showfull 1 "show servers even if they are full and have no slots to join" @@ -1465,6 +1474,7 @@ sys_ticrate 0.0166667 cl_netfps 60 // should match sv_gameplayfix_delayprojectiles 0 sv_gameplayfix_q2airaccelerate 1 +sv_gameplayfix_stepmultipletimes 1 // delay for "kill" to prevent abuse set g_balance_kill_delay 5 @@ -1503,8 +1513,8 @@ unalias _cdtrack cd remap $g_cdtracks_remaplist set sv_intermission_cdtrack "" -set g_cdtracks_dontusebydefault "" -set menu_cdtrack "ninesix" +set g_cdtracks_dontusebydefault "rising-of-the-phoenix" +set menu_cdtrack "rising-of-the-phoenix" // maxidle (in seconds): kick players idle for more than that amount of time set sv_maxidle 0 @@ -1517,7 +1527,7 @@ set capturelimit 0 // hud: font size seta hud_fontsize 11 seta hud_fontsize_spec 16 -seta scr_centersize 11 +seta scr_centersize 12 seta hud_width 560 // alias hud_font "loadfont user1 ${1},gfx/fallback ${2-}; loadfont user2 ${1}-big ${2-}; scoreboard_columns_set" alias sbar_font "set _requested_sbar_font \"${*}\"" @@ -1529,7 +1539,7 @@ prvm_leaktest_ignore_classnames "ctf_team dom_team tdm_team" sv_allowdownloads_inarchive 1 // for csprogs.dat -set g_jump_grunt 1 "Do you make a grunting noise every time you jump? Is it the same grunting noise every time?" +set g_jump_grunt 0 "Do you make a grunting noise every time you jump? Is it the same grunting noise every time?" alias allready "sv_cmd allready" @@ -1911,3 +1921,20 @@ scr_conscroll3_x 0 scr_conscroll3_y 0 scr_conscroll_x -0.1 scr_conscroll_y -0.3 + +// DP cannot properly detect this, so rather turn off the detection +r_texture_dds_load_dxt1_noalpha 1 + +// particles optimization +r_drawparticles_nearclip_min 8 +r_drawparticles_nearclip_max 16 + +// sv_cullentities_trace is 1, so the client doesn't have to +sv_cullentities_trace 1 +r_cullentities_trace 0 + +// less "lagging" of other players, but also less PL tolerant... let's try this +sv_clmovement_inputtimeout 0.05 + +// exact gloss looks better, e.g. on g-23 +r_shadow_glossexact 1