Move some cvars, cleanup finished TODO's, and ready the new HUD for inclusion

diff --git a/data/defaultVT.cfg b/data/defaultVT.cfg
index 0439d806c09b8294088a6b1ad62d20effe493ffe..bd80660977cc860494fd214e8e7651e5434ff8fc 100644 (file)
--- a/data/defaultVT.cfg
+++ b/data/defaultVT.cfg
@@ -1239,43 +1239,6 @@ seta hud_shownames_antioverlap_distance 125 "2d distance to other tag after whic
 seta hud_shownames_offset 52 "offset (along z-axis) tag from player origin by this many units"\r
 seta hud_shownames_offset_healthsize 0.5 "offset (along z-axis) tag from player origin by this many units, based on player size"\r
 \r
-sbar_info_pos 50\r
-seta sbar_hudselector 1 "enables the HUD"\r
-seta sbar_alpha_bg 0.8 "alpha value of the HUD background"\r
-seta sbar_alpha_fg 1 "alpha value of the HUD foreground items"\r
-seta sbar_border_thickness 1 "scoreboard border thickness"\r
-seta sbar_color_bg "0 0.25 0.75" "default color of the HUD background"\r
-seta sbar_color_bg_team 1 "team color multiplier of the HUD background"\r
-seta sbar_scoreboard_offset 100 "scoreboard vertical position"\r
-seta sbar_scoreboard_alpha_bg 0.6 "scoreboard background alpha"\r
-seta sbar_scoreboard_alpha_fg 1 "scoreboard foreground alpha"\r
-seta sbar_scoreboard_alpha_name 0.9 "alpha of player text in scoreboard list other than self"\r
-seta sbar_scoreboard_alpha_name_self 1 "alpha of player text in scoreboard list of self" \r
-seta sbar_scoreboard_fadeinspeed 10 "speed at which scoreboard fades in, higher is faster (0 = instant)"\r
-seta sbar_scoreboard_fadeoutspeed 5 "speed at which scoreboard fades out, higher is faster (0 = instant)"\r
-seta sbar_scoreboard_highlight 1 "enable highlighting for rows and columns in the scoreboard"\r
-seta sbar_scoreboard_highlight_alpha 0.10 "highlight alpha value (depends on sbar_scoreboard_highlight 1)"\r
-seta sbar_scoreboard_highlight_alpha_self 0.25 "self highlight alpha value"\r
-seta sbar_stomachboard_color1 "0 0.5 0" "RGB color of the stomach board highlights when showing self"\r
-seta sbar_stomachboard_color2 "0.5 0.5 0" "RGB color of the stomach board highlights when showing team mate predators"\r
-seta sbar_stomachboard_color3 "0.5 0 0" "RGB color of the stomach board highlights when showing enemy predators"\r
-seta sbar_stomachboard_status_alpha 0.75 "alpha of the stomach board status"\r
-seta sbar_stomachboard_status_fade 1 "color fading speed of the stomach board status"\r
-seta sbar_stomachboard_highlight_alpha 0.25 "alpha of the stomach board highlight"\r
-seta sbar_timer_increment 0 "1 = show elapsed time on the timer"\r
-seta sbar_ring1 1 "enables the first HUD ring"\r
-seta sbar_ring1_scale 110 "scale of the first HUD ring"\r
-seta sbar_ring1_text_scale 12 "scale of the text on the first HUD ring"\r
-seta sbar_ring1_alpha 0.75 "alpha of the first HUD ring"\r
-seta sbar_ring2 1 "enables the second HUD ring"\r
-seta sbar_ring2_scale 80 "scale of the second HUD ring"\r
-seta sbar_ring2_text_scale 10 "scale of the text on the second HUD ring"\r
-seta sbar_ring2_alpha 0.75 "alpha of the second HUD ring"\r
-seta sbar_vote_alreadyvoted_alpha 0.75 "alpha of the vote dialog after you have voted"\r
-seta sbar_portrait 1 "enables portraits"\r
-seta sbar_portrait_time 5 "how long a portrait lasts on the screen"\r
-seta sbar_portrait_fade 0.1 "amount of time fading the portrait takes from total time"\r
-\r
 // for menu server list (eventually make them have engine support?)\r
 seta menu_slist_showfull 1 "show servers even if they are full and have no slots to join"\r
 seta menu_slist_showempty 1 "show servers even if they are no empty and have no opponents to play against"\r

diff --git a/data/hudVT.cfg b/data/hudVT.cfg
index 920e77bbfff3d51913943b466419b19b3248f180..b9848dcf24606b97ac42d58956ca0b7dbc071e9a 100644 (file)
--- a/data/hudVT.cfg
+++ b/data/hudVT.cfg
@@ -100,3 +100,46 @@ set hud_item_preylist_health_icon_length 0.05
 set hud_item_preylist_health_text_location 0.9\r
 set hud_item_preylist_health_text_length 0.1\r
 set hud_item_preylist_items 9\r
