X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=defaultXonotic.cfg;h=d7f9336581804b251b82b9c177936bb9d8ad5fbc;hp=3b38eb4e072d03d3875f50d86011529305571dc0;hb=a26bfd2d3b7aa6ebf5de2ce0ef4e102252241ca8;hpb=fb61c977ddeed686ef587fd54e40f55a4bdc2322 diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 3b38eb4e07..d7f9336581 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -53,8 +53,6 @@ alias asay_drop "say_team (%l) dropped %w ; impulse 17" alias +hook +button6 alias -hook -button6 alias use "impulse 21" -alias +use use // always send that impulse AND press the key (+use is engine internal command and executes anyway) -set cl_newusekeysupported 1 // indicates that we always send the use impulse too, so they do not need to be synthesized alias ready "cmd ready" alias lockteams "sv_cmd lockteams" alias unlockteams "sv_cmd unlockteams" @@ -215,12 +213,15 @@ seta crosshair_ring_reload 1 "main cvar to enable or disable ammo crosshair ring seta crosshair_ring_reload_size 2.5 "reload ring size" seta crosshair_ring_reload_alpha 0.2 "reload ring alpha" +seta cl_reticle 1 "control for toggling whether ANY zoom reticles are shown" seta cl_reticle_stretch 0 "whether to stretch reticles so they fit the screen (brakes image proportions)" seta cl_reticle_item_nex 1 "draw aiming reticle for the nex weapon's zoom, 0 disables and values between 0 and 1 change alpha" seta cl_reticle_item_normal 1 "draw reticle when zooming with the zoom button, 0 disables and values between 0 and 1 change alpha" fov 90 seta cl_velocityzoom 0 "velocity based zooming of fov, negative values zoom out" -seta cl_velocityzoomtime 0.3 "time value for averaging speed values" +seta cl_velocityzoom_type 3 "how to factor in speed, 1 = all velocity in all directions, 2 = velocity only in forward direction (can be negative), 3 = velocity only in forward direction (limited to forward only)" +seta cl_velocityzoom_speed 1000 "target speed for fov factoring" +seta cl_velocityzoom_time 0.2 "time value for averaging speed values" seta cl_zoomfactor 5 "how much +zoom will zoom (1-16)" seta cl_zoomspeed 8 "how fast it will zoom (0.5-16), negative values mean instant zoom" seta cl_zoomsensitivity 0 "how zoom changes sensitivity (0 = weakest, 1 = strongest)" @@ -246,6 +247,9 @@ vid_conheight 600 // menu_conwidth, menu_conheight are set inside quake.rc v_deathtilt 0 // needed for spectators (who are dead to avoid prediction) +// we want to use sRGB for our maps! +exec sRGB-disable.cfg + // 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 cl_deathfade 0 // fade screen to dark red when dead, value represents how fast the fade is (higher is faster) @@ -286,13 +290,12 @@ gl_polyblend 0 // whether to use screen tints, this has now been replaced by a b r_motionblur 0 // motion blur value, default is 0 r_damageblur 0 // motion blur when damaged, default is 0 (removed in Xonotic) -r_bloom_blur 16 -r_bloom_brighten 2.5 -r_bloom_colorexponent 1 -r_bloom_colorscale 1 -r_bloom_colorsubtract 0.15 +r_bloom_blur 6 +r_bloom_brighten 1.5 +r_bloom_colorexponent 2 +r_bloom_colorscale 1.75 +r_bloom_colorsubtract 0.1 r_bloom_resolution 320 -r_hdr_range 4 seta vid_x11_display "" "xonotic-linux-*.sh will use this to start xonotic on an other/new X display" // This can have three possible settings: @@ -911,7 +914,6 @@ gl_picmip_other 1 // so, picmip -1 is best possible quality r_mipsprites 1 r_mipskins 1 r_shadow_realtime_world_lightmaps 1 -seta r_ambient 4 cl_decals_fadetime 5 cl_decals_time 2 seta cl_gunalign 3 "Gun alignment; 1 = center (if allowed by g_shootfromclient) or right, 2 = center (if allowed by g_shootfromclient) or left, 3 = right only, 4 = left only" @@ -924,6 +926,7 @@ seta cl_gibs_velocity_random 1 "gib throw velocity randomness scale" 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_gibs_avelocity_scale 1 "how much angular velocity to use on gibs" seta cl_casings 1 "enable or disable bullet casings" seta cl_casings_shell_time 30 "shell casing lifetime" seta cl_casings_bronze_time 10 "bullet casings lifetime" @@ -956,10 +959,11 @@ cl_sound_ric3 weapons/ric3.wav cl_sound_r_exp3 "" sv_sound_land "" sv_sound_watersplash "" -seta cl_sound_maptime_warning "1" "play announcer sound telling you the remaining maptime - 0: do not play at all, 1: play at one minute, 2: play at five minutes, 3: play both" -seta cl_notify_carried_items "3" "notify you of carried items when you obtain them (e.g. flags in CTF) - 0: disabled, 1: notify of taken items, 2: notify of picking up dropped items, 3: notify of both" seta cl_announcer default "name of the announcer you wish to use from data/sound/announcer" +seta cl_announcer_antispam 2 "number of seconds before an announcement of the same sound can be played again" +seta cl_announcer_maptime 3 "play announcer sound telling you the remaining maptime - 0: do not play at all, 1: play at one minute, 2: play at five minutes, 3: play both" +seta cl_notify_carried_items "3" "notify you of carried items when you obtain them (e.g. flags in CTF) - 0: disabled, 1: notify of taken items, 2: notify of picking up dropped items, 3: notify of both" // startmap_dm is used when running with the -listen or -dedicated commandline options set serverconfig server.cfg @@ -1040,7 +1044,7 @@ bind MWHEELDOWN weapprev bind r reload bind BACKSPACE dropweapon bind g dropweapon -bind f use +bind f +use // misc bind e +hook @@ -1241,15 +1245,16 @@ set g_nick_flood_penalty 0.5 "duration of the nick flood penalty" set g_nick_flood_penalty_yellow 3 "number of changes to allow before warning and movement blocking" set g_nick_flood_penalty_red 30 "number of changes to allow before totally disorienting the player" +set sv_waypointsprite_deployed_lifetime 10 +set sv_waypointsprite_deadlifetime 1 +set sv_waypointsprite_limitedrange 5120 + seta g_waypointsprite_uppercase 1 set g_waypointsprite_normdistance 512 set g_waypointsprite_minscale 0.5 set g_waypointsprite_minalpha 0.4 set g_waypointsprite_distancealphaexponent 2 set g_waypointsprite_timealphaexponent 1 -set g_waypointsprite_deployed_lifetime 10 -set g_waypointsprite_deadlifetime 1 -set g_waypointsprite_limitedrange 5120 set g_waypointsprite_stuffbinds 0 seta g_waypointsprite_scale 1 seta g_waypointsprite_fontsize 12 @@ -1429,126 +1434,8 @@ con_chatwidth 0.6 con_notifysize 10 con_notifyalign 0 -// hud variables -set _hud_configure 0 "1 = configure the HUD" -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" - seta sbar_info_pos 0 "Y-axis distance from lower right corner for engine info prints" -// 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" -seta hud_panel_weapons_complainbubble_time 1 "time that a new entry stays until it fades out" -seta hud_panel_weapons_complainbubble_fadetime 0.25 "fade out time" -seta hud_panel_weapons_accuracy 1 "show accuracy color as the weapon icon background; colors can be configured with accuracy_color* cvars" -seta hud_panel_weapons_ammo 1 "show ammo as a status bar" -seta hud_panel_weapons_ammo_full_shells 50 "show 100% of the status bar at this ammo count" -seta hud_panel_weapons_ammo_full_nails 200 "show 100% of the status bar at this ammo count" -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_onlyowned 1 "show only owned weapons" - -seta hud_panel_ammo_maxammo "40" "when you have this much ammo, the ammo status bar is full" - -seta hud_panel_healtharmor_maxhealth "200" "when you have this much health, the health status bar is full" -seta hud_panel_healtharmor_maxarmor "200" "when you have this much armor, the armor status bar is full" -seta hud_panel_healtharmor_progressbar_gfx 1 "enable graphic effects on the progressbars" -seta hud_panel_healtharmor_progressbar_gfx_damage 5 "show damage effect when damaged at least by this amount; 0 disables the effect" -seta hud_panel_healtharmor_progressbar_gfx_lowhealth 40 "health progressbar blinks when health is lower than this amount" -seta hud_panel_healtharmor_progressbar_gfx_smooth 2 "smooth changes of the progressbar when health/armor change at least by this amount; 0 disables the effect" - -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" - -seta hud_panel_modicons_dom_layout 1 "3 possible layouts: 0) only icons; 1) icons and percentage of average pps (points per second); 2) icons and average pps" - -seta hud_panel_timer_increment 0 "show elapsed time instead of remaining time" - -seta hud_panel_radar_scale 4096 "distance you can see on the team radar" -seta hud_panel_radar_rotation 0 "rotation mode: you set what points up. 0 = player, 1 = west, 2 = south, 3 = east, 4 = north" -seta hud_panel_radar_zoommode 0 "zoom mode: 0 = zoomed by default, 1 = zoomed when +zoom, 2 = always zoomed, 3 = always zoomed out" -alias hud_panel_radar_rotate "toggle hud_panel_radar_rotation 0 1 2 3 4" -seta hud_panel_radar_maximized_scale 8192 "distance you can see on the radar when maximized" -seta hud_panel_radar_maximized_size "0.5 0.5" "size of the radar when maximized" -alias +hud_panel_radar_maximized "cl_cmd hud_panel_radar_maximized 1" -alias -hud_panel_radar_maximized "cl_cmd hud_panel_radar_maximized 0" -alias hud_panel_radar_maximized "cl_cmd hud_panel_radar_maximized" - -seta hud_panel_score_rankings 0 "show rankings: 1 always show my own score; 2 pure rankings" - -seta hud_panel_engineinfo_framecounter_time 0.1 "time between framerate display updates" -seta hud_panel_engineinfo_framecounter_decimals 0 "amount of decimals to show" -seta hud_panel_engineinfo_framecounter_exponentialmovingaverage 1 "use an averaging method for calculating fps instead of counting frametime like engine does" -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_panel_physics_speed_unit 3 "speed unit (1 = qu/s, 2 = m/s, 3 = km/h, 4 = mph, 5 = knots)" -seta hud_panel_physics_speed_unit_show 1 "also show speed unit" -seta hud_panel_physics_speed_max 1800 "speed progressbar gets filled up completely by this value (in qu/s)" -seta hud_panel_physics_speed_vertical 0 "include the speed on the Z-axis" -seta hud_panel_physics_topspeed 1 "also show top speed" -seta hud_panel_physics_topspeed_time 4 "how many seconds the top speed takes to fade out" -seta hud_panel_physics_acceleration_max 1.5 "acceleration progressbar gets completely filled up by this value (in g)" -seta hud_panel_physics_acceleration_vertical 0 "include the acceleration on the Z-axis" - -seta hud_showbinds 1 "what to show in the HUD to indicate certain keys to press: 0 display commands, 1 bound keys, 2 both" -seta hud_showbinds_limit 2 "maximum number of bound keys to show for a command. 0 for unlimited" - -seta hud_colorflash_alpha 0.5 "starting alpha of the color flash" - -seta hud_damage 0.55 "an improved version of gl_polyblend for damage, draw an image instead when hurt" -seta hud_damage_blur 10 "Use postprocessing to blur the screen when you have taken damage. This can be paired with current hud damage or just used alone. Higher values = more blur" -seta hud_damage_blur_alpha 0.5 "Amount of alpha to use when merging the blurred layers back into the render. Turning this up higher will remove bloom, so it's best to find a balance" -seta hud_damage_gentle_alpha_multiplier 0.10 "how much to multiply alpha of flash when using the cl_gentle version, it's much more opaque than the non-gentle version" -seta hud_damage_gentle_color "1 0.7 1" "color of flash for cl_gentle version" -seta hud_damage_color "1 0 0" "color of flash" -seta hud_damage_factor 0.025 "(damage * factor) = how much to add to the alpha value" -seta hud_damage_fade_rate 0.75 "how much to subtract from the alpha value each second" -seta hud_damage_maxalpha 1.5 "how much to limit the alpha value to" -seta hud_damage_pain_threshold 0.1 "how much alpha to ignore (must be bigger than the hud_damage_factor so that e.g. rot is ignored)" -seta hud_damage_pain_threshold_lower 1.25 "how much we lower pain_threshold with when nearing 0 health (if pain_threshold gets negative then we always draw a flash at alpha = fabs(pain_threshold)" -seta hud_damage_pain_threshold_lower_health 50 "at which health we start lowering pain_threshold" -seta hud_damage_pain_threshold_pulsating_min 0.6 "minimum value when calculating the pulse: max(pulsating_min, fabs(sin(PI * time / period))" -seta hud_damage_pain_threshold_pulsating_period 0.8 "one pulse every X seconds" - -seta hud_powerup 0 "power of the sharpen effect when owning the shield or strength powerups, default is 0.5" - -seta hud_postprocessing 1 "enables the ability for effects such as hud_damage_blur and hud_contents to apply a postprocessing method upon the screen - enabling this disables manual editing of the postprocess cvars" -seta hud_postprocessing_maxbluralpha 0 "maximum alpha which the blur postprocess can be, default is 0.5" -seta hud_postprocessing_maxblurradius 8 "maximum radius which the blur postprocess can be, default is 8" - -seta hud_contents 1 "an improved version of gl_polyblend for liquids such as water/lava/slime, draw a filler when inside the liquid" -seta hud_contents_blur 10 "Use postprocessing to blur the screen when you are inside a liquid. Higher values = more blur" -seta hud_contents_blur_alpha 0.5 "Amount of alpha to use when merging the blurred layers back into the render. Turning this up higher will remove bloom, so it's best to find a balance" -seta hud_contents_factor 1 "factor at which to multiply the current faded value." -seta hud_contents_fadeintime 0.02 "factor of time it takes for the alpha level to reach normal value when entering the liquid" -seta hud_contents_fadeouttime 0.1 "factor of time it takes for the alpha level to reach normal value when leaving the liquid" -seta hud_contents_lava_alpha 0.7 "alpha of the lava color blend when inside it" -seta hud_contents_lava_color "0.8 0.1 0" -seta hud_contents_slime_alpha 0.7 "alpha of the slime color blend when inside it" -seta hud_contents_slime_color "0 0.4 0.1" -seta hud_contents_water_alpha 0.5 "alpha of the water color blend when inside it" -seta hud_contents_water_color "0.4 0.3 0.3" - -seta hud_shownames 1 "draw names and health/armor of nearby players" -seta hud_shownames_enemies 2 "1 = draw names of enemies you point at (TODO), 2 = draw names of all enemies in view" -seta hud_shownames_self 0 "also include your own name to be shown when third person camera mode is on (chase_active/cl_eventchase)" -seta hud_shownames_status 1 "1 = draw health/armor status of teammates" -seta hud_shownames_statusbar_height 4 "height of status bar" -seta hud_shownames_aspect 8 "aspect ratio of total drawing area per name" -seta hud_shownames_fontsize 12 "font size" -seta hud_shownames_decolorize 1 "1 = decolorize name in team games, 2 = decolorize always" -seta hud_shownames_alpha 0.7 "alpha" -seta hud_shownames_resize 1 "enable resizing of the names, then the size cvars will correspond to the maximum size" -seta hud_shownames_mindistance 1000 "start fading alpha/size at this distance" -seta hud_shownames_maxdistance 2500 "alpha/size is 0 at this distance" -seta hud_shownames_antioverlap 1 "if two tags get too close to each other, fade out the one further away from you" -seta hud_shownames_antioverlap_distance 125 "2d distance to other tag after which to fade out" -seta hud_shownames_offset 52 "offset (along z-axis) tag from player origin by this many units" - // scoreboard seta scoreboard_columns default seta scoreboard_border_thickness 1 "scoreboard border thickness" @@ -1568,8 +1455,9 @@ 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.15 "how many pixels the scoreboard is offset from the left screen edge" -seta scoreboard_offset_right 0.15 "how many pixels the scoreboard is offset from the right screen edge" +seta scoreboard_offset_left 0.15 "how far (by percent) the scoreboard is offset from the left screen edge" +seta scoreboard_offset_right 0.15 "how far (by percent) the scoreboard is offset from the right screen edge" +seta scoreboard_offset_vertical 0.05 "how far (by percent) the scoreboard is offset from the top and bottom of the screen" seta scoreboard_bg_scale 0.25 "scale for the tiled scoreboard background" seta accuracy_color_levels "0 20 100" "accuracy values at which a specified color (accuracy_color) will be used. If your accuracy is between 2 of these values then a mix of the Xth and X+1th colors will be used. You can specify up to 10 values, in increasing order" @@ -1702,15 +1590,12 @@ set sv_maxidle_spectatorsareidle 0 // CTF capture limit placeholder cvar set capturelimit 0 -// hud: font size -seta hud_fontsize 11 -seta hud_width 560 - // these entities are not referenced by anything directly, they just represent // teams and are found by find() when needed prvm_leaktest_ignore_classnames "ctf_team dom_team tdm_team" sv_allowdownloads_inarchive 1 // for csprogs.dat +sv_allowdownloads 0 // download protocol is evil set g_jump_grunt 0 "Do you make a grunting noise every time you jump? Is it the same grunting noise every time?" @@ -1738,8 +1623,7 @@ set g_maplist_allow_frustrating 0 "allow impossible maps to be, e.g., voted for 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" if_dedicated set g_start_delay 15 "delay before the game starts, so everyone can join; recommended to set this to like 15 on a public server" -alias ons_map "cl_cmd radar" // legacy alias -alias radar "cl_cmd radar" +alias radar "cl_cmd hud_panel_radar_maximized" alias scoreboard_columns_set "" // aliased later alias scoreboard_columns_help "cl_cmd scoreboard_columns_help $*" @@ -1755,6 +1639,8 @@ set cl_handicap 1 "the higher, the more damage you will receive (client setting) 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 0 "client option to automatically take a screenshot once the map has ended (see also sv_autoscreenshot)" + // must be at the bottom of this file: // alias for switching the teamselect menu alias menu_showteamselect "menu_cmd directmenu TeamSelect" @@ -2005,6 +1891,7 @@ set _campaign_name "" // debug set _independent_players 0 "DO NOT TOUCH" +set _notarget 0 "NO, REALLY, DON'T" // define some engine cvars that we need even on dedicated server set r_showbboxes 0 @@ -2164,6 +2051,9 @@ set g_weapon_charge_colormod_blue_full -1 set g_playerstats_uri "" set g_playerstats_debug 0 "when 1, player stats are dumped to the console too" +// session locking +locksession 1 + // create this cvar in case the engine did not set snd_soundradius 1200 set snd_softclip 1 @@ -2192,10 +2082,6 @@ scr_loadingscreen_scale 999 scr_loadingscreen_scale_base 1 scr_loadingscreen_scale_limit 2 -// sRGB configuration (EXPERIMENTAL, needs maps to be relit) -alias sRGBcorrect_on "r_texture_sRGB_skin_diffuse 1;r_texture_sRGB_skin_gloss 1;r_texture_sRGB_skin_glow 1;r_texture_sRGB_reflect 1;r_texture_sRGB_skybox 1;v_gamma 2.2;r_restart" -alias sRGBcorrect_off "r_texture_sRGB_skin_diffuse 0;r_texture_sRGB_skin_gloss 0;r_texture_sRGB_skin_glow 0;r_texture_sRGB_reflect 0;r_texture_sRGB_skybox 0;v_gamma 1.0;r_restart" - // other config files exec balanceXonotic.cfg exec ctfscoring-ai.cfg @@ -2204,10 +2090,11 @@ exec physicsX.cfg exec turrets.cfg exec vehicles.cfg -// hud cvar descriptions +// hud cvar descriptions and common settings +exec _hud_common.cfg exec _hud_descriptions.cfg // exec the default skin config -// please add any new cvars into the hud_save script in qcsrc/client/hud.qc for consistency +// please add any new cvars into the hud_save script in qcsrc/client/hud_config.qc for consistency exec hud_luminos.cfg // enable menu syncing