X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=defaultXonotic.cfg;h=2e0586672683370ca1362e0a17b230d37be39b80;hb=7ca9f7048fbb405c0c814bcf58648049424cee22;hp=f5ac49f6e837e127214dfa00c680363ef99bc51f;hpb=b360fb458bd90305189aeb584af2f32359c2de1d;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index f5ac49f6e..2e0586672 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -100,7 +100,9 @@ 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 @@ -111,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 @@ -208,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" @@ -286,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" @@ -429,8 +458,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" @@ -921,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" @@ -1016,8 +1043,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 @@ -1433,7 +1460,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