Merge remote-tracking branch 'origin/master' into morosophos/server-current4

[xonotic/xonotic-data.pk3dir.git] / _hud_common.cfg

diff --git a/_hud_common.cfg b/_hud_common.cfg
index cc2556852e04377a27134f0b2e0a167a99a75fb2..7c15eea22306280195898db4203ebb8490f1c375 100644 (file)
--- a/_hud_common.cfg
+++ b/_hud_common.cfg
@@ -4,6 +4,7 @@ seta hud_configure_teamcolorforced 0 "1 = force display of team colors in config
 seta hud_configure_checkcollisions 0 "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 hud_configure_vertical_lines 0.5 "list of space-separated intervals at which to draw a vertical line, useful for aligning panels; e.g. 0.5 draws a vertical line in the center, \"0.25 0.5 0.75\" draws a vertical line every quarter of the screen width"
 
 seta hud_cursormode 1 "handle mouse input in cursor mode when CSQC displays a cursor"
 
@@ -19,6 +20,8 @@ seta hud_colorset_kill_2 "3" "similar to above, but less important... OR, a high
 seta hud_colorset_kill_3 "4" "'good' or 'beneficial' text (you fragging someone, etc)"
 seta hud_colorset_background "7" "neutral/unimportant text"
 
+seta hud_speed_unit "1" "speed unit (1 = qu/s, 2 = m/s, 3 = km/h, 4 = mph, 5 = knots)"
+
 // general hud panel cvars (i.e. shouldn't be adjusted by a skin config)
 seta hud_panel_weapons          1 "enable this panel"
 seta hud_panel_ammo             1 "enable this panel"
@@ -106,7 +109,6 @@ seta hud_panel_engineinfo_framecounter_time "0.1" "time between framerate displa
 
 seta hud_panel_physics_acceleration_movingaverage 1 "use an averaging method for calculating acceleration instead of the real value"
 seta hud_panel_physics_update_interval 0.016 "how often (in seconds) numeric values get updated on screen"
-seta hud_panel_physics_speed_unit "1" "speed unit (1 = qu/s, 2 = m/s, 3 = km/h, 4 = mph, 5 = knots)"
 
 seta hud_panel_itemstime_progressbar_maxtime "30" "when left time is at least this amount, the status bar is full"
 seta hud_panel_itemstime_hidespawned "1" "if 1 hide an item from the panel when all the occurrences of it are available again; if 2 hide it when at least one occurrence is available again"
@@ -144,6 +146,7 @@ seta hud_panel_scoreboard_team_size_position 0 "where to show the team size (0 =
 seta hud_panel_scoreboard_playerid 0 "show player id (server entity number) next to player's name"
 seta hud_panel_scoreboard_playerid_prefix "#" "player id prefix"
 seta hud_panel_scoreboard_playerid_suffix " " "player id suffix"
+seta hud_panel_scoreboard_scores_per_round "0" "show average scores per round"
 
 seta hud_panel_scoreboard_accuracy_showdelay 2 "how long to delay displaying accuracy below the scoreboard if it's too far down"
 seta hud_panel_scoreboard_accuracy_showdelay_minpos 0.75 "delay displaying the accuracy panel only if its position is lower than this percentage of the screen height from the top"
@@ -157,7 +160,6 @@ seta _hud_panel_strafehud_demo "0" "strafehud changes angle during configure"
 seta hud_panel_strafehud_mode "0" "strafehud mode which controls whether the strafehud is centered at \"0\" = view angle, \"1\" = velocity angle"
 seta hud_panel_strafehud_range "90" "the angle range up to 360 degrees displayed on the strafehud, \"-1\" = current fov, \"0\" = dynamic (chooses the minimum range required to still see the whole area needed for accelerating)"
 seta hud_panel_strafehud_style "2" "\"0\" = no styling, \"1\" = progress bar style for the strafe bar, \"2\" = gradient for the strafe bar"
-seta hud_panel_strafehud_unit "1" "speed unit (1 = qu/s, 2 = m/s, 3 = km/h, 4 = mph, 5 = knots), length unit (1 = qu, 2 = m, 3 = km, 4 = mi, 5 = nmi)"
 seta hud_panel_strafehud_unit_show "1" "show units"
 seta hud_panel_strafehud_uncapped "0" "set to \"1\" to remove some safety restrictions, useful to set thinner indicator lines down to 1px or for trying out higher values for some performance degrading operations (warning: elements may turn invisible if too thin, other configurations may crash your game or look horribly ugly)"
 seta hud_panel_strafehud_bar_preaccel "1" "set to \"1\" to extend the acceleration zone by the strafe meter zone before full acceleration can be achieved"