Skip to content

Commit

Permalink
Merge pull request #459 from rbjaxter/development
Browse files Browse the repository at this point in the history 
November development release
  • Loading branch information
@rbjaxter
rbjaxter authored Nov 4, 2023
2 parents 6949a3a + 718a6eb commit 834a63f
Show file tree
Hide file tree
Showing 87 changed files with 895 additions and 321 deletions.
72 changes: 72 additions & 0 deletions #customization/_enabled/bh_targetid_depleting/bh_targetid_depleting_1-of-3.res
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
"Resource/UI/SpectatorGUIHealth.res"
{
"bh_HealthBGSpec"
{
"ypos" "r-6969"
"visible" "0"
"enabled" "0"
}

"bh_HealthBGDepleting"
{
"visible" "1"
"enabled" "1"
}

"PlayerStatusHealthBonusImage"
{
"xpos" "-500"
"ypos" "0"
"wide" "1000"
"tall" "18"
"visible" "1"
"enabled" "1"
}

"PlayerStatusHealthImage"
{
"xpos" "-500"
"ypos" "0"
"wide" "1000"
"tall" "18"
"visible" "1"
"enabled" "1"
}

"bh_Tint"
{
"visible" "1"
"enabled" "1"
}

// If you'd like the colored background health, delete everything below this point
// (except for the final bracket, of course)
"PlayerStatusHealthValueShadow"
{
"ypos" "r-6969"
"visible" "0"
"enabled" "0"
}

// Place black shadow over existing
"bh_PlayerStatusHealthValueShadow_Override"
{
"pin_to_sibling" "bh_TargetIDHealthPin"
"pin_corner_to_sibling" "PIN_TOPLEFT"
"pin_to_sibling_corner" "0"

"ControlName" "Label"
"fieldName" "bh_PlayerStatusHealthValueShadow_Override"
"xpos" "0"
"ypos" "-1"
"zpos" "5"
"wide" "40"
"tall" "18"
"visible" "1"
"enabled" "1"
"labeltext" "%health%"
"textAlignment" "center"
"fgcolor_override" "bh_Shadow"
"font" "bh_Font20"
}
}
3 changes: 3 additions & 0 deletions #customization/_enabled/bh_targetid_depleting/bh_targetid_depleting_2-of-3.res
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
"Resource/UI/TargetID.res"
{
}
3 changes: 3 additions & 0 deletions #customization/_enabled/bh_targetid_depleting/bh_targetid_depleting_3-of-3.res
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
"Resource/UI/HealthIconPanel.res"
{
}
8 changes: 4 additions & 4 deletions #customization/bh_player_teamindicator.res
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
"tall" "2"
"visible" "1"
"enabled" "1"
"image" "replay/thumbnails/team_colors/bh_fill_gray"
"teambg_1" "replay/thumbnails/team_colors/bh_fill_gray"
"teambg_2" "replay/thumbnails/team_colors/bh_fill_red"
"teambg_3" "replay/thumbnails/team_colors/bh_fill_blue"
"image" "replay/thumbnails/general_icons/bh_fill_gray"
"teambg_1" "replay/thumbnails/general_icons/bh_fill_gray"
"teambg_2" "replay/thumbnails/general_icons/bh_fill_red"
"teambg_3" "replay/thumbnails/general_icons/bh_fill_blue"
}
}
29 changes: 5 additions & 24 deletions #customization/bh_targetid_healthcross1.res → ...hcross/bh_targetid_healthcross_1-of-3.res
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
"fieldName" "bh_TargetIDHealthPin"
"xpos" "0"
"ypos" "2"
"zpos" "0"
"wide" "100"
"tall" "0"
"visible" "1"
Expand All @@ -25,7 +24,6 @@
{
"xpos" "4"
"ypos" "4"
"zpos" "2"
"wide" "12"
"tall" "12"
"visible" "1"
Expand All @@ -36,7 +34,6 @@
{
"xpos" "3"
"ypos" "3"
"zpos" "0"
"wide" "14"
"tall" "14"
"visible" "1"
Expand All @@ -60,37 +57,21 @@

"ControlName" "Label"
"fieldName" "PlayerStatusHealthValue"
"xpos" "-15"
"xpos" "-18"
"ypos" "1"
"zpos" "5"
"wide" "40"
"tall" "17"
"visible" "1"
"enabled" "1"
"labeltext" "%health%"
"textAlignment" "center"
"fgcolor_override" "bh_Health_Main"
"font" "bh_Font20"
}

"PlayerStatusHealthValueShadow"
{
"pin_to_sibling" "bh_TargetIDHealthPin"
"pin_to_sibling" "PlayerStatusHealthValue"
"pin_corner_to_sibling" "PIN_TOPLEFT"
"pin_to_sibling_corner" "0"

"ControlName" "Label"
"fieldName" "PlayerStatusHealthValueShadow"
"xpos" "-15"
"ypos" "0"
"zpos" "5"
"xpos" "-1"
"ypos" "-1"
"wide" "40"
"tall" "17"
"visible" "1"
"enabled" "1"
"labeltext" "%health%"
"textAlignment" "center"
"fgcolor_override" "bh_Shadow"
"font" "bh_Font20"
"tall" "18"
}
}
1 change: 1 addition & 0 deletions #customization/bh_targetid_healthcross2.res → ...hcross/bh_targetid_healthcross_2-of-3.res
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"SpectatorGUIHealth"
{
"wide" "60"
"tall" "20"
}

