X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=defaultXonotic.cfg;h=b42917ba07a7534ed1bacdb84ee0d6316faa7405;hp=f82d767b29653ad9a0ae0403dd8e09747ab85d16;hb=0ea67677132d4f558b711d75d06640bfb87f8f81;hpb=18e9965b8e9960d8f20a0d29a581c553ee901f7f diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index f82d767b2..b42917ba0 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -206,6 +206,9 @@ seta crosshair_fireball_color_green 1.0 "crosshair color green component to disp seta crosshair_fireball_color_blue 0.2 "crosshair color blue component to display when wielding the fireball" seta crosshair_fireball_color_alpha 1 "crosshair alpha value to display when wielding the fireball" seta crosshair_fireball_size 1 "crosshair size when wielding the fireball" +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 recticle for the nex weapon's zoom, 0 disables and values between 0 and 1 change alpha" +seta cl_reticle_item_normal 1 "draw recticle 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" @@ -460,7 +463,7 @@ set bot_ai_aimskill_order_filter_5th 0.5 "Movement prediction filter. Used rarel set g_waypointeditor 0 set bot_ignore_bots 0 "When set, bots don't shoot at other bots" set bot_join_empty 0 "When set, bots also play if no player has joined the server" -set bot_vs_human 0 "Bots and humans play in different teams when set. positive values to make an all-bot blue team, set to negative values to make an all-bot red team, the absolute value is the ratio bots vs humans (1 for equal count)" +set bot_vs_human 0 "Bots and humans play in different teams when set. positive values to make an all-bot blue team, set to negative values to make an all-bot red team, the absolute value is the ratio bots vs humans (1 for equal count). Changes will be correctly applied only from the next game" alias g_waypointeditor_spawn "impulse 103" alias g_waypointeditor_remove "impulse 104" @@ -501,7 +504,6 @@ set g_laserguided_missile 0 "if set to 1 the rockets of the rocket launcher can set g_midair 0 "if set to 1 you can only apply damage to your opponent while he is airborne" set g_midair_shieldtime 0.3 "number of seconds you are still invincible since you lost contact to the ground" set g_spawnsound 1 "set to 0 if you don't want to hear the spawn sound when a player spawns" -set g_spawnpoints_autodrop 0 "if set to 1, automatically drop spawn point locations if they were placed too high" set g_spawnpoints_auto_move_out_of_solid 0 "if set to 1 you will see a warning if a spawn point was placed inside a solid" set g_forced_respawn 0 "if set to 1 and a player died, that player gets automatically respawned once seconds are over" set g_fullbrightplayers 0 "brightens up player models (note that the color, skin or model of the players does not change!)" @@ -547,6 +549,7 @@ set sv_dodging_wall_distance_threshold 10 "the maximum distance from a wall that set sv_dodging_sound 1 "if 1 dodging makes a sound. if 0 dodging is silent" set leadlimit 0 +set leadlimit_and_fraglimit 0 "if set, leadlimit is ANDed with fraglimit (otherwise ORed)" // this means that timelimit can be overidden globally and fraglimit can be overidden for each game mode: DM/TDM, Domination, CTF, and Runematch. seta timelimit_override -1 "Time limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)" @@ -910,24 +913,25 @@ alias sv_loadconfig "exec $serverconfig" alias sv_restart "say \"Server will restart at the end of the match, you will all be reconnected automatically. $* \"; quit_and_redirect self" // aliases: -alias +attack2 +button3 -alias -attack2 -button3 +alias +fire +attack +alias -fire -attack +alias +fire2 +button3 +alias -fire2 -button3 +alias +attack2 +button3 // old alias from Nexuiz +alias -attack2 -button3 // old alias name from Nexuiz alias +zoom +button4 alias -zoom -button4 alias +crouch +button5 alias -crouch -button5 -alias weapnext "_weapnext_${_supports_weaponpriority}${cl_weaponpriority_useforcycling}" -alias _weapnext_00 "impulse 10" -alias _weapnext_01 "impulse 10" -alias _weapnext_10 "impulse 10" -alias _weapnext_11 "impulse 15" +alias weapnext "_weapnext_${cl_weaponpriority_useforcycling}" +alias _weapnext_0 "impulse 18" +alias _weapnext_1 "impulse 15" +alias _weapnext_2 "impulse 10" alias weaplast "impulse 11" -alias weapprev "_weapprev_${_supports_weaponpriority}${cl_weaponpriority_useforcycling}" -alias _weapprev_00 "impulse 12" -alias _weapprev_01 "impulse 12" -alias _weapprev_10 "impulse 12" -alias _weapprev_11 "impulse 16" -set _supports_weaponpriority 0 "set to 1 by csqc if supported, and to 0 on disconnect" +alias weapprev "_weapprev_${cl_weaponpriority_useforcycling}" +alias _weapprev_0 "impulse 19" +alias _weapprev_1 "impulse 16" +alias _weapprev_2 "impulse 12" alias weapbest "impulse 13" alias reload "impulse 20" @@ -957,8 +961,8 @@ bind 8 "impulse 8" bind 9 "impulse 9" bind 0 "impulse 14" // cycles the superweapons bind q weaplast -bind MOUSE1 +attack -bind MOUSE2 +attack2 +bind MOUSE1 +fire +bind MOUSE2 +fire2 bind MOUSE3 +zoom bind MOUSE4 weaplast bind MOUSE5 +hook @@ -992,8 +996,8 @@ bind JOY1 "+crouch" bind JOY2 "+jump" bind JOY3 "weapprev" bind JOY4 "weapnext" -bind JOY5 "+attack2" -bind JOY6 "+attack" +bind JOY5 "+fire2" +bind JOY6 "+fire" bind JOY7 "+zoom" bind JOY8 "dropweapon" bind JOY9 "menu_showteamselect" @@ -1038,7 +1042,7 @@ bind kp_minus "+userbind 18" set sv_vote_commands "restart fraglimit chmap gotomap nextmap endmatch reducematchtime extendmatchtime allready kick cointoss movetoteam_auto" "these commands can be voted" set sv_vote_only_commands "" set sv_vote_master_commands "movetoteam_red movetoteam_blue movetoteam_yellow movetoteam_pink" "maybe add kickban here (but then sv_vote_master 0)" -set rcon_restricted_commands "restart fraglimit chmap gotomap endmatch reducematchtime extendmatchtime allready kick kickban \"sv_cmd bans\" \"sv_cmd unban\" status \"sv_cmd teamstatus\" movetoteam_auto movetoteam_red movetoteam_blue movetoteam_yellow movetoteam_pink" +set rcon_restricted_commands "restart fraglimit chmap gotomap endmatch reducematchtime extendmatchtime allready kick kickban \"sv_cmd bans\" \"sv_cmd unban *\" status \"sv_cmd teamstatus\" movetoteam_auto movetoteam_red movetoteam_blue movetoteam_yellow movetoteam_pink" set sv_vote_call 1 "users can call a vote for the above commands" set sv_vote_master 1 "users can call a vote to become master" set sv_vote_master_password "" "when set, users can use \"vlogin PASSWORD\" to log in as master" @@ -1320,153 +1324,19 @@ con_notifyalign 0 // hud variables set _hud_configure 0 "1 = configure the HUD" - -seta hud_skin old "skin folder where to look for images" -seta hud_bg 0 "default background for the panels, file must exist in gfx/hud/[skin name]/, 0 = disable background by default" -seta hud_bg_color "0 0.6 0.9" "default background color for the panels, accepts \"shirt\" and \"pants\"" -seta hud_bg_alpha 0.8 "default alpha of the background" -seta hud_bg_border 10 "default border size for the panels" -seta hud_bg_padding 0 "default padding of contents from the border" -seta hud_fg_alpha 1 "alpha of the foreground" -seta hud_progressbar_alpha "0.5" "alpha of progressbars" - seta hud_configure_checkcollisions 1 "check for collisions against other panels when in hud configure mode" -seta hud_configure_bg_minalpha 0.5 "minimum panel background alpha 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 1 "snap to grid when moving/resizing panels" -seta hud_configure_grid_x 10 "snap each X pixels" -seta hud_configure_grid_y 10 "snap each Y pixels" - -seta hud_dock "dock" "enable a fullscreen background for the hud, useful for creating artificial docks, \"\" = disable" -seta hud_dock_color "0 0.6 0.9" "dock color, accepts \"shirt\" and \"pants\"" -seta hud_dock_alpha 0.8 "alpha of the dock" - -seta sbar_info_pos 50 - -seta hud_weaponicons 1 "enable/disable this panel" -seta hud_weaponicons_pos "-0.635295 -0.134116" "position of this panel" -seta hud_weaponicons_size "0.352942 0.064845" "size of this panel" -seta hud_weaponicons_number 1 "show number of weapon" -seta hud_weaponicons_accuracy_yellow 40 "percentage at which the accuracy color is yellow" -seta hud_weaponicons_bg "" "if set to something else than \"\" = override default background" -seta hud_weaponicons_bg_color "" "if set to something else than \"\" = override default panel background color" -seta hud_weaponicons_bg_alpha "" "if set to something else than \"\" = override default panel background alpha" -seta hud_weaponicons_bg_border "" "if set to something else than \"\" = override default size of border around the background" -seta hud_weaponicons_bg_padding "" "if set to something else than \"\" = override default padding of contents from border" - -seta hud_inventory 1 "enable/disable this panel" -seta hud_inventory_pos "0.179783 -0.092189" "position of this panel" -seta hud_inventory_size "0.174227 0.092189" "size of this panel" -seta hud_inventory_onlycurrent 0 "1 = show only current ammo type" -seta hud_inventory_bg "" "if set to something else than \"\" = override default background" -seta hud_inventory_bg_color "" "if set to something else than \"\" = override default panel background color" -seta hud_inventory_bg_alpha "" "if set to something else than \"\" = override default panel background alpha" -seta hud_inventory_bg_border "" "if set to something else than \"\" = override default size of border around the background" -seta hud_inventory_bg_padding "" if set to something else than \"\" = override default padding of contents from border" - -seta hud_powerups 1 "enable/disable this panel" -seta hud_powerups_pos "-0.311922 -0.084896" "position of this panel" -seta hud_powerups_size "0.086719 0.077084" "size of this panel" -seta hud_powerups_flip 1 "flip strength/shield positions" -seta hud_powerups_mirror 0 "mirror alignment of panel items" -seta hud_powerups_bg "" "if set to something else than \"\" = override default background" -seta hud_powerups_bg_color "" "if set to something else than \"\" = override default panel background color" -seta hud_powerups_bg_alpha "" "if set to something else than \"\" = override default panel background alpha" -seta hud_powerups_bg_border "" "if set to something else than \"\" = override default size of border around the background" -seta hud_powerups_bg_padding "" "if set to something else than \"\" = override default padding of contents from border" -seta hud_progressbar_strength_color "0 0 0.6" "R G B vector of the progress bar background color" -seta hud_progressbar_shield_color "0.6 0 0.6" "R G B vector of the progress bar background color" - -seta hud_healtharmor 1 "enable/disable this panel, 2 = combined health/armor display" -seta hud_healtharmor_pos "-0.627451 -0.066667" "position of this panel" -seta hud_healtharmor_size "0.291174 0.066667" "size of this panel" -seta hud_healtharmor_flip 1 "flip health/armor positions" -seta hud_healtharmor_mirror 0 "mirror alignment of panel items" -seta hud_healtharmor_bg "" "if set to something else than \"\" = override default background" -seta hud_healtharmor_bg_color "" "if set to something else than \"\" = override default panel background color" -seta hud_healtharmor_bg_alpha "" "if set to something else than \"\" = override default panel background alpha" -seta hud_healtharmor_bg_border "" "if set to something else than \"\" = override default size of border around the background" -seta hud_healtharmor_bg_padding "" "if set to something else than \"\" = override default padding of contents from border" -seta hud_progressbar_health_color "0.6 0 0" "R G B vector of the progress bar background color" -seta hud_progressbar_armor_color "0 0.6 0" "R G B vector of the progress bar background color" -seta hud_progressbar_fuel_color "0.6 0.6 0" "R G B vector of the progress bar background color" - -seta hud_notify 0 "enable/disable this panel" -seta hud_notify_pos "0.1 0" "position of this base of the panel" -seta hud_notify_size "0.1 0.1" "size of this panel with all notifications on" -seta hud_notify_bg "" "if set to something else than \"\" = override default background" -seta hud_notify_bg_color "" "if set to something else than \"\" = override default panel background color" -seta hud_notify_bg_alpha "" "if set to something else than \"\" = override default panel background alpha" -seta hud_notify_bg_border "" "if set to something else than \"\" = override default size of border around the background" -seta hud_notify_bg_padding "" "if set to something else than \"\" = override default padding of contents from border" -seta hud_notify_print 0 "also con_notify print the messages that are shown on the notify panel" - -seta hud_timer 1 "enable/disable this panel" -seta hud_timer_pos "-0.213725 0" "position of this base of the panel" -seta hud_timer_size "0.212735 0.054427" "size of this panel" -seta hud_timer_increment 0 "show elapsed time instead of remaining time" -seta hud_timer_bg border "if set to something else than \"\" = override default background" -seta hud_timer_bg_color "" "if set to something else than \"\" = override default panel background color" -seta hud_timer_bg_alpha "" "if set to something else than \"\" = override default panel background alpha" -seta hud_timer_bg_border "" "if set to something else than \"\" = override default size of border around the background" -seta hud_timer_bg_padding "" "if set to something else than \"\" = override default padding of contents from border" - -seta hud_radar 1 "enable/disable this panel" -seta hud_radar_pos "0 0" "position of this base of the panel" -seta hud_radar_size "0.215687 0.266667" "size of this panel" -seta hud_radar_bg "" "if set to something else than \"\" = override default background" -seta hud_radar_bg_color "" "if set to something else than \"\" = override default panel background color" -seta hud_radar_bg_alpha "" "if set to something else than \"\" = override default panel background alpha" -seta hud_radar_bg_border "" "if set to something else than \"\" = override default size of border around the background" -seta hud_radar_bg_padding "" "if set to something else than \"\" = override default padding of contents from border" - -seta hud_score 1 "enable/disable this panel" -seta hud_score_pos "-0.225469 -0.084404" "position of this base of the panel" -seta hud_score_size "0.225469 0.075156" "size of this panel" -seta hud_score_bg "" "if set to something else than \"\" = override default background" -seta hud_score_bg_color "" "if set to something else than \"\" = override default panel background color" -seta hud_score_bg_alpha "" "if set to something else than \"\" = override default panel background alpha" -seta hud_score_bg_border "" "if set to something else than \"\" = override default size of border around the background" -seta hud_score_bg_padding "" "if set to something else than \"\" = override default padding of contents from border" - -seta hud_racetimer 1 "enable/disable this panel" -seta hud_racetimer_pos "-0.614706 0" "position of this base of the panel" -seta hud_racetimer_size "0.231373 0.077124" "size of this panel" -seta hud_racetimer_bg "" "if set to something else than \"\" = override default background" -seta hud_racetimer_bg_color "" "if set to something else than \"\" = override default panel background color" -seta hud_racetimer_bg_alpha "" "if set to something else than \"\" = override default panel background alpha" -seta hud_racetimer_bg_border "" "if set to something else than \"\" = override default size of border around the background" -seta hud_racetimer_bg_padding "" "if set to something else than \"\" = override default padding of contents from border" - -seta hud_vote 1 "enable/disable this panel" -seta hud_vote_pos "-0.321140 -0.268230" "position of this base of the panel" -seta hud_vote_size "0.320156 0.106719" "size of this panel" -seta hud_vote_alreadyvoted_alpha 0.75 "alpha of the vote dialog after you have voted" -seta hud_vote_bg "" "if set to something else than \"\" = override default background" -seta hud_vote_bg_color "" "if set to something else than \"\" = override default panel background color" -seta hud_vote_bg_alpha "" "if set to something else than \"\" = override default panel background alpha" -seta hud_vote_bg_border "" "if set to something else than \"\" = override default size of border around the background" -seta hud_vote_bg_padding "" "if set to something else than \"\" = override default padding of contents from border" - -seta hud_modicons 1 "enable/disable this panel" -seta hud_modicons_pos "-0.571569 -0.265625" "position of this base of the panel" -seta hud_modicons_size "0.145098 0.114105" "size of this panel" -seta hud_modicons_bg "" "if set to something else than \"\" = override default background" -seta hud_modicons_bg_color "" "if set to something else than \"\" = override default panel background color" -seta hud_modicons_bg_alpha "" "if set to something else than \"\" = override default panel background alpha" -seta hud_modicons_bg_border "" "if set to something else than \"\" = override default size of border around the background" -seta hud_modicons_bg_padding "" "if set to something else than \"\" = override default padding of contents from border" -seta hud_progressbar_nexball_color "0.7 0.1 0" "R G B vector of the progress bar background color" - -seta hud_pressedkeys 1 "enable/disable this panel, 1 = show only when spectating other players, 2 = show always" -seta hud_pressedkeys_pos "-0.571569 -0.265625" "position of this base of the panel" -seta hud_pressedkeys_size "0.145098 0.114105" "size of this panel" -seta hud_pressedkeys_bg "" "if set to something else than \"\" = override default background" -seta hud_pressedkeys_bg_color "" "if set to something else than \"\" = override default panel background color" -seta hud_pressedkeys_bg_alpha "" "if set to something else than \"\" = override default panel background alpha" -seta hud_pressedkeys_bg_border "" "if set to something else than \"\" = override default size of border around the background" -seta hud_pressedkeys_bg_padding "" "if set to something else than \"\" = override default padding of contents from border" +seta hud_configure_grid_x 0.01 "snap to X * vid_conwidth" +seta hud_configure_grid_y 0.01 "snap to Y * vid_conheight" +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" + +exec hud_wickedhud_default.cfg // scoreboard +seta scoreboard_columns default 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" @@ -1505,7 +1375,7 @@ set timelimit_increment 5 set timelimit_decrement 5 set timelimit_min 5 set timelimit_max 60 -alias extendmatchtime "sv_cmd rpn /timelimit timelimit timelimit_max timelimit timelimit_increment add bound def" +alias extendmatchtime "sv_cmd rpn /timelimit timelimit timelimit_max 0 timelimit when timelimit timelimit_increment add bound def" alias reducematchtime "sv_cmd rpn /timelimit timelimit timelimit_decrement sub timelimit_min timelimit bound def" alias endmatch "timelimit -1" @@ -1600,9 +1470,8 @@ seta hud_fontsize 11 seta hud_fontsize_spec 16 seta scr_centersize 11 seta hud_width 560 -// alias hud_font "loadfont user1 ${1},gfx/fallback ${2-}; loadfont user2 ${1}-big ${2-}; hud_columns_set" +// alias hud_font "loadfont user1 ${1},gfx/fallback ${2-}; loadfont user2 ${1}-big ${2-}; scoreboard_columns_set" alias sbar_font "set _requested_sbar_font \"${*}\"" -seta hud_columns default sbar_font gfx/vera-sans 8 12 16 24 32 seta hud_showbinds 1 "display actions / bound keys in the strings shown during the game. 0 displays only actions, 1 displays only bound keys, 2 displays both" seta hud_showbinds_limit 2 "maximum number of bound keys to show for an action. 0 for unlimited" @@ -1617,9 +1486,8 @@ set g_jump_grunt 0 "Do you make a grunting noise every time you jump? Is it the alias allready "sv_cmd allready" -// note: these cvars use weapon NUMBERS. Use the menu to edit this cvar, or look the numbers up in qcsrc/common/constants.qh. seta cl_weaponpriority "minstanex rocketlauncher nex grenadelauncher fireball hlac hagar seeker crylink campingrifle uzi electro tuba shotgun laser hook porto" "weapon priority list" -seta cl_weaponpriority_useforcycling 0 "when set, weapon cycling by the mouse wheel makes use of the weapon priority list" +seta cl_weaponpriority_useforcycling 0 "when set, weapon cycling by the mouse wheel makes use of the weapon priority list (the special value 2 uses the weapon ID list for cycling)" seta cl_weaponpriority0 "rocketlauncher grenadelauncher hagar seeker fireball" "use impulse 200 for prev gun from this list, 210 for best gun, 220 for next gun. Default value: explosives" seta cl_weaponpriority1 "minstanex nex crylink hlac electro laser" "use impulse 201 for prev gun from this list, 211 for best gun, 221 for next gun. Default value: energy" seta cl_weaponpriority2 "minstanex nex campingrifle" "use impulse 202 for prev gun from this list, 212 for best gun, 222 for next gun. Default value: hitscan exact" @@ -1634,14 +1502,6 @@ seta cl_weaponimpulsemode 0 "0: only cycle between currently usable weapons in w seta sv_status_privacy 1 "hide IP addresses from \"status\" replies shown to clients" - -seta hud_radar_background_alpha 0 "set to -1 to disable" -seta hud_radar_foreground_alpha 0.8 "alpha of the map" -seta hud_radar_scale 4096 "distance you can see on the team radar" -seta hud_radar_rotation 0 "rotation mode: you set what points up. 0 = player, 1 = west, 2 = south, 3 = east, 4 = north" -seta hud_radar_zoommode 0 "zoom mode: 0 = zoomed by default, 1 = zoomed when +zoom, 2 = always zoomed, 3 = always zoomed out" -alias hud_radar_rotate "toggle hud_radar_rotation 0 1 2 3 4" - set g_maplist_allow_hidden 0 "allow hidden maps to be, e.g., voted for and in the maplist" set g_maplist_allow_frustrating 0 "allow impossible maps to be, e.g., voted for and in the maplist (if set to 2, ONLY impossible maps are allowed)" @@ -1650,8 +1510,8 @@ seta g_start_delay 0 "delay before the game starts, so everyone can join; recomm alias ons_map "cl_cmd radar" // legacy alias alias radar "cl_cmd radar" -alias hud_columns_set "cl_cmd hud_columns_set $*" -alias hud_columns_help "cl_cmd hud_columns_help $*" +alias scoreboard_columns_set "cl_cmd scoreboard_columns_set $*" +alias scoreboard_columns_help "cl_cmd scoreboard_columns_help $*" alias _gl_flashblend_update_00 "gl_flashblend 1" alias _gl_flashblend_update_10 "gl_flashblend 0" @@ -1668,6 +1528,8 @@ exec turrets.cfg // must be at the bottom of this file: // alias for switching the teamselect menu alias menu_showteamselect "menu_cmd directmenu TeamSelect" +alias menu_showhudexit "menu_cmd directmenu HUDExit" +alias menu_showhudoptions "menu_cmd directpanelhudmenu $*" alias menu_sync "menu_cmd sync" bind f5 menu_showteamselect @@ -1835,6 +1697,7 @@ alias cl_hook_gamestart_rc alias cl_hook_gamestart_nexball alias cl_hook_gamestart_cts alias cl_hook_gameend +alias cl_hook_activeweapon alias _sv_hook_gamestart "set _sv_hook_gametype $1; _sv_hook_gamestart_stage2" alias _sv_hook_gamestart_stage2 "sv_hook_gamestart_all; sv_hook_gamestart_${_sv_hook_gametype}" @@ -1931,9 +1794,6 @@ collision_endposnudge 1 set cl_lerpanim_maxdelta_framegroups 0.05 // must be faster than fastest weapon refire set cl_lerpanim_maxdelta_server 0.1 // must be slower than slowest server controlled anim (e.g. animinfo stuff) -// FIXME temporary -set menu_font_size_snapping_fix 1 - // player ID seta _cl_userid "" "player ID (e.g. for tournaments)"