+\r
+// Other HUD stuff below\r
+\r
+sbar_info_pos 50\r
+seta sbar_hudselector 1 "enables the HUD"\r
+seta sbar_alpha_bg 0.8 "alpha value of the HUD background"\r
+seta sbar_alpha_fg 1 "alpha value of the HUD foreground items"\r
+seta sbar_border_thickness 1 "scoreboard border thickness"\r
+seta sbar_color_bg "0 0.25 0.75" "default color of the HUD background"\r
+seta sbar_color_bg_team 1 "team color multiplier of the HUD background"\r
+seta sbar_timer_increment 0 "1 = show elapsed time on the timer"\r
+seta sbar_vote_alreadyvoted_alpha 0.75 "alpha of the vote dialog after you have voted"\r
+\r
+seta sbar_scoreboard_offset 100 "scoreboard vertical position"\r
+seta sbar_scoreboard_alpha_bg 0.6 "scoreboard background alpha"\r
+seta sbar_scoreboard_alpha_fg 1 "scoreboard foreground alpha"\r
+seta sbar_scoreboard_alpha_name 0.9 "alpha of player text in scoreboard list other than self"\r
+seta sbar_scoreboard_alpha_name_self 1 "alpha of player text in scoreboard list of self" \r
+seta sbar_scoreboard_fadeinspeed 10 "speed at which scoreboard fades in, higher is faster (0 = instant)"\r
+seta sbar_scoreboard_fadeoutspeed 5 "speed at which scoreboard fades out, higher is faster (0 = instant)"\r
+seta sbar_scoreboard_highlight 1 "enable highlighting for rows and columns in the scoreboard"\r
+seta sbar_scoreboard_highlight_alpha 0.10 "highlight alpha value (depends on sbar_scoreboard_highlight 1)"\r
+seta sbar_scoreboard_highlight_alpha_self 0.25 "self highlight alpha value"\r
+\r
+seta sbar_stomachboard_color1 "0 0.5 0" "RGB color of the stomach board highlights when showing self"\r
+seta sbar_stomachboard_color2 "0.5 0.5 0" "RGB color of the stomach board highlights when showing team mate predators"\r
+seta sbar_stomachboard_color3 "0.5 0 0" "RGB color of the stomach board highlights when showing enemy predators"\r
+seta sbar_stomachboard_status_alpha 0.75 "alpha of the stomach board status"\r
+seta sbar_stomachboard_status_fade 1 "color fading speed of the stomach board status"\r
+seta sbar_stomachboard_highlight_alpha 0.25 "alpha of the stomach board highlight"\r
+\r
+seta sbar_ring1 1 "enables the first HUD ring"\r
+seta sbar_ring1_scale 110 "scale of the first HUD ring"\r
+seta sbar_ring1_text_scale 12 "scale of the text on the first HUD ring"\r
+seta sbar_ring1_alpha 0.75 "alpha of the first HUD ring"\r
+seta sbar_ring2 1 "enables the second HUD ring"\r
+seta sbar_ring2_scale 80 "scale of the second HUD ring"\r
+seta sbar_ring2_text_scale 10 "scale of the text on the second HUD ring"\r
+seta sbar_ring2_alpha 0.75 "alpha of the second HUD ring"\r
+\r
+seta sbar_portrait 1 "enables portraits"\r
+seta sbar_portrait_time 5 "how long a portrait lasts on the screen"\r
+seta sbar_portrait_fade 0.1 "amount of time fading the portrait takes from total time"\r

diff --git a/docs/TODO.txt b/docs/TODO.txt
index cc4c5d80c30df8f2750833aa706c6874840f3341..a9172ea2a922589dcf183647464bd8627fb91c12 100644 (file)
--- a/docs/TODO.txt
+++ b/docs/TODO.txt
@@ -260,11 +260,7 @@
 \r
 - 0.8: Tweak balance so that less damage is dealt and vore lasts more\r
 \r
-- 0.8 BUG: When inside the stomach, the "Respawning in" field inside the scoreboard shouldn't keep resetting over and over again, and instead say something else\r
-\r
-- 0.8 BUG (new HUD): HUD scores don't show any more because of the new positioning of DrawXNum, fix it\r
-\r
-- 0.8 (new HUD): Remove all position vectors left (topright, bottom, scorepos, etc)
+- 0.8 BUG: When inside the stomach, the "Respawning in" field inside the scoreboard shouldn't keep resetting over and over again, and instead say something else
 \r
 - 0.8: Smart hint system detecting gameplay errors client-side\r
 \r