edit wickedhud_default to match grid, rearrange layout a bit to make the notify panel...

diff --git a/gfx/hud/wickedhud/dock_small.tga b/gfx/hud/wickedhud/dock_small.tga
index a91dccaa6691fc6a34122ee73b61167128c81466..5135876d8af2610bfc2577cacf2a6099ca390194 100644 (file)
Binary files a/gfx/hud/wickedhud/dock_small.tga and b/gfx/hud/wickedhud/dock_small.tga differ

diff --git a/hud_wickedhud_default.cfg b/hud_wickedhud_default.cfg
index 4138a9f1c2b98ab4ec718f63d97754af3c1ab1e0..6cf08c1435b2edcfa88469bd98e13a2d6707d71f 100644 (file)
--- a/hud_wickedhud_default.cfg
+++ b/hud_wickedhud_default.cfg
@@ -1,4 +1,4 @@
-seta hud_skin wickedhud "skin folder where to look for images"
+seta hud_skin "wickedhud" "skin folder where to look for images"
 seta hud_bg "border" "default background for the panels, file must exist in gfx/hud/[skin name]/, 0 = disable background by default"
 seta hud_bg_color "0.875 0.375 0" "default background color for the panels, accepts \"shirt\" and \"pants\""
 seta hud_bg_color_team 0 "default setting for overriding panel color with team color in team games, 0.5 = less saturated"
@@ -21,8 +21,8 @@ seta hud_progressbar_fuel_color "0.6 0.6 0" "R G B vector of the progress bar ba
 seta hud_progressbar_nexball_color "0.7 0.1 0" "R G B vector of the progress bar background color"
 
 seta hud_weaponicons 1 "enable/disable this panel"
-seta hud_weaponicons_pos "-0.075000 0.083333" "position of this panel"
-seta hud_weaponicons_size "0.050000 0.500000" "size of this panel"
+seta hud_weaponicons_pos "0.930000 0.090000" "position of this panel"
+seta hud_weaponicons_size "0.040000 0.490000" "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 "border_weaponicons" "if set to something else than \"\" = override default background"
@@ -33,8 +33,8 @@ seta hud_weaponicons_bg_border "" "if set to something else than \"\" = override
 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.318750 -0.066667" "position of this panel"
-seta hud_inventory_size "0.087500 0.050000" "size of this panel"
+seta hud_inventory_pos "0.190000 0.930000" "position of this panel"
+seta hud_inventory_size "0.093750 0.050000" "size of this panel"
 seta hud_inventory_onlycurrent 1 "1 = show only current ammo type"
 seta hud_inventory_bg "border_inventory" "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"
@@ -44,8 +44,8 @@ seta hud_inventory_bg_border "" "if set to something else than \"\" = override d
 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.400000 0.141667" "position of this panel"
-seta hud_powerups_size "0.200000 0.041667" "size of this panel"
+seta hud_powerups_pos "0.400000 0.130000" "position of this panel"
+seta hud_powerups_size "0.200000 0.050000" "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 "border_powerups" "if set to something else than \"\" = override default background"
@@ -56,8 +56,8 @@ seta hud_powerups_bg_border "" "if set to something else than \"\" = override de
 seta hud_powerups_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
 
 seta hud_healtharmor 1 "enable/disable this panel, 2 = combined health/armor display"
-seta hud_healtharmor_pos "-0.606250 -0.075000" "position of this panel"
-seta hud_healtharmor_size "0.268750 0.058333" "size of this panel"
+seta hud_healtharmor_pos "0.300000 0.930000" "position of this panel"
+seta hud_healtharmor_size "0.240000 0.050000" "size of this panel"
 seta hud_healtharmor_flip 0 "flip health/armor positions"
 seta hud_healtharmor_mirror 0 "mirror alignment of panel items"
 seta hud_healtharmor_bg "border_healtharmor" "if set to something else than \"\" = override default background"
@@ -68,8 +68,8 @@ seta hud_healtharmor_bg_border "" "if set to something else than \"\" = override
 seta hud_healtharmor_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
 
 seta hud_notify 1 "enable/disable this panel"
