X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=defaultXonotic.cfg;h=dd16de9bc6ee4224b900bf576cfc86ff8e5fce20;hp=392ba9f905e0bf926931b4abad05386e1e2b5015;hb=e0ac5f9f14e169a1e19d0e36b85cab061a74ed93;hpb=290e3daadcf7e98417da9cd9e762f53634e01f38 diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 392ba9f905..dd16de9bc6 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -93,12 +93,16 @@ vid_fullscreen 1 vid_width 1024 vid_height 768 vid_pixelheight 1 +vid_resizable 0 // cannot be turned on before it is sure it cannot cause a r_restart +vid_desktopfullscreen 1 prvm_language en set _menu_prvm_language "" set _menu_vid_width "$vid_width" set _menu_vid_height "$vid_height" set _menu_vid_pixelheight "$vid_pixelheight" +set _menu_vid_desktopfullscreen "$vid_desktopfullscreen" seta menu_vid_scale 0 +seta menu_vid_allowdualscreenresolution 0 // 2D resolution 800x600 vid_conwidth 800 vid_conheight 600 @@ -109,6 +113,33 @@ v_deathtilt 0 // needed for spectators (who are dead to avoid prediction) exec sRGB-disable.cfg vid_sRGB_fallback 2 r_hdr_glowintensity 1 +// #define Image_LinearFloatFromsRGBFloat(c) (((c) <= 0.04045f) ? (c) * (1.0f / 12.92f) : (float)pow(((c) + 0.055f)*(1.0f/1.055f), 2.4f)) +set rpn_sRGB_to_linear "dup 0.055 add 1.055 div 2.4 pow exch 12.92 div dup 0.0031308 gt when" +// #define Image_sRGBFloatFromLinearFloat(c) (((c) < 0.0031308f) ? (c) * 12.92f : 1.055f * (float)pow((c), 1.0f/2.4f) - 0.055f) +set rpn_linear_to_sRGB "dup 1.0 2.4 div pow 1.055 mul 0.055 sub exch 12.92 mul dup 0.04045 ge when" + +// -nosRGB to -sRGB sky shader conversion: +// +// q3map_sunExt 1 0.6875 0.375 340 25 47 0 16 +// ^^ elevation +// ^^^ sunlight +// q3map_skylight 110 3 +// ^^^ skylight +// +// With that, do (the last parameter is the ratio of skylight you assume hits +// the surfaces, about 0.25 for inner surfaces near sky, about 1.00 on +// terrain): +// ]skybox_nosRGB_to_sRGB 340 47 110 0.25 +// rpn: still on stack: new_sunlight: +// rpn: still on stack: 380.464142 +// rpn: still on stack: new_skylight: +// rpn: still on stack: 9.32523632 +// +// The equivalent -sRGB shader then will have: +// +// q3map_sunExt 1 0.6875 0.375 380.464142 25 47 0 16 +// q3map_skylight 9.32523632 3 +alias skybox_nosRGB_to_sRGB "rpn $3 402.123 $4 div div $rpn_sRGB_to_linear 402.123 $4 div mul /new_skylight: $3 402.123 $4 div div $1 256 div $2 0.017453 mul sin mul add $rpn_sRGB_to_linear $3 402.123 $4 div div $rpn_sRGB_to_linear sub 256 mul $2 0.017453 mul sin div /new_sunlight:" // these settings determine how much the view is affected by movement/damage cl_smoothviewheight 0.05 // time of the averaging to the viewheight value so that it creates a smooth transition for crouching and such. 0 for instant transition @@ -206,7 +237,7 @@ set g_maxplayers_spectator_blocktime 5 "if the players voted for the \"nospectat set g_warmup 0 "split the game into a warmup- and match-stage when set to 1" 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 1 "if set players start with all guns in warmup mode" +set g_warmup_allguns 1 "provide more weapons on start while in warmup: 0 = normal start weapons, 1 = all guns available on the map, 2 = all normal weapons" set g_warmup_majority_factor 0.8 "minimum percentage of players ready needed for warmup to end" 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" @@ -245,7 +276,7 @@ set cl_deathglow 0.8 "number of seconds during which dead bodies glow out" set sv_gibhealth 100 "Minus health a dead body must have in order to get gibbed" -// fragmessage: This allows extra information to be displayed with the frag centerprints. +// fragmessage: This allows extra information to be displayed with the frag centerprints. set sv_fraginfo 1 "Enable extra frag message information, 0 = Never display, 1 = Display only in warmup mode; 2 = Always display" set sv_fraginfo_ping 1 "Enable ping display information, 0 = Never display, 1 = Always display (If the player is a bot, it will say bot instead of the ping.)" set sv_fraginfo_handicap 1 "Enable handicap display information, 0 = Never display, 1 = Only when the player has handicap on, 2 = Always display (Displays Off if disabled)" @@ -284,7 +315,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" -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" @@ -369,7 +400,6 @@ pausable 0 set g_spawnshieldtime 1 "number of seconds you are invincible after you spawned, this shield is lost after you fire" set g_antilag 2 "AntiLag (0 = no AntiLag, 1 = verified client side hit scan, 2 = server side hit scan in the past, 3 = unverified client side hit scan)" set g_antilag_nudge 0 "don't touch" -set g_antilag_bullets 1 "Bullets AntiLag (0 = no AntiLag, 1 = server side hit scan in the past) - DO NOT TOUCH (severely changes weapon balance)" set g_shootfromclient 2 "let client decide if it has the gun left or right; if set to 2, center handedness is allowed; see also cl_gunalign" set g_shootfromeye 0 "shots are fired from your eye/crosshair; visual gun position can still be influenced by cl_gunalign 1 and 2" set g_shootfromcenter 0 "weapon gets moved to the center, shots still come from the barrel of your weapon; visual gun position can still be influenced by cl_gunalign 1 and 2" @@ -427,8 +457,6 @@ bind f7 menu_showsandboxtools set g_playerclip_collisions 1 "0 = disable collision testing against playerclips, might be useful on some defrag maps" set g_botclip_collisions 1 "0 = disable collision testing against botclips, might be useful on some defrag maps" -set welcome_message_time 8 - set g_grappling_hook 0 "let players spawn with the grappling hook which allows them to pull themselves up" set g_spawn_alloweffects 1 "allow clients to enable spawn point and event effects such as particles and sounds, see cl_spawn_ cvars for more info" @@ -436,6 +464,7 @@ set g_spawn_furthest 1 "this amount of the spawns shall be far away from any pla set g_spawn_useallspawns 0 "use all spawns, e.g. also team spawns in non-teamplay, and all spawns, even enemy spawns, in teamplay" // respawn delay set g_respawn_delay 2 "number of seconds you have to wait before you can respawn again" +set g_respawn_delay_max 0 "number of seconds you can wait before you're forced to respawn (only effective with g_forced_respawn 1)" set g_respawn_waves 0 "respawn in waves (every n seconds), intended to decrease overwhelming base attacks" // overtime @@ -919,7 +948,7 @@ seta scoreboard_border_thickness 1 "scoreboard border thickness" seta scoreboard_accuracy_border_thickness 1 "accuracy stats border thickness" seta scoreboard_accuracy_doublerows 0 "use two rows instead of one" seta scoreboard_accuracy_nocolors 0 "don't use colors displaying accuracy stats" -seta scoreboard_accuracy 0 "show weapon accuracy stats panel on scoreboard; colors can be configured with accuracy_color* cvars" +seta scoreboard_accuracy 1 "show weapon accuracy stats panel on scoreboard; colors can be configured with accuracy_color* cvars" seta scoreboard_color_bg_r 0 "red color component of the scoreboard background" seta scoreboard_color_bg_g 0.4 "green color component of the scoreboard background" seta scoreboard_color_bg_b 0.6 "blue color component of the scoreboard background" @@ -927,7 +956,7 @@ seta scoreboard_color_bg_team 0.5 "team color multiplier of the scoreboard backg seta scoreboard_alpha_bg 0.6 "scoreboard background alpha" seta scoreboard_alpha_fg 1 "scoreboard foreground alpha" seta scoreboard_alpha_name 0.9 "alpha of player text in scoreboard list other than self" -seta scoreboard_alpha_name_self 1 "alpha of player text in scoreboard list of self" +seta scoreboard_alpha_name_self 1 "alpha of player text in scoreboard list of self" seta scoreboard_fadeinspeed 10 "speed at which scoreboard fades in, higher is faster (0 = instant)" seta scoreboard_fadeoutspeed 5 "speed at which scoreboard fades out, higher is faster (0 = instant)" seta scoreboard_highlight 1 "enable highlighting for rows and columns in the scoreboard" @@ -949,6 +978,28 @@ seta menu_slist_showfull 1 "show servers even if they are full and have no slots seta menu_slist_showempty 1 "show servers even if they are no empty and have no opponents to play against" seta menu_slist_modfilter "" // set to either: !modname or modname. modname of = means "same as we are running now". +// other serverlist cvars +seta menu_slist_categories 1 +seta menu_slist_categories_onlyifmultiple 1 +seta menu_slist_purethreshold 0 +seta menu_slist_modimpurity 0 +seta menu_slist_recommendations 3 +seta menu_slist_recommendations_maxping 150 +seta menu_slist_recommendations_minfreeslots 1 +seta menu_slist_recommendations_minhumans 0 +seta menu_slist_recommendations_purethreshold -1 + +// serverlist category override cvars +seta menu_slist_categories_CAT_FAVORITED_override "" +seta menu_slist_categories_CAT_RECOMMENDED_override "" +seta menu_slist_categories_CAT_NORMAL_override "" +seta menu_slist_categories_CAT_SERVERS_override "CAT_NORMAL" +seta menu_slist_categories_CAT_XPM_override "CAT_NORMAL" +seta menu_slist_categories_CAT_MODIFIED_override "" +seta menu_slist_categories_CAT_OVERKILL_override "" +seta menu_slist_categories_CAT_MINSTAGIB_override "" +seta menu_slist_categories_CAT_DEFRAG_override "" + seta menu_weaponarena "" seta menu_maxplayers 16 "maxplayers value when the menu starts a game" @@ -1014,8 +1065,8 @@ makesaved v_idlescale 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 @@ -1101,7 +1152,7 @@ set sv_clones 0 "number of clones a player may make (reset by the \"kill\" comma set cl_handicap 1 "the higher, the more damage you will receive (client setting) NOTE: reconnect or use sendcvar command to update the choice." -seta cl_clippedspectating 1 "movement collision for spectators so that you can't pass through walls and such. (client setting) NOTE: reconnect or use sendcvar command to update the choice." +seta cl_clippedspectating 1 "movement collision for spectators so that you can't pass through walls and such. (client setting) NOTE: reconnect or use sendcvar command to update the choice." seta cl_autoscreenshot 1 "Take a screenshot upon the end of a match... 0 = Disable completely, 1 = Allow sv_autoscreenshot to take a screenshot when requested, 2 = Always take an autoscreenshot anyway." @@ -1226,7 +1277,7 @@ seta cl_casings_maxcount 100 "maximum amount of shell casings (must be at least seta cl_gibs_maxcount 100 "maximum amount of gibs (must be at least 1)" seta cl_vehicle_spiderbot_cross_alpha 0.6 seta cl_vehicle_spiderbot_cross_size 1 -seta cl_vehicles_hudscale 0.5 +seta cl_vehicles_hudscale 0.5 seta cl_vehicles_hudalpha 0.75 seta cl_vehicles_hud_tactical 1 @@ -1385,7 +1436,7 @@ 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.07 // more than 2, less than 3 server frames +sv_clmovement_inputtimeout 0.066 // slightly less than 2 frames, so only one frame can be compensated // exact gloss looks better, e.g. on g-23 r_shadow_glossexact 1 @@ -1431,7 +1482,7 @@ mod_q3shader_default_polygonoffset -14 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 @@ -1523,7 +1574,7 @@ exec _hud_descriptions.cfg exec hud_luminos.cfg -// ... and now that everything is configured/aliased, we can do some things: +// ... and now that everything is configured/aliased, we can do some things: // Change g_start_delay based upon if the server is local or not. if_client set g_start_delay 0 "delay before the game starts, so everyone can join; recommended to set this to like 15 on a public server"