"TargetIDBG"
Expand Down
0 #customization/bh_targetid_healthcross3.res → ...hcross/bh_targetid_healthcross_3-of-3.res
View file
File renamed without changes.
2 changes: 2 additions & 0 deletions #dev/ref.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,8 @@
"pin_to_sibling" "bh_PinTemplate"
"pin_corner_to_sibling" "PIN_TOPLEFT"
"pin_to_sibling_corner" "0"
"xpos" "-1"
"ypos" "-1"


////////////////////////////////////////////////////////////////////////////////////////////////////
Expand Down
10 changes: 5 additions & 5 deletions #users/jayhyunpae_/resource/ui/targetid.res
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,9 @@
"draw_corner_width" "0"
"draw_corner_height" "0"

"teambg_1" "replay/thumbnails/team_colors/bh_targetid_gray"
"teambg_2" "replay/thumbnails/team_colors/bh_targetid_red"
"teambg_3" "replay/thumbnails/team_colors/bh_targetid_blue"
"teambg_1" "replay/thumbnails/general_icons/bh_targetid_gray"
"teambg_2" "replay/thumbnails/general_icons/bh_targetid_red"
"teambg_3" "replay/thumbnails/general_icons/bh_targetid_blue"
}

"TargetIDBG_Spec_Blue"
Expand All @@ -134,7 +134,7 @@
"draw_corner_width" "0"
"draw_corner_height" "0"

"image" "replay/thumbnails/team_colors/bh_targetid_blue"
"image" "replay/thumbnails/general_icons/bh_targetid_blue"
}

"TargetIDBG_Spec_Red"
Expand All @@ -152,7 +152,7 @@
"draw_corner_width" "0"
"draw_corner_height" "0"

"image" "replay/thumbnails/team_colors/bh_targetid_red"
"image" "replay/thumbnails/general_icons/bh_targetid_red"
}

////////////////////////////////////////////////////////////////////////////////////////////////////
Expand Down
5 changes: 4 additions & 1 deletion _budhud/resource/clientscheme_colors.res
View file
Original file line number Diff line number Diff line change
Expand Up @@ -271,10 +271,12 @@ Scheme
"bh_green" "077 116 085 255"
"bh_bgreen" "050 205 050 255"
"bh_red" "159 055 055 255"
"bh_bred" "245 050 041 255"
"bh_red_t" "159 055 055 128"
"bh_red_tt" "159 055 055 64"
"bh_bred" "245 050 041 255"
"bh_blue" "101 122 140 255"
"bh_blue_t" "101 122 140 128"
"bh_blue_tt" "101 122 140 064"
"bh_blank" "000 000 000 000"
"bh_yellow" "231 181 059 255"