-seta hud_notify_pos "-0.206250 -0.266667" "position of this base of the panel"
-seta hud_notify_size "0.181250 0.183333" "size of this panel with all notifications on"
+seta hud_notify_pos "0.660000 0.600000" "position of this base of the panel"
+seta hud_notify_size "0.320000 0.330000" "size of this panel with all notifications on"
 seta hud_notify_bg "border_modicons" "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_color_team "" "override panel color with team color in team based games"
@@ -83,19 +83,19 @@ seta hud_notify_fadetime 3 "fade out time"
 seta hud_notify_info_top 1 "show info messages at top of panel"
 
 seta hud_timer 1 "enable/disable this panel"
-seta hud_timer_pos "-0.125000 0.016667" "position of this base of the panel"
-seta hud_timer_size "0.112500 0.033333" "size of this panel"
+seta hud_timer_pos "0.880000 0.015000" "position of this base of the panel"
+seta hud_timer_size "0.100000 0.032520" "size of this panel"
 seta hud_timer_increment 0 "show elapsed time instead of remaining time"
 seta hud_timer_bg "border_timer" "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_color_team "" "override panel color with team color in team based games"
 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 "-1" "if set to something else than \"\" = override default padding of contents from border"
+seta hud_timer_bg_padding "0" "if set to something else than \"\" = override default padding of contents from border"
 
 seta hud_radar 2 "enable/disable this panel, 2 = also enable in non-teambased gamemodes"
-seta hud_radar_pos "0.025000 0.091667" "position of this base of the panel"
-seta hud_radar_size "0.175000 0.216667" "size of this panel"
+seta hud_radar_pos "0.030000 0.020000" "position of this base of the panel"
+seta hud_radar_size "0.190000 0.230000" "size of this panel"
 seta hud_radar_bg "border_radar" "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_color_team "" "override panel color with team color in team based games"
@@ -109,8 +109,8 @@ seta hud_radar_zoommode 0   "zoom mode: 0 = zoomed by default, 1 = zoomed when +zo
 alias hud_radar_rotate "toggle hud_radar_rotation 0 1 2 3 4"
 
 seta hud_score 1 "enable/disable this panel"
-seta hud_score_pos "0.237500 -0.066667" "position of this base of the panel"
-seta hud_score_size "0.137500 0.050000" "size of this panel"
+seta hud_score_pos "0.020000 0.930000" "position of this base of the panel"
+seta hud_score_size "0.150000 0.050000" "size of this panel"
 seta hud_score_bg "border_score" "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_color_team "" "override panel color with team color in team based games"
@@ -119,8 +119,8 @@ seta hud_score_bg_border "" "if set to something else than \"\" = override defau
 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.350000 0.016667" "position of this base of the panel"
-seta hud_racetimer_size "0.300000 0.100000" "size of this panel"
+seta hud_racetimer_pos "0.360000 0.010000" "position of this base of the panel"
+seta hud_racetimer_size "0.280000 0.093333" "size of this panel"
 seta hud_racetimer_bg 0 "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_color_team "" "override panel color with team color in team based games"
@@ -129,8 +129,8 @@ seta hud_racetimer_bg_border "" "if set to something else than \"\" = override d
 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.375000 -0.200000" "position of this base of the panel"
-seta hud_vote_size "0.250000 0.083333" "size of this panel"
+seta hud_vote_pos "0.400000 0.800000" "position of this base of the panel"
+seta hud_vote_size "0.240000 0.080000" "size of this panel"
 seta hud_vote_alreadyvoted_alpha 0.75 "alpha of the vote dialog after you have voted"
 seta hud_vote_bg "border_modicons" "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"
@@ -140,8 +140,8 @@ seta hud_vote_bg_border "" "if set to something else than \"\" = override defaul
 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.356250 -0.200000" "position of this base of the panel"
-seta hud_modicons_size "0.125000 0.083333" "size of this panel"
+seta hud_modicons_pos "0.560000 0.930000" "position of this base of the panel"
+seta hud_modicons_size "0.075000 0.050000" "size of this panel"
 seta hud_modicons_bg "border_modicons" "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_color_team "" "override panel color with team color in team based games"
