diff --git a/resource/ui/disguisestatuspanel.res b/resource/ui/disguisestatuspanel.res index 95581de..cbad971 100644 --- a/resource/ui/disguisestatuspanel.res +++ b/resource/ui/disguisestatuspanel.res @@ -102,10 +102,10 @@ { "ControlName" "EditablePanel" "fieldName" "SpectatorGUIHealth" - "xpos" "12" + "xpos" "15" "ypos" "29" - "wide" "50" - "tall" "50" + "wide" "32" + "tall" "32" "visible" "1" "enabled" "1" "HealthBonusPosAdj" "10" diff --git a/resource/ui/hudmatchstatus.res b/resource/ui/hudmatchstatus.res index 1d1c078..80624e0 100644 --- a/resource/ui/hudmatchstatus.res +++ b/resource/ui/hudmatchstatus.res @@ -25,7 +25,7 @@ if_match { "visible" "1" - "wide" "320" + "wide" "620" "tall" "25" } @@ -65,12 +65,12 @@ { "ControlName" "CTFImagePanel" "fieldName" "MainBG" - "xpos" "0" + "xpos" "100" "ypos" "0" "zpos" "2" - "wide" "320" - "tall" "25" - "visible" "1" + "wide" "460" + "tall" "22" + "visible" "0" "enabled" "1" "image" "../hud/color_panel_brown" "scaleImage" "1" @@ -356,7 +356,6 @@ "xpos" "c-55" "wide" "130" "ypos" "-2" - "ypos_minmode" "-4" "delta_item_x" "35" "delta_item_start_y" "12" "delta_item_end_y" "50" @@ -373,7 +372,7 @@ "font" "hudfont18" "fgcolor" "colorwhite" "xpos" "21" - "ypos" "2" + "ypos" "0" "zpos" "3" "wide" "68" "tall" "31" @@ -390,270 +389,179 @@ } "TeamStatus" { - "ControlName" "CTFTeamStatus" - "fieldName" "TeamStatus" - "xpos" "0" - "ypos" "5" - "zpos" "2" - "wide" "f0" - "tall" "75" - "visible" "1" - "enabled" "1" - + "ControlName" "CTFTeamStatus" + "fieldName" "TeamStatus" + "xpos" "0" + "ypos" "3" + "zpos" "2" + "wide" "f0" + "tall" "25" + "visible" "1" + "enabled" "1" - "max_size" "19" + "max_size" "19" - "6v6_gap" "4" - "12v12_gap" "1" + "6v6_gap" "1" + "12v12_gap" "1" - "team1_grow_dir" "west" - "team1_base_x" "c-25" - "team1_max_expand" "133" + "team1_grow_dir" "west" + "team1_base_x" "c-45" + "team1_max_expand" "200" - "team2_grow_dir" "east" - "team2_base_x" "c26" - "team2_max_expand" "133" + "team2_grow_dir" "east" + "team2_base_x" "c47" + "team2_max_expand" "200" "playerpanels_kv" { - "visible" "0" - "wide" "25" - "tall" "50" - "zpos" "1" + "visible" "0" + "wide" "f0" + "tall" "f0" + "zpos" "1" + "proportionaltoparent" "1" + + "color_portrait_bg_red" "colorred" + "color_portrait_bg_blue" "colorblu" + "color_portrait_bg_red_dead" "colordarkred" + "color_portrait_bg_blue_dead" "colordarkblu" + "color_bar_health_high" "75 200 25 255" + "color_bar_health_med" "255 200 0 255" + "percentage_health_med" "0.6" + "color_bar_health_low" "255 20 0 255" + "percentage_health_low" "0.3" + "color_portrait_blend_dead_red" "255 255 255 255" + "color_portrait_blend_dead_blue" "255 255 255 255" - "color_portrait_bg_red" "colorred" - "color_portrait_bg_blue" "colorblu" - - "color_portrait_bg_red_dead" "colordarkred" - "color_portrait_bg_blue_dead" "colordarkblu" - - "color_bar_health_high" "84 191 58 255" - - "color_bar_health_med" "191 183 58 255" - "color_bar_health_low" "191 58 58 255" - - "percentage_health_med" "0.6" - "percentage_health_low" "0.3" - - "color_portrait_blend_dead_red" "255 255 255 255" - "color_portrait_blend_dead_blue" "255 255 255 255" - - "playername" - { - "ControlName" "CExLabel" - "fieldName" "playername" - "font" "DefaultVerySmall" - "xpos" "5" - "ypos" "24" - "zpos" "5" - "wide" "50" - "tall" "8" - "autoResize" "0" - "pinCorner" "0" - "visible" "0" - } - "classimage" { - "ControlName" "CTFClassImage" - "fieldName" "classimage" - "xpos" "cs-0.5" - "ypos" "0" - "zpos" "3" - "wide" "19" - "tall" "19" - "visible" "1" - "enabled" "1" - "image" "../hud/class_scoutred" - "scaleImage" "1" - "proportionaltoparent" "1" + "ControlName" "CTFClassImage" + "fieldName" "classimage" + "xpos" "cs-0.5" + "ypos" "0" + "zpos" "5" + "wide" "20" + "tall" "20" + "visible" "1" + "enabled" "1" + "image" "../hud/class_scoutred" + "scaleImage" "1" + "proportionaltoparent" "1" } + "classimagebg" { - "ControlName" "Panel" - "fieldName" "classimagebg" - "xpos" "0" - "ypos" "0" - "zpos" "2" - "wide" "f0" - "tall" "19" - "visible" "1" - "enabled" "1" - "PaintBackgroundType" "0" - "proportionaltoparent" "1" + "ControlName" "Panel" + "fieldName" "classimagebg" + "xpos" "0" + "ypos" "0" + "zpos" "2" + "wide" "f0" + "tall" "f0" + "visible" "1" + "enabled" "1" + "PaintBackgroundType" "0" + "proportionaltoparent" "1" } + "healthbar" - { - "ControlName" "ContinuousProgressBar" - "fieldName" "healthbar" - "font" "Default" - "xpos" "0" - "ypos" "19" - "zpos" "5" - "wide" "f0" - "tall" "2" - "autoResize" "0" - "pinCorner" "0" - "visible" "1" - "enabled" "1" - "textAlignment" "Left" - "dulltext" "0" - "brighttext" "0" - "bgcolor_override" "80 80 80 255" - "proportionaltoparent" "1" + { + "ControlName" "ContinuousProgressBar" + "fieldName" "healthbar" + "xpos" "0" + "ypos" "20" + "zpos" "3" + "wide" "f0" + "tall" "5" + "visible" "1" + "enabled" "1" + "bgcolor_override" "colordarkwhite" + "proportionaltoparent" "1" } + "overhealbar" - { - "ControlName" "ContinuousProgressBar" - "fieldName" "overhealbar" - "font" "Default" - "xpos" "0" - "ypos" "19" - "zpos" "6" - "wide" "f0" - "tall" "2" - "autoResize" "0" - "pinCorner" "0" - "visible" "1" - "enabled" "1" - "textAlignment" "Left" - "dulltext" "0" - "brighttext" "0" - "bgcolor_override" "0 0 0 0" - "fgcolor_override" "255 255 255 160" - "proportionaltoparent" "1" + { + "ControlName" "ContinuousProgressBar" + "fieldName" "overhealbar" + "xpos" "0" + "ypos" "20" + "zpos" "4" + "wide" "f0" + "tall" "5" + "visible" "1" + "enabled" "1" + "bgcolor_override" "Blank" + "fgcolor_override" "colorwhite" + "proportionaltoparent" "1" + } + + "respawntime" + { + "ControlName" "CExLabel" + "fieldName" "respawntime" + "font" "hudfont14shadow" + "xpos" "cs-0.5" + "ypos" "cs-0.6" + "zpos" "10" + "wide" "f0" + "tall" "f0" + "visible" "1" + "labelText" "%respawntime%" + "textAlignment" "center" + "proportionaltoparent" "1" + "fgcolor" "colorwhite" + } + + + + "playername" + { + "ControlName" "CExLabel" + "fieldName" "playername" + "xpos" "9999" } "HealthIcon" { - "ControlName" "EditablePanel" - "fieldName" "HealthIcon" - "xpos" "9999" - "ypos" "-3" - "zpos" "3" - "wide" "32" - "tall" "32" - "visible" "0" - "enabled" "0" - "HealthBonusPosAdj" "10" - "HealthDeathWarning" "0.49" - "TFFont" "HudFontSmallest" - "HealthDeathWarningColor" "HUDDeathWarning" - "TextColor" "HudOffWhite" + "ControlName" "EditablePanel" + "fieldName" "HealthIcon" + "xpos" "9999" + "visible" "0" + "enabled" "0" } "ReadyBG" { - "ControlName" "ScalableImagePanel" - "fieldName" "ReadyBG" - "xpos" "30" - "ypos" "6" - "zpos" "-1" - "wide" "16" - "tall" "16" - "autoResize" "0" - "pinCorner" "0" - "visible" "0" - "enabled" "1" - "image" "../HUD/tournament_panel_brown" - "src_corner_height" "22" // pixels inside the image - "src_corner_width" "22" - "draw_corner_width" "3" // screen size of the corners ( and sides ), proportional - "draw_corner_height" "3" + "ControlName" "ScalableImagePanel" + "fieldName" "ReadyBG" + "xpos" "9999" } "ReadyImage" { - "ControlName" "ImagePanel" - "fieldName" "ReadyImage" - "xpos" "32" - "ypos" "8" - "zpos" "0" - "wide" "12" - "tall" "12" - "autoResize" "0" - "pinCorner" "0" - "visible" "0" - "enabled" "1" - "image" "hud/checkmark" - "scaleImage" "1" - } - "respawntime" - { - "ControlName" "CExLabel" - "fieldName" "respawntime" - "font" "hudfont10" - "xpos" "cs-0.5" - "ypos" "-2" - "zpos" "5" - "wide" "f0" - "tall" "22" - "autoResize" "0" - "pinCorner" "0" - "visible" "1" - "labelText" "%respawntime%" - "textAlignment" "center" - "proportionaltoparent" "1" + "ControlName" "ImagePanel" + "fieldName" "ReadyImage" + "xpos" "9999" } "chargeamount" { - "ControlName" "CExLabel" - "fieldName" "chargeamount" - "font" "hudfont12" - "xpos" "25" - "ypos" "17" - "zpos" "6" - "wide" "25" - "tall" "15" - "autoResize" "0" - "pinCorner" "0" - "visible" "0" - "labelText" "%chargeamount%" - "textAlignment" "north" - "fgcolor" "0 255 0 255" + "ControlName" "CExLabel" + "fieldName" "chargeamount" + "xpos" "9999" } "specindex" { - "ControlName" "CExLabel" - "fieldName" "specindex" - "font" "DefaultVerySmall" - "xpos" "4" - "ypos" "2" - "zpos" "5" - "wide" "50" - "tall" "8" - "autoResize" "0" - "pinCorner" "0" - "visible" "0" - "labelText" "%specindex%" - "textAlignment" "north-west" - //"fgcolor" "235 226 202 255" + "ControlName" "CExLabel" + "fieldName" "specindex" + "xpos" "9999" } "DeathPanel" { - "ControlName" "ImagePanel" - "fieldName" "DeathPanel" - "xpos" "cs-0.5" - "ypos" "0" - "zpos" "0" - "wide" "f0" - "tall" "24" - "visible" "0" - "enabled" "1" - "image" "../HUD/comp_player_status" - "scaleImage" "1" - "proportionaltoparent" "1" + "ControlName" "ImagePanel" + "fieldName" "DeathPanel" + "xpos" "9999" } "SkullPanel" { - "ControlName" "ImagePanel" - "fieldName" "SkullPanel" - "xpos" "cs-0.5" - "zpos" "1" - "wide" "o1.2" - "tall" "p0.15" - "visible" "0" - "enabled" "1" - "image" "../HUD/comp_player_status_skull" - "scaleImage" "1" - "proportionaltoparent" "1" + "ControlName" "ImagePanel" + "fieldName" "SkullPanel" + "xpos" "9999" } } } diff --git a/resource/ui/hudobjectivetimepanel.res b/resource/ui/hudobjectivetimepanel.res index 0332ee2..1734885 100644 --- a/resource/ui/hudobjectivetimepanel.res +++ b/resource/ui/hudobjectivetimepanel.res @@ -8,7 +8,7 @@ "ypos" "5" "zpos" "2" "wide" "50" - "tall" "23" + "tall" "20" "visible" "1" "enabled" "1" "image" "../hud/objectives_timepanel_blue_bg" @@ -31,7 +31,7 @@ "ypos" "13" "zpos" "2" "wide" "50" - "tall" "23" + "tall" "22" "visible" "0" "enabled" "0" "image" "../hud/objectives_timepanel_blue_bg" diff --git a/resource/ui/hudstopwatch.res b/resource/ui/hudstopwatch.res index 2e04b2d..70cc759 100644 --- a/resource/ui/hudstopwatch.res +++ b/resource/ui/hudstopwatch.res @@ -21,11 +21,11 @@ } - "src_corner_height" "23" // pixels inside the image - "src_corner_width" "23" + "src_corner_height" "25" // pixels inside the image + "src_corner_width" "25" - "draw_corner_width" "7" // screen size of the corners ( and sides ), proportional - "draw_corner_height" "7" + "draw_corner_width" "5" // screen size of the corners ( and sides ), proportional + "draw_corner_height" "5" } "StopWatchImageCaptureTime" @@ -33,7 +33,7 @@ "ControlName" "ImagePanel" "fieldName" "StopWatchImageCaptureTime" "xpos" "5" - "ypos" "12" + "ypos" "10" "zpos" "0" "wide" "17" "tall" "17" @@ -76,16 +76,9 @@ "font_lodef" "HudFontMedium" "fgcolor" "TanLight" "xpos" "23" - "xpos_minmode" "23" - "xpos_hidef" "114" - "xpos_lodef" "114" - "ypos" "11" - "ypos_minmode" "11" - "ypos_hidef" "15" - "ypos_lodef" "18" + "ypos" "10" "zpos" "3" "wide" "45" - "wide_minmode" "45" "tall" "31" "visible" "1" "enabled" "1" @@ -171,23 +164,23 @@ "ypos" "27" "zpos" "-1" "wide" "125" - "tall" "19" + "tall" "10" "autoResize" "0" "pinCorner" "0" "visible" "0" "enabled" "1" - "image" "../hud/objectives_timepanel_suddendeath" + "image" "../hud/color_panel_brown" - "src_corner_height" "2" // pixels inside the image - "src_corner_width" "2" + "src_corner_height" "25" // pixels inside the image + "src_corner_width" "25" - "draw_corner_width" "2" // screen size of the corners ( and sides ), proportional - "draw_corner_height" "2" + "draw_corner_width" "5" // screen size of the corners ( and sides ), proportional + "draw_corner_height" "5" if_comp { - "ypos" "42" + "ypos" "50" } } @@ -211,7 +204,7 @@ if_comp { - "ypos" "38" + "ypos" "40" } } } \ No newline at end of file diff --git a/resource/ui/spectatortournament.res b/resource/ui/spectatortournament.res index 042e5d5..c18c3bb 100644 --- a/resource/ui/spectatortournament.res +++ b/resource/ui/spectatortournament.res @@ -14,12 +14,12 @@ "team1_player_base_offset_x" "290" //"-75" "team1_player_base_y" "110" //"0" "team1_player_delta_x" "0" //"-50" - "team1_player_delta_y" "32" //"0" + "team1_player_delta_y" "30" //"0" "team2_player_base_offset_x" "-380" //"75" "team2_player_base_y" "110" //"0" "team2_player_delta_x" "0" //"50" - "team2_player_delta_y" "32" //"0" + "team2_player_delta_y" "30" //"0" if_mvm { diff --git a/resource/ui/targetid.res b/resource/ui/targetid.res index 005d4ce..089869f 100644 --- a/resource/ui/targetid.res +++ b/resource/ui/targetid.res @@ -77,44 +77,42 @@ "ControlName" "ScalableImagePanel" "fieldName" "TargetIDBG_Spec_Blue" "xpos" "9999" - "ypos" "9999" - "zpos" "-1" + "ypos" "0" + "zpos" "1" "wide" "252" - "tall" "30" + "tall" "2" "autoResize" "0" "pinCorner" "0" - "visible" "0" + "visible" "1" "enabled" "1" "image" "../hud/color_panel_blu_opaque" - "image_lodef" "../hud/color_panel_blu_opaque" "src_corner_height" "25" // pixels inside the image "src_corner_width" "25" - - "draw_corner_width" "5" // screen size of the corners ( and sides ), proportional - "draw_corner_height" "5" + "scaleImage" "1" + "draw_corner_width" "0" // screen size of the corners ( and sides ), proportional + "draw_corner_height" "0" } "TargetIDBG_Spec_Red" { "ControlName" "ScalableImagePanel" "fieldName" "TargetIDBG_Spec_Red" "xpos" "9999" - "ypos" "9999" - "zpos" "-1" + "ypos" "0" + "zpos" "1" "wide" "252" - "tall" "30" + "tall" "2" "autoResize" "0" "pinCorner" "0" - "visible" "0" + "visible" "1" "enabled" "1" "image" "../hud/color_panel_red_opaque" - "image_lodef" "../hud/color_panel_red_opaque" "src_corner_height" "25" // pixels inside the image "src_corner_width" "25" - - "draw_corner_width" "5" // screen size of the corners ( and sides ), proportional - "draw_corner_height" "5" + "scaleImage" "1" + "draw_corner_width" "0" // screen size of the corners ( and sides ), proportional + "draw_corner_height" "0" } "TargetNameLabel" diff --git a/scripts/hudlayout.res b/scripts/hudlayout.res index 367f0ff..25f4053 100644 --- a/scripts/hudlayout.res +++ b/scripts/hudlayout.res @@ -559,7 +559,7 @@ "visible" "1" "enabled" "1" "xpos" "r640" [$WIN32] - "ypos" "26" [$WIN32] + "ypos" "27" [$WIN32] "wide" "628" "tall" "468" @@ -924,7 +924,7 @@ "visible" "1" "enabled" "1" "xpos" "c-150" - "ypos" "250" + "ypos" "260" "wide" "300" "tall" "300" "zpos" "4" @@ -1082,7 +1082,7 @@ "visible" "1" "enabled" "1" "xpos" "c-200" - "ypos" "325" + "ypos" "315" "wide" "470" "tall" "200" "PaintBackgroundType" "0" @@ -1203,9 +1203,8 @@ "fieldName" "HudStopWatch" "visible" "1" "enabled" "1" - "xpos" "c-160" - "ypos" "5" - "ypos_lodef" "75" + "xpos" "c-170" + "ypos" "10" "wide" "125" "tall" "70" }