Expand Down Expand Up @@ -315,6 +317,7 @@ Scheme
"LighterRed" "254 002 209 255" // Bright pink to locate
"TanLight" "255 255 255 255" // Used in far too many places to want to do anything but change it here
"TanDark" "255 255 255 255" // Used in advanced options
"HudOffWhite" "255 255 255 255"

// Engineer HUD Specific
"LowHealthRed" "159 055 055 255" // When building is low health or is in first stage of building
Expand Down
40 changes: 40 additions & 0 deletions _budhud/resource/clientscheme_lato.res
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,46 @@ Scheme
}
}

bh_Font_TargetIDHealth
{
"1"
{
"name" "Lato Semibold"
"tall" "20"
"weight" "500"
"antialias" "1"
"dropshadow" "0"
"outline" "0"
}
}

bh_Font_TargetIDHealthShadow
{
"1"
{
"name" "Lato Semibold"
"tall" "20"
"weight" "500"
"antialias" "1"
"dropshadow" "0"
"outline" "0"
}
}

bh_Font_TargetIDHealthBlur
{
"1"
{
"name" "Lato Semibold"
"tall" "20"
"weight" "500"
"antialias" "1"
"blur" "1"
"dropshadow" "0"
"outline" "0"
}
}

////////////////////////////////////////////////////////////////////////////////////////////////////
// General Fonts
// Font entries shared by multiple HUD elements
Expand Down
8 changes: 4 additions & 4 deletions _budhud/resource/ui/bh_popupbase.res
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,10 +147,10 @@
"tall" "2"
"visible" "1"
"enabled" "1"
"image" "replay/thumbnails/team_colors/bh_fill_gray"
"teambg_1" "replay/thumbnails/team_colors/bh_fill_gray"
"teambg_2" "replay/thumbnails/team_colors/bh_fill_red"
"teambg_3" "replay/thumbnails/team_colors/bh_fill_blue"
"image" "replay/thumbnails/general_icons/bh_fill_gray"
"teambg_1" "replay/thumbnails/general_icons/bh_fill_gray"
"teambg_2" "replay/thumbnails/general_icons/bh_fill_red"
"teambg_3" "replay/thumbnails/general_icons/bh_fill_blue"
}

"active_item_1"
Expand Down
8 changes: 4 additions & 4 deletions _budhud/resource/ui/build_menu/hudmenuengybuild.res
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,10 @@
"tall" "2"
"visible" "1"
"enabled" "1"
"image" "replay/thumbnails/team_colors/bh_fill_gray"
"teambg_1" "replay/thumbnails/team_colors/bh_fill_gray"
"teambg_2" "replay/thumbnails/team_colors/bh_fill_red"
"teambg_3" "replay/thumbnails/team_colors/bh_fill_blue"
"image" "replay/thumbnails/general_icons/bh_fill_gray"
"teambg_1" "replay/thumbnails/general_icons/bh_fill_gray"
"teambg_2" "replay/thumbnails/general_icons/bh_fill_red"
"teambg_3" "replay/thumbnails/general_icons/bh_fill_blue"
}

"MainBackground"
Expand Down
8 changes: 4 additions & 4 deletions _budhud/resource/ui/build_menu/hudmenueurekaeffect.res
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@
"tall" "2"
"visible" "1"
"enabled" "1"
"image" "replay/thumbnails/team_colors/bh_fill_gray"
"teambg_1" "replay/thumbnails/team_colors/bh_fill_gray"
"teambg_2" "replay/thumbnails/team_colors/bh_fill_red"
"teambg_3" "replay/thumbnails/team_colors/bh_fill_blue"
"image" "replay/thumbnails/general_icons/bh_fill_gray"
"teambg_1" "replay/thumbnails/general_icons/bh_fill_gray"
"teambg_2" "replay/thumbnails/general_icons/bh_fill_red"
"teambg_3" "replay/thumbnails/general_icons/bh_fill_blue"
}

"MainBackground"
Expand Down
Loading

0 comments on commit 834a63f

Please sign in to comment.