@@ -150,8 +150,8 @@ seta hud_modicons_bg_border "" "if set to something else than \"\" = override de
 seta hud_modicons_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
 
 seta hud_pressedkeys 1 "enable/disable this panel, 1 = show only when spectating other players, 2 = show always"
-seta hud_pressedkeys_pos "0.431250 -0.325000" "position of this base of the panel"
-seta hud_pressedkeys_size "0.131250 0.100000" "size of this panel"
+seta hud_pressedkeys_pos "0.460000 0.730000" "position of this base of the panel"
+seta hud_pressedkeys_size "0.080000 0.062912" "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_color_team "" "override panel color with team color in team based games"
@@ -160,8 +160,8 @@ seta hud_pressedkeys_bg_border "" "if set to something else than \"\" = override
 seta hud_pressedkeys_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
 
 seta hud_chat 1 "enable/disable this panel"
-seta hud_chat_pos "0.025000 -0.200000" "position of this base of the panel"
-seta hud_chat_size "0.331250 0.083333" "size of this panel"
+seta hud_chat_pos "0.020000 0.790000" "position of this base of the panel"
+seta hud_chat_size "0.360000 0.100000" "size of this panel"
 seta hud_chat_bg "" "if set to something else than \"\" = override default background"
 seta hud_chat_bg_color "" "if set to something else than \"\" = override default panel background color"
 seta hud_chat_bg_color_team "" "override panel color with team color in team based games"
@@ -169,9 +169,9 @@ seta hud_chat_bg_alpha 0 "if set to something else than \"\" = override default
 seta hud_chat_bg_border "" "if set to something else than \"\" = override default size of border around the background"
 seta hud_chat_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
 
-seta hud_engineinfo 0 "enable/disable this panel
-seta hud_engineinfo_pos "-0.131250 -0.050000"" "position of this base of the panel"
-seta hud_engineinfo_size "0.131250 0.041667" "size of this panel"
+seta hud_engineinfo 1 "enable/disable this panel
+seta hud_engineinfo_pos "0.900000 0.960000" "position of this base of the panel"
+seta hud_engineinfo_size "0.100000 0.033333" "size of this panel"
 seta hud_engineinfo_bg "" "if set to something else than \"\" = override default background"
 seta hud_engineinfo_bg_color "" "if set to something else than \"\" = override default panel background color"
 seta hud_engineinfo_bg_color_team "" "override panel color with team color in team based games"
@@ -182,4 +182,4 @@ seta hud_engineinfo_framecounter_time 1 "time between framerate display updates,
 seta hud_engineinfo_framecounter_decimals 0 "amount of decimals to show"
 seta hud_engineinfo_framecounter_exponentialmovingaverage 1 "use an averaging method for calculating fps instead of counting frametime like engine does"
 seta hud_engineinfo_framecounter_exponentialmovingaverage_new_weight 0.1 "weight of latest data point"
-seta hud_engineinfo_framecounter_exponentialmovingaverage_instantupdate_change_threshold 0.5 "treshold for fps change when to update instantly, to make big fps changes update faster"
+seta hud_engineinfo_framecounter_exponentialmovingaverage_instantupdate_change_threshold 0.5 "threshold for fps change when to update instantly, to make big fps changes update faster"

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index f7deec4fe145480f161cc63587e360e3acaad880..c5871cc502dc6005ce5499767302811f064bff95 100644 (file)
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -570,7 +570,7 @@ void HUD_Panel_ExportCfg(string cfgname)
                fputs(fh, strcat("seta hud_bg_alpha \"", cvar_string("hud_bg_alpha"), "\"", "\n"));
                fputs(fh, strcat("seta hud_bg_border \"", cvar_string("hud_bg_border"), "\"", "\n"));
                fputs(fh, strcat("seta hud_bg_padding \"", cvar_string("hud_bg_padding"), "\"", "\n"));
-               fputs(fh, strcat("seta hud_fg_alpha) \"", cvar_string("hud_fg_alpha"), "\"", "\n"));
+               fputs(fh, strcat("seta hud_fg_alpha \"", cvar_string("hud_fg_alpha"), "\"", "\n"));
                fputs(fh, "\n");
 
                fputs(fh, strcat("seta hud_dock \"", cvar_string("hud_dock"), "\"", "\n"));