X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=defaultXonotic.cfg;fp=defaultXonotic.cfg;h=a6d5d6bd147d7c12f68a01d4e74325e9f2b430eb;hb=44980a65baf9b6a551b45de0834cb1f235398052;hp=35abf9dbef84a134c9deabf87f269cfa7aa9958a;hpb=ac92712d44f753323e53f7196525a3b0786b5ce3;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 35abf9dbe..a6d5d6bd1 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -901,7 +901,7 @@ alias +zoom +button4 alias -zoom -button4 alias +crouch +button5 alias -crouch -button5 -alias weapnext "_weapnext_${_supports_weaponpriority}${sbar_hudselector}${cl_weaponpriority_useforcycling}" +alias weapnext "_weapnext_${_supports_weaponpriority}${hud_hudselector}${cl_weaponpriority_useforcycling}" alias _weapnext_000 "impulse 10" alias _weapnext_001 "impulse 10" alias _weapnext_010 "impulse 10" @@ -915,7 +915,7 @@ alias _weapnext_111 "impulse 15" alias _weapnext_120 "impulse 18" alias _weapnext_121 "impulse 15" alias weaplast "impulse 11" -alias weapprev "_weapprev_${_supports_weaponpriority}${sbar_hudselector}${cl_weaponpriority_useforcycling}" +alias weapprev "_weapprev_${_supports_weaponpriority}${hud_hudselector}${cl_weaponpriority_useforcycling}" alias _weapprev_000 "impulse 12" alias _weapprev_001 "impulse 12" alias _weapprev_010 "impulse 12" @@ -1320,34 +1320,120 @@ con_chatwidth 0.6 con_notifysize 10 con_notifyalign 0 -sbar_info_pos 50 -seta sbar_alpha_bg 0.8 "alpha value of the HUD background" -seta sbar_alpha_fg 1 "alpha value of the HUD foreground items" -seta sbar_border_thickness 1 "scoreboard border thickness" -seta sbar_accuracy_border_thickness 1 "accuracy stats border thickness" -seta sbar_accuracy_doublerows 0 "use two rows instead of one" -seta sbar_accuracy_yellow 40 "percentage at which the accuracy color is yellow" -seta sbar_accuracy 1 "0 = no weapon accuracy stats panel on scoreboard" -seta sbar_accuracy_hud 1 "0 = no weapon accuracy bar on the weapon icons" -seta sbar_color_bg_r 0 "red color component of the HUD background" -seta sbar_color_bg_g 0.25 "green color component of the HUD background" -seta sbar_color_bg_b 0.17 "blue color component of the HUD background" -seta sbar_color_bg_team 0.5 "team color multiplier of the HUD background" -seta sbar_scoreboard_alpha_bg 0.6 "scoreboard background alpha" -seta sbar_scoreboard_alpha_fg 1 "scoreboard foreground alpha" -seta sbar_scoreboard_alpha_name 0.9 "alpha of player text in scoreboard list other than self" -seta sbar_scoreboard_alpha_name_self 1 "alpha of player text in scoreboard list of self" -seta sbar_scoreboard_fadeinspeed 10 "speed at which scoreboard fades in, higher is faster (0 = instant)" -seta sbar_scoreboard_fadeoutspeed 5 "speed at which scoreboard fades out, higher is faster (0 = instant)" -seta sbar_scoreboard_highlight 1 "enable highlighting for rows and columns in the scoreboard" -seta sbar_scoreboard_highlight_alpha 0.10 "highlight alpha value (depends on sbar_scoreboard_highlight 1)" -seta sbar_scoreboard_highlight_alpha_self 0.25 "self highlight alpha value" -seta sbar_hudselector 1 "0 = health/armor positions flipped, 1 = default hud layout, 2 = combined health and armor display" -seta sbar_showcurrentammo 0 "0 = show all ammo types, 1 = show only the ammo type of the current weapon" -seta sbar_showweaponicons 1 "1 = show icons of weapons that you have" -seta sbar_timer_increment 0 "1 = show elapsed time on the timer" -seta sbar_timer_scale 1 "scale multiplier of the timer" -seta sbar_vote_alreadyvoted_alpha 0.75 "alpha of the vote dialog after you have voted" +// hud variables +set _hud_configure 0 +seta hud_color "0 0.7 0.8" "color of the hud" +seta hud_accuracy_yellow 40 "percentage at which the accuracy color is yellow" +seta hud_alpha_bg 0.8 "alpha of the background" +seta hud_alpha_fg 1 "alpha of the foreground" +seta hud_progressbar_alpha "0.5" "alpha of progressbars" + +seta sbar_info_pos 50 + +seta hud_hudselector 1 "0 = health/armor positions flipped, 1 = default hud layout, 2 = combined health and armor display" +seta hud_showcurrentammo 0 "0 = show all ammo types, 1 = show only the ammo type of the current weapon" + +seta hud_weaponicons 1 "enable/disable this panel" +seta hud_weaponicons_pos "207.5 -74.5" "position of this panel" +seta hud_weaponicons_size "230 30" "size of this panel" +seta hud_weaponicons_bg 1 "enable/disable the background of this panel" +seta hud_weaponicons_marigin 30 "size of marigin from the background edges"" +seta hud_weaponicons_number 1 "show number of weapon" +seta hud_weaponicons_accuracybar_height 3 "height of accuracy bar" +seta hud_weaponicons_color "" "optional R G B vector of the weaponicons background color, otherwise use hud default" + +seta hud_inventory 1 "enable/disable this panel" +seta hud_inventory_pos "0 -60" "position of this panel" +seta hud_inventory_size "200 60" "size of this panel" +seta hud_inventory_bg 1 "enable/disable the background of this panel" +seta hud_inventory_marigin 30 "size of marigin from the background edges" +seta hud_inventory_color "" "optional R G B vector of the panel background color, otherwise use hud default" + +seta hud_powerups 0 "enable/disable this panel" +seta hud_powerups_pos "0 -90" "position of this panel" +seta hud_powerups_size "240 90" "size of this panel" +seta hud_powerups_bg 1 "enable/disable the background of this panel" +seta hud_powerups_marigin 30 "size of marigin from the background edges" +seta hud_powerups_color "" "optional R G B vector of the panel background color, otherwise use hud default" + +seta hud_healtharmor 1 "enable/disable this panel" +seta hud_healtharmor_pos "207.5 -37" "position of this panel" +seta hud_healtharmor_size "230 37" "size of this panel" +seta hud_healtharmor_bg 1 "enable/disable the background of this panel" +seta hud_healtharmor_marigin 30 "size of marigin from the background edges" +seta hud_healtharmor_color "" "optional R G B vector of the panel background color, otherwise use hud default" +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_notify 0 "enable/disable this panel" +seta hud_notify_pos "-300 -37.5" "position of this base of the panel" +seta hud_notify_size "200 37.5" "size of this panel with all notifications on" +seta hud_notify_bg 1 "enable/disable the background of this panel" +seta hud_notify_marigin 30 "size of marigin from the background edges" +seta hud_notify_color "" "optional R G B vector of the panel background color, otherwise use hud default" + +seta hud_timer 1 "enable/disable this panel" +seta hud_timer_pos "-180 0" "position of this base of the panel" +seta hud_timer_size "180 90" "size of this panel" +seta hud_timer_bg 1 "enable/disable the background of this panel" +seta hud_timer_marigin 30 "size of marigin from the background edges" +seta hud_timer_color "" "optional R G B vector of the panel background color, otherwise use hud default" +seta hud_timer_increment "show elapsed time instead of remaining time" + +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 "230 170" "size of this panel" +seta hud_radar_bg 1 "enable/disable the background of this panel" +seta hud_radar_marigin 30 "size of marigin from the background edges" +seta hud_radar_color "" "optional R G B vector of the panel background color, otherwise use hud default" + +seta hud_score 0 "enable/disable this panel" +seta hud_score_pos "-300 -37.5" "position of this base of the panel" +seta hud_score_size "200 37.5" "size of this panel" +seta hud_score_bg 1 "enable/disable the background of this panel" +seta hud_score_marigin 30 "size of marigin from the background edges" +seta hud_score_color "" "optional R G B vector of the panel background color, otherwise use hud default" + +seta hud_racetimer 0 "enable/disable this panel" +seta hud_racetimer_pos "-300 -37.5" "position of this base of the panel" +seta hud_racetimer_size "200 37.5" "size of this panel" +seta hud_racetimer_bg 0 "enable/disable the background of this panel" +seta hud_racetimer_marigin 30 "size of marigin from the background edges" +seta hud_racetimer_color "" "optional R G B vector of the panel background color, otherwise use hud default" + +seta hud_vote 0 "enable/disable this panel" +seta hud_vote_pos "-300 -37.5" "position of this base of the panel" +seta hud_vote_size "200 37.5" "size of this panel" +seta hud_vote_bg 0 "enable/disable the background of this panel" +seta hud_vote_marigin 30 "size of marigin from the background edges" +seta hud_vote_color "" "optional R G B vector of the panel background color, otherwise use hud default" +seta hud_vote_alreadyvoted_alpha 0.75 "alpha of the vote dialog after you have voted" + +seta hud_pressedkeys 0 "enable/disable this panel" +seta hud_pressedkeys_pos "-300 -37.5" "position of this base of the panel" +seta hud_pressedkeys_size "200 37.5" "size of this panel" +seta hud_pressedkeys_bg 0 "enable/disable the background of this panel" +seta hud_pressedkeys_marigin 30 "size of marigin from the background edges" +seta hud_pressedkeys_color "" "optional R G B vector of the panel background color, otherwise use hud default" + +// scoreboard +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 1 "0 = no weapon accuracy stats panel on scoreboard" +seta scoreboard_color_bg_r 0 "red color component of the HUD background" +seta scoreboard_color_bg_g 0.25 "green color component of the HUD background" +seta scoreboard_color_bg_b 0.17 "blue color component of the HUD background" +seta scoreboard_color_bg_team 0.5 "team color multiplier of the HUD background" +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_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" +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" // 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" @@ -1448,17 +1534,17 @@ set sv_maxidle_spectatorsareidle 0 // CTF capture limit placeholder cvar set capturelimit 0 -// sbar: font size -seta sbar_fontsize 11 -seta sbar_fontsize_spec 16 +// hud: font size +seta hud_fontsize 11 +seta hud_fontsize_spec 16 seta scr_centersize 11 -seta sbar_width 560 -// alias sbar_font "loadfont user1 ${1},gfx/fallback ${2-}; loadfont user2 ${1}-big ${2-}; sbar_columns_set" +seta hud_width 560 +// alias hud_font "loadfont user1 ${1},gfx/fallback ${2-}; loadfont user2 ${1}-big ${2-}; hud_columns_set" alias sbar_font "set _requested_sbar_font \"${*}\"" -seta sbar_columns default +seta hud_columns default sbar_font gfx/vera-sans 8 12 16 24 32 -seta sbar_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 sbar_showbinds_limit 2 "maximum number of bound keys to show for an action. 0 for unlimited" +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" // these entities are not referenced by anything directly, they just represent // teams and are found by find() when needed @@ -1506,8 +1592,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 sbar_columns_set "cl_cmd sbar_columns_set $*" -alias sbar_columns_help "cl_cmd sbar_columns_help $*" +alias hud_columns_set "cl_cmd hud_columns_set $*" +alias hud_columns_help "cl_cmd hud_columns_help $*" alias _gl_flashblend_update_00 "gl_flashblend 1" alias _gl_flashblend_update_10 "gl_flashblend 0"