diff options
28 files changed, 445 insertions, 654 deletions
diff --git a/customizations/player_health/hudplayerhealth-broesel.res b/customizations/player_health/hudplayerhealth-broesel.res index ec1ed8c..a75d672 100644 --- a/customizations/player_health/hudplayerhealth-broesel.res +++ b/customizations/player_health/hudplayerhealth-broesel.res @@ -291,6 +291,12 @@ "tall" "32" } + "PlayerStatusHookBleedImage" + { + "wide" "32" + "tall" "32" + } + "PlayerStatusSlowed" { "wide" "32" diff --git a/customizations/player_health/hudplayerhealth-cross.res b/customizations/player_health/hudplayerhealth-cross.res index 3dfb351..2febbec 100644 --- a/customizations/player_health/hudplayerhealth-cross.res +++ b/customizations/player_health/hudplayerhealth-cross.res @@ -353,4 +353,12 @@ "wide_minmode" "24" "tall_minmode" "24" } + + "PlayerStatusHookBleedImage" + { + "wide" "32" + "tall" "32" + "wide_minmode" "24" + "tall_minmode" "24" + } }
\ No newline at end of file diff --git a/customizations/player_health/hudplayerhealth.res b/customizations/player_health/hudplayerhealth.res index 8d24e6b..5052519 100644 --- a/customizations/player_health/hudplayerhealth.res +++ b/customizations/player_health/hudplayerhealth.res @@ -441,6 +441,7 @@ "visible" "1" "enabled" "1" "scaleImage" "1" + "image" "" "fgcolor" "117 107 94 255" "pin_to_sibling" "PlayerStatusAnchor" "pin_corner_to_sibling" "1" @@ -693,4 +694,23 @@ "pin_corner_to_sibling" "1" "pin_to_sibling_corner" "1" } + + "PlayerStatusHookBleedImage" + { + "ControlName" "ImagePanel" + "fieldName" "PlayerStatusHookBleedImage" + "xpos" "0" + "ypos" "0" + "zpos" "8" + "wide" "23" + "tall" "23" + "visible" "1" + "enabled" "1" + "scaleImage" "1" + "image" "../vgui/bleed_drop_grapple" + "fgcolor" "117 107 94 255" + "pin_to_sibling" "PlayerStatusAnchor" + "pin_corner_to_sibling" "1" + "pin_to_sibling_corner" "1" + } }
\ No newline at end of file diff --git a/customizations/scoreboards/scoreboard.res b/customizations/scoreboards/scoreboard.res index 9ec0e5f..26e5f33 100644 --- a/customizations/scoreboards/scoreboard.res +++ b/customizations/scoreboards/scoreboard.res @@ -126,7 +126,7 @@ "pinCorner" "0" "visible" "1" "enabled" "1" - "fillcolor" "0 0 0 100" + "fillcolor" "TransparentBlack" if_mvm { @@ -195,7 +195,7 @@ { "ControlName" "CExLabel" "fieldName" "BlueTeamName" - "font" "Cerbetica32" + "font" "HudFontMediumBig" "labelText" "%blueteamname%" "textAlignment" "west" "xpos" "c-265" @@ -282,7 +282,7 @@ { "ControlName" "CExLabel" "fieldName" "RedTeamName" - "font" "Cerbetica32" + "font" "HudFontMediumBig" "labelText" "%redteamname%" "textAlignment" "east" "xpos" "c45" @@ -375,8 +375,8 @@ "font" "Cerbetica14" "labelText" "%server%" "textAlignment" "west" - "xpos" "-34" - "ypos" "14" + "xpos" "5" + "ypos" "20" "zpos" "999" "wide" "600" "tall" "20" @@ -392,8 +392,8 @@ "font" "Cerbetica20" "labelText" "%servertime%" "textAlignment" "west" - "xpos" "2" - "ypos" "2" + "xpos" "5" + "ypos" "5" "zpos" "999" "wide" "600" "tall" "20" @@ -477,7 +477,7 @@ { "ControlName" "CExLabel" "fieldName" "Spectators" - "font" "Cerbetica11" + "font" "HudFontSmallest" "labelText" "%spectators%" "textAlignment" "west" "xpos" "c-266" @@ -495,7 +495,7 @@ { "ControlName" "CExLabel" "fieldName" "SpectatorsInQueue" - "font" "Cerbetica11" + "font" "HudFontSmallest" "labelText" "%waitingtoplay%" "textAlignment" "west" "xpos" "2" @@ -580,8 +580,8 @@ "font" "Cerbetica14" "labelText" "%mapname%" "textAlignment" "west" - "xpos" "3" - "ypos" "25" + "xpos" "5" + "ypos" "35" "zpos" "3" "wide" "480" "tall" "20" @@ -870,7 +870,7 @@ { "ControlName" "CExLabel" "fieldName" "KillsLabel" - "font" "Cerbetica48" + "font" "HudFontGiantBold" "labelText" ":" "textAlignment" "center" "xpos" "0" @@ -887,7 +887,7 @@ { "ControlName" "CExLabel" "fieldName" "Kills" - "font" "Cerbetica48" + "font" "HudFontGiantBold" "labelText" "%kills%" "textAlignment" "east" "xpos" "9999" @@ -904,7 +904,7 @@ { "ControlName" "CExLabel" "fieldName" "Kills2" - "font" "Cerbetica48" + "font" "HudFontGiantBold" "labelText" "%kills%" "textAlignment" "east" "xpos" "188" @@ -940,7 +940,7 @@ { "ControlName" "CExLabel" "fieldName" "Deaths" - "font" "Cerbetica48" + "font" "HudFontGiantBold" "labelText" "%deaths%" "textAlignment" "west" "xpos" "9999" @@ -957,7 +957,7 @@ { "ControlName" "CExLabel" "fieldName" "Deaths2" - "font" "Cerbetica48" + "font" "HudFontGiantBold" "labelText" "%deaths%" "textAlignment" "west" "xpos" "282" diff --git a/customizations/team_menu/classselection-center.res b/customizations/team_menu/classselection-center.res index e545202..c2c587f 100644 --- a/customizations/team_menu/classselection-center.res +++ b/customizations/team_menu/classselection-center.res @@ -2,11 +2,7 @@ { "SelectClassLabel" { - "xpos" "30" - "ypos" "r40" - "wide" "450" - "textAlignment" "west" - "font" "CerbeticaBold32" + "visible" "0" } "SidePanelBG" @@ -19,78 +15,78 @@ "scout" { "xpos" "c81" - "ypos" "180" + "ypos" "164" } "soldier" { "xpos" "c80" - "ypos" "196" + "ypos" "180" } "pyro" { "xpos" "c80" - "ypos" "212" + "ypos" "196" } "demoman" { "xpos" "c80" - "ypos" "232" + "ypos" "212" } "heavyweapons" { "xpos" "c80" - "ypos" "248" + "ypos" "232" } "engineer" { "xpos" "c80" - "ypos" "264" + "ypos" "248" } "medic" { "xpos" "c80" - "ypos" "284" + "ypos" "264" } "sniper" { "xpos" "c80" - "ypos" "300" + "ypos" "284" } "spy" { "xpos" "c80" - "ypos" "316" + "ypos" "300" } "random" { "xpos" "c80" - "ypos" "c100" + "ypos" "c80" } - "EditLoadoutButton" [$WIN32] + "EditLoadoutButton" { "xpos" "c80" - "ypos" "c120" + "ypos" "c100" } - "CancelButton" [$WIN32] + "CancelButton" { "xpos" "c180" - "ypos" "c100" + "ypos" "c80" } "numScout" { "xpos" "c158" - "ypos" "180" + "ypos" "164" "wide" "100" "tall" "12" "textAlignment" "center" @@ -99,7 +95,7 @@ "numSoldier" { "xpos" "c158" - "ypos" "196" + "ypos" "180" "wide" "100" "tall" "12" "textAlignment" "center" @@ -108,7 +104,7 @@ "numPyro" { "xpos" "c158" - "ypos" "212" + "ypos" "196" "wide" "100" "tall" "12" "textAlignment" "center" @@ -117,7 +113,7 @@ "numDemoman" { "xpos" "c158" - "ypos" "232" + "ypos" "212" "wide" "100" "tall" "12" "textAlignment" "center" @@ -126,7 +122,7 @@ "numHeavy" { "xpos" "c158" - "ypos" "248" + "ypos" "232" "wide" "100" "tall" "12" "textAlignment" "center" @@ -135,7 +131,7 @@ "numEngineer" { "xpos" "c158" - "ypos" "264" + "ypos" "248" "wide" "100" "tall" "12" "textAlignment" "center" @@ -144,7 +140,7 @@ "numMedic" { "xpos" "c158" - "ypos" "284" + "ypos" "264" "wide" "100" "tall" "12" "textAlignment" "center" @@ -153,7 +149,7 @@ "numSniper" { "xpos" "c158" - "ypos" "300" + "ypos" "284" "wide" "100" "tall" "12" "textAlignment" "center" @@ -162,7 +158,7 @@ "numSpy" { "xpos" "c158" - "ypos" "316" + "ypos" "300" "wide" "100" "tall" "12" "textAlignment" "center" diff --git a/customizations/team_menu/teammenu-center.res b/customizations/team_menu/teammenu-center.res index e6940ed..3bbf614 100644 --- a/customizations/team_menu/teammenu-center.res +++ b/customizations/team_menu/teammenu-center.res @@ -46,11 +46,10 @@ "teambutton0" { "xpos" "c-110" - "ypos" "210" + "ypos" "c-20" "wide" "110" "tall" "40" - "labelText" "&3. Blue Team" [$WIN32] - "textAlignment" "center" + "textAlignment" "north" "font" "CerbeticaBold16" } @@ -65,11 +64,10 @@ "teambutton1" { "xpos" "c0" - "ypos" "210" + "ypos" "c-20" "wide" "110" "tall" "40" - "labelText" "&4. Red Team" [$WIN32] - "textAlignment" "center" + "textAlignment" "north" "font" "CerbeticaBold16" } @@ -87,7 +85,6 @@ "ypos" "c-40" "wide" "220" "tall" "20" - "labelText" "&1. Auto-Join" "textAlignment" "center" "font" "CerbeticaBold16" } @@ -104,7 +101,6 @@ "ypos" "c20" "wide" "220" "tall" "20" - "labelText" "&2. Spectate" [$WIN32] "textAlignment" "center" "font" "CerbeticaBold16" } @@ -117,59 +113,55 @@ "BlueCount" { - "xpos" "c-157" - "ypos" "c-10" - "wide" "90" + "xpos" "c-115" + "ypos" "c-15" + "wide" "48" + "tall" "40" "font" "Cerbetica14" + "textAlignment" "east" "fgcolor" "255 255 255 175" } "BlueCountPlayers" { "ControlName" "CExLabel" "fieldName" "BlueCountPlayers" - "xpos" "c-120" - "ypos" "c-10" + "xpos" "c-60" + "ypos" "c-15" "zpos" "1" - "wide" "90" - "tall" "30" - "autoResize" "0" - "pinCorner" "0" + "wide" "55" + "tall" "40" "visible" "1" "enabled" "1" "labelText" "players" - "textAlignment" "east" - "dulltext" "0" - "brighttext" "1" + "textAlignment" "west" "font" "Cerbetica14" "fgcolor" "255 255 255 175" } "RedCount" { - "xpos" "c-51" - "ypos" "c-10" - "wide" "90" + "xpos" "c0" + "ypos" "c-15" + "wide" "43" + "tall" "40" "labelText" "%redcount%" "font" "Cerbetica14" + "textAlignment" "east" "fgcolor" "255 255 255 175" } "RedCountPlayers" { "ControlName" "CExLabel" "fieldName" "RedCountPlayers" - "xpos" "c-14" - "ypos" "c-10" + "xpos" "c50" + "ypos" "c-15" "zpos" "1" - "wide" "90" - "tall" "30" - "autoResize" "0" - "pinCorner" "0" + "wide" "55" + "tall" "40" "visible" "1" "enabled" "1" "labelText" "players" - "textAlignment" "east" - "dulltext" "0" - "brighttext" "1" + "textAlignment" "west" "font" "Cerbetica14" "fgcolor" "255 255 255 175" } diff --git a/customizations/team_menu/teammenu.res b/customizations/team_menu/teammenu.res index f301526..3160002 100644 --- a/customizations/team_menu/teammenu.res +++ b/customizations/team_menu/teammenu.res @@ -91,8 +91,8 @@ "visible" "1" "enabled" "1" "tabPosition" "3" - "labelText" "&3. BLU" - "textAlignment" "west" + "labelText" "#TF_BlueTeam_Name" + "textAlignment" "center" "dulltext" "0" "brighttext" "0" "command" "jointeam blue" @@ -132,8 +132,8 @@ "visible" "1" "enabled" "1" "tabPosition" "3" - "labelText" "&4. RED" - "textAlignment" "west" + "labelText" "#TF_RedTeam_Name" + "textAlignment" "center" "dulltext" "0" "brighttext" "0" "command" "jointeam red" @@ -173,8 +173,8 @@ "visible" "1" "enabled" "1" "tabPosition" "3" - "labelText" "&1. Auto-Join" - "textAlignment" "west" + "labelText" "#TF_Random" + "textAlignment" "center" "dulltext" "0" "brighttext" "0" "paintborder" "0" @@ -214,8 +214,8 @@ "visible" "1" "enabled" "1" "tabPosition" "3" - "labelText" "&2. Spectate" - "textAlignment" "west" + "labelText" "#TF_Spectate" + "textAlignment" "center" "dulltext" "0" "brighttext" "0" "paintborder" "0" @@ -261,11 +261,11 @@ { "ControlName" "CExLabel" "fieldName" "BlueCount" - "xpos" "-10" + "xpos" "0" "ypos" "c5" "zpos" "1" "zpos" "3" - "wide" "255" + "wide" "245" "tall" "30" "autoResize" "0" "pinCorner" "0" @@ -283,10 +283,10 @@ { "ControlName" "CExLabel" "fieldName" "RedCount" - "xpos" "-10" + "xpos" "0" "ypos" "c45" "zpos" "1" - "wide" "255" + "wide" "245" "tall" "30" "autoResize" "0" "pinCorner" "0" @@ -300,54 +300,6 @@ "fgcolor" "242 242 242 255" } - "HighlanderLabel" - { - "ControlName" "CExLabel" - "fieldName" "HighlanderLabel" - "xpos" "0" - "ypos" "c95" - "zpos" "6" - "wide" "255" - "tall" "50" - "autoResize" "0" - "pinCorner" "0" - "visible" "0" - "enabled" "0" - "labelText" "#TF_Highlander_Mode" - "textAlignment" "Center" - "dulltext" "0" - "brighttext" "0" - "font" "CerbeticaBold16" - "fgcolor" "235 226 202 255" - "centerwrap" "1" - } - - "HighlanderLabelShadow" - { - "ControlName" "CExLabel" - "fieldName" "HighlanderLabelShadow" - "xpos" "-1" - "ypos" "-1" - "zpos" "6" - "wide" "255" - "tall" "50" - "autoResize" "0" - "pinCorner" "0" - "visible" "0" - "enabled" "0" - "labelText" "#TF_Highlander_Mode" - "textAlignment" "Center" - "dulltext" "0" - "brighttext" "0" - "font" "CerbeticaBold16" - "fgcolor" "0 0 0 200" - "centerwrap" "1" - - "pin_to_sibling" "HighlanderLabel" - "pin_corner_to_sibling" "PIN_TOPLEFT" - "pin_to_sibling_corner" "PIN_TOPLEFT" - } - "TeamsFullLabel" { "ControlName" "CExLabel" @@ -402,4 +354,54 @@ "fieldName" "CancelButton" "wide" "0" } + + "teambutton0SC" + { + "ControlName" "CExButton" + "fieldName" "teambutton0SC" + "wide" "0" + "tall" "0" + "visible" "1" + "enabled" "1" + "labelText" "&3" + "command" "jointeam blue" + "team" "3" + } + + "teambutton1SC" + { + "ControlName" "CExButton" + "fieldName" "teambutton1SC" + "wide" "0" + "tall" "0" + "visible" "1" + "enabled" "1" + "labelText" "&4" + "command" "jointeam red" + "team" "4" + } + + "teambutton2SC" + { + "ControlName" "CExButton" + "fieldName" "teambutton2SC" + "wide" "0" + "tall" "0" + "visible" "1" + "enabled" "1" + "labelText" "&1" + "command" "jointeam auto" + } + + "teambutton3SC" + { + "ControlName" "CExButton" + "fieldName" "teambutton3SC" + "wide" "0" + "tall" "0" + "visible" "1" + "enabled" "1" + "labelText" "&2" + "command" "jointeam spectate" + } }
\ No newline at end of file diff --git a/resource/gamemenu.res b/resource/gamemenu.res index 521d3e8..2ccd3d9 100644 --- a/resource/gamemenu.res +++ b/resource/gamemenu.res @@ -46,7 +46,7 @@ "MutePlayersButton" { "label" "" - "command" "OpenPlayerListDialog" + "command" "OpenMutePlayerDialog" "OnlyInGame" "1" "subimage" "glyph_muted" "tooltip" "#MMenu_MutePlayers" diff --git a/resource/scheme/clientscheme_fonts.res b/resource/scheme/clientscheme_fonts.res index 4578dd8..fab7d55 100644 --- a/resource/scheme/clientscheme_fonts.res +++ b/resource/scheme/clientscheme_fonts.res @@ -3,22 +3,22 @@ Scheme Fonts { // CUSTOM - "CerbeticaBold72" + "Cerbetica72" { "1" { - "name" "Cerbetica Bold" + "name" "Cerbetica_edited" "tall" "72" "additive" "0" "antialias" "1" } } - "CerbeticaBold64" + "CerbeticaBold72" { "1" { "name" "Cerbetica Bold" - "tall" "64" + "tall" "72" "additive" "0" "antialias" "1" } @@ -44,72 +44,42 @@ Scheme "outline" "1" } } - "CerbeticaBold50" - { - "1" - { - "name" "Cerbetica Bold" - "tall" "50" - "additive" "0" - "antialias" "1" - } - } - "CerbeticaBold48" - { - "1" - { - "name" "Cerbetica Bold" - "tall" "48" - "additive" "0" - "antialias" "1" - } - } - "CerbeticaBold46" - { - "1" - { - "name" "Cerbetica Bold" - "tall" "46" - "additive" "0" - "antialias" "1" - } - } - "CerbeticaBold44" + "Cerbetica48" { "1" { - "name" "Cerbetica Bold" - "tall" "44" + "name" "Cerbetica_edited" + "tall" "48" "additive" "0" "antialias" "1" } } - "CerbeticaBold42" + "CerbeticaBold40" { "1" { "name" "Cerbetica Bold" - "tall" "42" + "tall" "40" "additive" "0" "antialias" "1" } } - "CerbeticaBold37" + "Cerbetica40" { "1" { - "name" "Cerbetica Bold" - "tall" "37" + "name" "Cerbetica_edited" + "tall" "40" "additive" "0" "antialias" "1" } } - "CerbeticaBold36" + "Cerbetica32" { "1" { - "name" "Cerbetica Bold" - "tall" "36" + "name" "Cerbetica_edited" + "tall" "32" "additive" "0" "antialias" "1" } @@ -145,375 +115,172 @@ Scheme "antialias" "1" } } - "CerbeticaBold27" + "Cerbetica26" { "1" { - "name" "Cerbetica Bold" - "tall" "27" + "name" "Cerbetica_edited" + "tall" "26" "additive" "0" "antialias" "1" } } - "CerbeticaBold24" + "Cerbetica24" { "1" { - "name" "Cerbetica Bold" + "name" "Cerbetica_edited" "tall" "24" "additive" "0" "antialias" "1" } } - "CerbeticaBoldOutline24" - { - "1" - { - "name" "Cerbetica Bold" - "tall" "24" - "additive" "0" - "antialias" "1" - "outline" "1" - } - } - "CerbeticaBold22" - { - "1" - { - "name" "Cerbetica Bold" - "tall" "22" - "additive" "0" - "antialias" "1" - } - } - "CerbeticaBold20" - { - "1" - { - "name" "Cerbetica Bold" - "tall" "20" - "additive" "0" - "antialias" "1" - } - } - "CerbeticaBold18" - { - "1" - { - "name" "Cerbetica Bold" - "tall" "18" - "additive" "0" - "antialias" "1" - } - } - "CerbeticaBold17" - { - "1" - { - "name" "Cerbetica Bold" - "tall" "17" - "additive" "0" - "antialias" "1" - } - } - "CerbeticaBold16" + "CerbeticaBold24" { "1" { "name" "Cerbetica Bold" - "tall" "16" + "tall" "24" "additive" "0" "antialias" "1" } } - "CerbeticaBoldOutline16" + "CerbeticaBoldOutline24" { "1" { "name" "Cerbetica Bold" - "tall" "16" + "tall" "24" "additive" "0" "antialias" "1" "outline" "1" } } - "CerbeticaBold15" - { - "1" - { - "name" "Cerbetica Bold" - "tall" "15" - "additive" "0" - "antialias" "1" - } - } - "CerbeticaBold14" - { - "1" - { - "name" "Cerbetica Bold" - "tall" "14" - "additive" "0" - "antialias" "1" - } - } - "CerbeticaBold13" - { - "1" - { - "name" "Cerbetica Bold" - "tall" "13" - "additive" "0" - "antialias" "1" - } - } - "CerbeticaBold12" - { - "1" - { - "name" "Cerbetica Bold" - "tall" "12" - "additive" "0" - "antialias" "1" - } - } - "CerbeticaBold10" - { - "1" - { - "name" "Cerbetica Bold" - "tall" "10" - "additive" "0" - "antialias" "1" - } - } - "CerbeticaBold8" - { - "1" - { - "name" "Cerbetica Bold" - "tall" "8" - "additive" "0" - "antialias" "1" - } - } - "Cerbetica72" - { - "1" - { - "name" "Cerbetica_edited" - "tall" "72" - "additive" "0" - "antialias" "1" - } - } - "Cerbetica60" - { - "1" - { - "name" "Cerbetica_edited" - "tall" "60" - "additive" "0" - "antialias" "1" - } - } - "Cerbetica56" - { - "1" - { - "name" "Cerbetica_edited" - "tall" "56" - "additive" "0" - "antialias" "1" - } - } - "Cerbetica55" - { - "1" - { - "name" "Cerbetica_edited" - "tall" "55" - "additive" "0" - "antialias" "1" - } - } - - "Cerbetica54" - { - "1" - { - "name" "Cerbetica_edited" - "tall" "54" - "additive" "0" - "antialias" "1" - } - } - "Cerbetica52" - { - "1" - { - "name" "Cerbetica_edited" - "tall" "52" - "additive" "0" - "antialias" "1" - } - } - "Cerbetica48" - { - "1" - { - "name" "Cerbetica_edited" - "tall" "48" - "additive" "0" - "antialias" "1" - } - } - "Cerbetica44" - { - "1" - { - "name" "Cerbetica_edited" - "tall" "44" - "additive" "0" - "antialias" "1" - } - } - "Cerbetica40" + "Cerbetica22" { "1" { "name" "Cerbetica_edited" - "tall" "40" + "tall" "22" "additive" "0" "antialias" "1" } } - "Cerbetica36" + "CerbeticaBold22" { "1" { - "name" "Cerbetica_edited" - "tall" "36" + "name" "Cerbetica Bold" + "tall" "22" "additive" "0" "antialias" "1" } } - "Cerbetica32" + "Cerbetica20" { "1" { "name" "Cerbetica_edited" - "tall" "32" + "tall" "20" "additive" "0" "antialias" "1" } } - "Cerbetica28" + "CerbeticaBold20" { "1" { - "name" "Cerbetica_edited" - "tall" "26" + "name" "Cerbetica Bold" + "tall" "20" "additive" "0" "antialias" "1" } } - "Cerbetica26" + "Cerbetica18" { "1" { "name" "Cerbetica_edited" - "tall" "26" + "tall" "18" "additive" "0" "antialias" "1" } } - "Cerbetica24" + "CerbeticaBold18" { "1" { - "name" "Cerbetica_edited" - "tall" "24" + "name" "Cerbetica Bold" + "tall" "18" "additive" "0" "antialias" "1" } } - "CerbeticaOutline24" - { - "1" - { - "name" "Cerbetica_edited" - "tall" "24" - "additive" "0" - "antialias" "1" - "outline" "1" - } - } - "Cerbetica22" + "Cerbetica16" { "1" { "name" "Cerbetica_edited" - "tall" "22" + "tall" "16" "additive" "0" "antialias" "1" } } - "Cerbetica20" + "CerbeticaBold16" { "1" { - "name" "Cerbetica_edited" - "tall" "20" + "name" "Cerbetica Bold" + "tall" "16" "additive" "0" "antialias" "1" } } - "Cerbetica18" + "CerbeticaBold15" { "1" { - "name" "Cerbetica_edited" - "tall" "18" + "name" "Cerbetica Bold" + "tall" "15" "additive" "0" "antialias" "1" } } - "Cerbetica16" + "Cerbetica14" { "1" { "name" "Cerbetica_edited" - "tall" "16" + "tall" "14" "additive" "0" "antialias" "1" } } - "Cerbetica15" + "CerbeticaBold14" { "1" { - "name" "Cerbetica_edited" - "tall" "15" + "name" "Cerbetica Bold" + "tall" "14" "additive" "0" "antialias" "1" } } - "Cerbetica14" + "Cerbetica12" { "1" { "name" "Cerbetica_edited" - "tall" "14" + "tall" "12" "additive" "0" "antialias" "1" } } - "Cerbetica12" + "CerbeticaBold12" { "1" { - "name" "Cerbetica_edited" + "name" "Cerbetica Bold" "tall" "12" "additive" "0" "antialias" "1" @@ -559,16 +326,6 @@ Scheme "antialias" "1" } } - "Cerbetica7" - { - "1" - { - "name" "Cerbetica_edited" - "tall" "7" - "additive" "0" - "antialias" "1" - } - } // DEFAULT "Default" @@ -1060,7 +817,7 @@ Scheme "1" { "name" "Cerbetica_edited" - "tall" "11" + "tall" "12" "weight" "500" "additive" "0" "antialias" "1" @@ -1071,7 +828,7 @@ Scheme "1" { "name" "Cerbetica_edited" - "tall" "11" + "tall" "12" "weight" "500" "additive" "0" "antialias" "1" @@ -1082,8 +839,8 @@ Scheme { "1" { - "name" "Cerbetica_edited" - "tall" "11" + "name" "Cerbetica Bold" + "tall" "12" "weight" "500" "additive" "0" "antialias" "1" @@ -1095,7 +852,7 @@ Scheme "1" { "name" "Cerbetica_edited" - "tall" "4" + "tall" "6" "weight" "500" "additive" "0" "antialias" "1" @@ -1617,7 +1374,7 @@ Scheme "1" { "name" "Cerbetica_edited" - "tall" "8" + "tall" "9" "weight" "400" "additive" "0" "antialias" "1" diff --git a/resource/ui/charinfoloadoutsubpanel.res b/resource/ui/charinfoloadoutsubpanel.res index 4a97712..a12b20a 100644 --- a/resource/ui/charinfoloadoutsubpanel.res +++ b/resource/ui/charinfoloadoutsubpanel.res @@ -42,7 +42,7 @@ "wide" "60" "tall" "120" "autoResize" "0" - "pinCorner" "2" + "pinCorner" "0" "visible" "1" "enabled" "1" "tabPosition" "0" @@ -68,7 +68,7 @@ "wide" "60" "tall" "120" "autoResize" "0" - "pinCorner" "2" + "pinCorner" "0" "visible" "1" "enabled" "1" "tabPosition" "0" @@ -94,7 +94,7 @@ "wide" "60" "tall" "120" "autoResize" "0" - "pinCorner" "2" + "pinCorner" "0" "visible" "1" "enabled" "1" "tabPosition" "0" @@ -120,7 +120,7 @@ "wide" "60" "tall" "120" "autoResize" "0" - "pinCorner" "2" + "pinCorner" "0" "visible" "1" "enabled" "1" "tabPosition" "0" @@ -146,7 +146,7 @@ "wide" "60" "tall" "120" "autoResize" "0" - "pinCorner" "2" + "pinCorner" "0" "visible" "1" "enabled" "1" "tabPosition" "0" @@ -172,7 +172,7 @@ "wide" "60" "tall" "120" "autoResize" "0" - "pinCorner" "2" + "pinCorner" "0" "visible" "1" "enabled" "1" "tabPosition" "0" @@ -198,7 +198,7 @@ "wide" "60" "tall" "120" "autoResize" "0" - "pinCorner" "2" + "pinCorner" "0" "visible" "1" "enabled" "1" "tabPosition" "0" @@ -224,7 +224,7 @@ "wide" "60" "tall" "120" "autoResize" "0" - "pinCorner" "2" + "pinCorner" "0" "visible" "1" "enabled" "1" "tabPosition" "0" @@ -250,7 +250,7 @@ "wide" "60" "tall" "120" "autoResize" "0" - "pinCorner" "2" + "pinCorner" "0" "visible" "1" "enabled" "1" "tabPosition" "0" diff --git a/resource/ui/classloadoutpanel.res b/resource/ui/classloadoutpanel.res index 0adacc6..4f82713 100644 --- a/resource/ui/classloadoutpanel.res +++ b/resource/ui/classloadoutpanel.res @@ -219,7 +219,7 @@ "noitem_textcolor" "TextColor" "PaintBackgroundType" "2" "paintborder" "1" - "text_ypos" "0" + "text_ypos" "15" "text_center" "1" "model_hide" "1" "resize_to_text" "1" @@ -229,8 +229,8 @@ { "font" "ItemFontAttribLarge" "xpos" "0" - "ypos" "30" - "zpos" "101" + "ypos" "0" + "zpos" "2" "wide" "140" "tall" "60" "autoResize" "0" @@ -250,7 +250,7 @@ "fieldName" "PassiveAttribsLabel" "font" "ItemFontAttribLarge" "xpos" "c-135" - "ypos" "128" + "ypos" "125" "zpos" "0" "wide" "270" "tall" "240" diff --git a/resource/ui/disguise_menu/hudmenuspydisguise.res b/resource/ui/disguise_menu/hudmenuspydisguise.res index cb32874..d2aab9e 100644 --- a/resource/ui/disguise_menu/hudmenuspydisguise.res +++ b/resource/ui/disguise_menu/hudmenuspydisguise.res @@ -2,26 +2,28 @@ { "MainBackground" { - "ControlName" "EditablePanel" + "ControlName" "CIconPanel" "fieldName" "MainBackground" - "xpos" "0" - "ypos" "20" - "zpos" "1" - "wide" "100" - "tall" "150" + "xpos" "9999" + "ypos" "9999" + "zpos" "0" + "wide" "470" + "tall" "170" "visible" "1" "enabled" "1" - "paintbackground" "0" + "scaleImage" "1" + "icon" "hud_menu_bg" + "iconColor" "White" } "TitleLabel" { "ControlName" "CExLabel" "fieldName" "TitleLabel" - "font" "CerbeticaBold32" + "font" "CerbeticaBold28" "xpos" "10" "ypos" "0" - "zpos" "2" + "zpos" "3" "wide" "380" "tall" "30" "autoResize" "0" @@ -29,7 +31,7 @@ "visible" "1" "enabled" "1" "labelText" "#Hud_Menu_Disguise_Title" - "textAlignment" "Left" + "textAlignment" "west" "dulltext" "0" "brighttext" "0" } @@ -38,11 +40,11 @@ { "ControlName" "CExLabel" "fieldName" "TitleLabelDropshadow" - "font" "CerbeticaBold32" + "font" "CerbeticaBold28" "fgcolor" "TransparentBlack" "xpos" "-2" "ypos" "-2" - "zpos" "1" + "zpos" "3" "wide" "380" "tall" "30" "autoResize" "0" @@ -50,7 +52,7 @@ "visible" "1" "enabled" "1" "labelText" "#Hud_Menu_Disguise_Title" - "textAlignment" "Left" + "textAlignment" "west" "dulltext" "1" "brighttext" "0" @@ -63,18 +65,18 @@ { "ControlName" "CExLabel" "fieldName" "ToggleLabel" - "font" "Cerbetica12" + "font" "TextTooltipFont" "xpos" "0" - "ypos" "175" + "ypos" "165" "zpos" "2" - "wide" "200" + "wide" "100" "tall" "15" "autoResize" "0" "pinCorner" "0" "visible" "1" "enabled" "1" "labelText" "#Hud_Menu_Spy_Minus_Toggle" - "textAlignment" "Left" + "textAlignment" "center" "dulltext" "0" "brighttext" "0" } @@ -86,8 +88,8 @@ "font" "SpectatorKeyHints" "xpos" "9999" "ypos" "9999" - "zpos" "1" - "wide" "200" + "zpos" "2" + "wide" "300" "tall" "13" "autoResize" "0" "pinCorner" "0" @@ -104,7 +106,7 @@ "ControlName" "EditablePanel" "fieldName" "class_item_red_1" "xpos" "10" - "ypos" "30" + "ypos" "25" "zpos" "2" "wide" "80" "tall" "16" @@ -116,7 +118,7 @@ "ControlName" "EditablePanel" "fieldName" "class_item_blue_1" "xpos" "10" - "ypos" "30" + "ypos" "25" "zpos" "2" "wide" "80" "tall" "16" @@ -128,7 +130,7 @@ "ControlName" "EditablePanel" "fieldName" "class_item_red_2" "xpos" "10" - "ypos" "45" + "ypos" "40" "zpos" "2" "wide" "80" "tall" "16" @@ -140,7 +142,7 @@ "ControlName" "EditablePanel" "fieldName" "class_item_blue_2" "xpos" "10" - "ypos" "45" + "ypos" "40" "zpos" "2" "wide" "80" "tall" "16" @@ -152,7 +154,7 @@ "ControlName" "EditablePanel" "fieldName" "class_item_red_3" "xpos" "10" - "ypos" "60" + "ypos" "55" "zpos" "2" "wide" "80" "tall" "16" @@ -164,7 +166,7 @@ "ControlName" "EditablePanel" "fieldName" "class_item_blue_3" "xpos" "10" - "ypos" "60" + "ypos" "55" "zpos" "2" "wide" "80" "tall" "16" @@ -176,7 +178,7 @@ "ControlName" "EditablePanel" "fieldName" "class_item_red_4" "xpos" "10" - "ypos" "75" + "ypos" "70" "zpos" "2" "wide" "80" "tall" "16" @@ -188,7 +190,7 @@ "ControlName" "EditablePanel" "fieldName" "class_item_blue_4" "xpos" "10" - "ypos" "75" + "ypos" "70" "zpos" "2" "wide" "80" "tall" "16" @@ -200,7 +202,7 @@ "ControlName" "EditablePanel" "fieldName" "class_item_red_5" "xpos" "10" - "ypos" "90" + "ypos" "85" "zpos" "2" "wide" "80" "tall" "16" @@ -212,7 +214,7 @@ "ControlName" "EditablePanel" "fieldName" "class_item_blue_5" "xpos" "10" - "ypos" "90" + "ypos" "85" "zpos" "2" "wide" "80" "tall" "16" @@ -224,7 +226,7 @@ "ControlName" "EditablePanel" "fieldName" "class_item_red_6" "xpos" "10" - "ypos" "105" + "ypos" "100" "zpos" "2" "wide" "80" "tall" "16" @@ -236,7 +238,7 @@ "ControlName" "EditablePanel" "fieldName" "class_item_blue_6" "xpos" "10" - "ypos" "105" + "ypos" "100" "zpos" "2" "wide" "80" "tall" "16" @@ -248,7 +250,7 @@ "ControlName" "EditablePanel" "fieldName" "class_item_red_7" "xpos" "10" - "ypos" "120" + "ypos" "115" "zpos" "2" "wide" "80" "tall" "16" @@ -260,7 +262,7 @@ "ControlName" "EditablePanel" "fieldName" "class_item_blue_7" "xpos" "10" - "ypos" "120" + "ypos" "115" "zpos" "2" "wide" "80" "tall" "16" @@ -272,7 +274,7 @@ "ControlName" "EditablePanel" "fieldName" "class_item_red_8" "xpos" "10" - "ypos" "135" + "ypos" "130" "zpos" "2" "wide" "80" "tall" "16" @@ -284,7 +286,7 @@ "ControlName" "EditablePanel" "fieldName" "class_item_blue_8" "xpos" "10" - "ypos" "135" + "ypos" "130" "zpos" "2" "wide" "80" "tall" "16" @@ -296,7 +298,7 @@ "ControlName" "EditablePanel" "fieldName" "class_item_red_9" "xpos" "10" - "ypos" "150" + "ypos" "145" "zpos" "2" "wide" "80" "tall" "16" @@ -308,7 +310,7 @@ "ControlName" "EditablePanel" "fieldName" "class_item_blue_9" "xpos" "10" - "ypos" "150" + "ypos" "145" "zpos" "2" "wide" "80" "tall" "16" @@ -338,7 +340,7 @@ "font" "CerbeticaBold20" "fgcolor" "White" "xpos" "10" - "ypos" "45" + "ypos" "40" "zpos" "5" "wide" "15" "tall" "15" @@ -375,7 +377,7 @@ "font" "CerbeticaBold20" "fgcolor" "White" "xpos" "10" - "ypos" "90" + "ypos" "85" "zpos" "5" "wide" "15" "tall" "15" @@ -412,7 +414,7 @@ "font" "CerbeticaBold20" "fgcolor" "White" "xpos" "10" - "ypos" "135" + "ypos" "130" "zpos" "5" "wide" "15" "tall" "15" @@ -431,10 +433,10 @@ "ControlName" "EditablePanel" "fieldName" "MenuBG" "xpos" "0" - "ypos" "20" + "ypos" "22" "zpos" "1" "wide" "100" - "tall" "155" + "tall" "145" "visible" "1" "enabled" "1" "bgcolor_override" "TransparentBlack" diff --git a/resource/ui/econ/inspectionpanel.res b/resource/ui/econ/inspectionpanel.res index 58cd2e1..a13250f 100644 --- a/resource/ui/econ/inspectionpanel.res +++ b/resource/ui/econ/inspectionpanel.res @@ -218,12 +218,11 @@ "wide" "300" "tall" "100" "zpos" "100" - //"paintborder" "0" - "border" "NoBorder" - "mouseinputenabled" "1" - "proportionaltoparent" "1" "visible" "0" "bgcolor_override" "DarkerGrey" + "border" "NoBorder" + "mouseinputenabled" "1" + "proportionaltoparent" "1" "fixed_item" { diff --git a/resource/ui/freezepanel_basic.res b/resource/ui/freezepanel_basic.res index ff8e67d..ff7cc5f 100644 --- a/resource/ui/freezepanel_basic.res +++ b/resource/ui/freezepanel_basic.res @@ -139,7 +139,7 @@ "ControlName" "Label" "fieldName" "FreezeLabel" "font" "Cerbetica12" - "xpos" "40" + "xpos" "25" "ypos" "15" "zpos" "1" "wide" "198" @@ -149,7 +149,7 @@ "visible" "1" "enabled" "1" "labelText" "#FreezePanel_Killer" - "textAlignment" "west" + "textAlignment" "center" "dulltext" "0" "brighttext" "0" } diff --git a/resource/ui/freezepanelkillerhealth.res b/resource/ui/freezepanelkillerhealth.res index 4359cb8..b35f8d5 100644 --- a/resource/ui/freezepanelkillerhealth.res +++ b/resource/ui/freezepanelkillerhealth.res @@ -40,10 +40,10 @@ "enabled" "0" } - "PlayerStatusHealthValueFreezePanel" + "GuiPlayerHealth" { "ControlName" "CExLabel" - "fieldName" "PlayerStatusHealthValueFreezePanel" + "fieldName" "GuiPlayerHealth" "xpos" "3" "ypos" "3" "zpos" "5" @@ -56,10 +56,10 @@ "labeltext" "%Health%" } - "PlayerStatusHealthValueFreezePanelShadow" + "GuiPlayerHealthShadow" { "ControlName" "CExLabel" - "fieldName" "PlayerStatusHealthValueFreezePanelShadow" + "fieldName" "GuiPlayerHealthShadow" "xpos" "4" "ypos" "4" "zpos" "5" diff --git a/resource/ui/hudmediccharge.res b/resource/ui/hudmediccharge.res index f1a6c5a..e08076c 100644 --- a/resource/ui/hudmediccharge.res +++ b/resource/ui/hudmediccharge.res @@ -218,6 +218,20 @@ "pin_to_sibling_corner" "PIN_TOPRIGHT" } + "HealthClusterIcon" + { + "ControlName" "ImagePanel" + "fieldName" "HealthClusterIcon" + "xpos" "0" + "ypos" "0" + "wide" "25" + "tall" "25" + "visible" "0" + "enabled" "0" + "image" "../hud/ico_health_cluster" + "scaleImage" "1" + } + "ResistIconAnchor" { "ControlName" "EditablePanel" diff --git a/resource/ui/hudobjectivetimepanel.res b/resource/ui/hudobjectivetimepanel.res index cee5983..aaea503 100644 --- a/resource/ui/hudobjectivetimepanel.res +++ b/resource/ui/hudobjectivetimepanel.res @@ -82,7 +82,7 @@ "ControlName" "CExLabel" "fieldName" "OvertimeLabel" "xpos" "25" - "ypos" "20" + "ypos" "32" "zpos" "5" "wide" "50" "tall" "24" diff --git a/resource/ui/itemrenameconfirmationdialog.res b/resource/ui/itemrenameconfirmationdialog.res index 44b96a1..ef39d95 100644 --- a/resource/ui/itemrenameconfirmationdialog.res +++ b/resource/ui/itemrenameconfirmationdialog.res @@ -74,11 +74,13 @@ "text_ypos" "100" // Hide it off the bottom "text_center" "1" "name_only" "1" + "paint_icon_hide" "1" "itemmodelpanel" { "use_item_rendertarget" "0" "allow_rot" "0" + "inventory_image_type" "1" } } "SubjectBG" diff --git a/resource/ui/mapinfomenu.res b/resource/ui/mapinfomenu.res index ea7cd16..af4f992 100644 --- a/resource/ui/mapinfomenu.res +++ b/resource/ui/mapinfomenu.res @@ -46,7 +46,7 @@ "enabled" "1" "labelText" "%mapname%" "textAlignment" "center" - "font" "Cerbetica24" + "font" "HudFontMedium" "fgcolor" "TanLight" } @@ -123,7 +123,7 @@ "brighttext" "0" "command" "continue" "default" "1" - "font" "Cerbetica24" + "font" "HudFontMedium" "paintbackground" "0" "fgcolor" "TanLight" @@ -158,7 +158,7 @@ "dulltext" "0" "brighttext" "0" "command" "back" - "font" "Cerbetica24" + "font" "HudFontMedium" "paintbackground" "0" "fgcolor" "TanLight" diff --git a/resource/ui/spectatorguihealth.res b/resource/ui/spectatorguihealth.res index 2a09454..7966917 100644 --- a/resource/ui/spectatorguihealth.res +++ b/resource/ui/spectatorguihealth.res @@ -42,10 +42,10 @@ "scaleImage" "1" } - "PlayerStatusHealthValue" + "GuiPlayerHealth" { "ControlName" "CExLabel" - "fieldName" "PlayerStatusHealthValue" + "fieldName" "GuiPlayerHealth" "xpos" "2" "ypos" "19" "zpos" "5" @@ -59,10 +59,10 @@ "fgcolor" "Health Normal" } - "PlayerStatusHealthValueShadow" + "GuiPlayerHealthShadow" { "ControlName" "CExLabel" - "fieldName" "PlayerStatusHealthValueShadow" + "fieldName" "GuiPlayerHealthShadow" "xpos" "-1" "ypos" "-1" "zpos" "5" @@ -75,7 +75,7 @@ "font" "CerbeticaBold16" "fgcolor" "TransparentBlack" - "pin_to_sibling" "PlayerStatusHealthValue" + "pin_to_sibling" "GuiPlayerHealth" "pin_corner_to_sibling" "PIN_TOPLEFT" "pin_to_sibling_corner" "PIN_TOPLEFT" } diff --git a/resource/ui/spectatortournamentguihealth.res b/resource/ui/spectatortournamentguihealth.res index 9fa2ee1..92aebb2 100644 --- a/resource/ui/spectatortournamentguihealth.res +++ b/resource/ui/spectatortournamentguihealth.res @@ -38,10 +38,10 @@ "image" "" } - "PlayerStatusHealthValueSpectator" + "GuiPlayerHealth" { "ControlName" "CExLabel" - "fieldName" "PlayerStatusHealthValueSpectator" + "fieldName" "GuiPlayerHealth" "xpos" "0" "ypos" "0" "zpos" "5" @@ -55,10 +55,10 @@ "fgcolor" "Spec Health Normal" } - "PlayerStatusHealthValueSpectatorBG" + "GuiPlayerHealthShadow" { "ControlName" "CExLabel" - "fieldName" "PlayerStatusHealthValueSpectatorBG" + "fieldName" "GuiPlayerHealthShadow" "xpos" "2" "ypos" "2" "zpos" "4" @@ -69,6 +69,10 @@ "labelText" "%Health%" "textAlignment" "center" "font" "CerbeticaBold16" - "fgcolor" "0 0 0 100" + "fgcolor" "TransparentBlack" + + "pin_to_sibling" "GuiPlayerHealth" + "pin_corner_to_sibling" "PIN_TOPLEFT" + "pin_to_sibling_corner" "PIN_TOPLEFT" } }
\ No newline at end of file diff --git a/resource/ui/targetid.res b/resource/ui/targetid.res index 2735424..af5ba4b 100644 --- a/resource/ui/targetid.res +++ b/resource/ui/targetid.res @@ -9,11 +9,9 @@ "zpos" "6" "wide" "600" "tall" "14" - "autoResize" "0" - "pinCorner" "0" "visible" "1" "enabled" "1" - "fillcolor" "0 0 0 220" + "fillcolor" "TransparentBlack" } "TargetBackground2" @@ -54,18 +52,16 @@ "TargetIDBG_Spec_Blue" { - "ControlName" "ScalableImagePanel" + "ControlName" "ImagePanel" "fieldName" "TargetIDBG_Spec_Blue" "xpos" "0" "ypos" "43" "zpos" "6" "wide" "252" "tall" "10" - "autoResize" "0" - "pinCorner" "0" "visible" "0" "enabled" "1" - "image" "../hud/color_panel_blu" + "fillcolor" "0 28 162 255" "src_corner_height" "23" "src_corner_width" "23" @@ -75,18 +71,16 @@ "TargetIDBG_Spec_Red" { - "ControlName" "ScalableImagePanel" + "ControlName" "ImagePanel" "fieldName" "TargetIDBG_Spec_Red" "xpos" "0" "ypos" "43" "zpos" "6" "wide" "252" "tall" "10" - "autoResize" "0" - "pinCorner" "0" "visible" "0" "enabled" "1" - "image" "../hud/color_panel_red" + "fillcolor" "192 28 0 255" "src_corner_height" "23" "src_corner_width" "23" @@ -207,8 +201,8 @@ "scaleImage" "1" "pin_to_sibling" "KillStreakAnchor" - "pin_corner_to_sibling" "1" - "pin_to_sibling_corner" "1" + "pin_corner_to_sibling" "PIN_TOPRIGHT" + "pin_to_sibling_corner" "PIN_TOPRIGHT" } "MoveableSubPanel" diff --git a/resource/ui/testitemroot.res b/resource/ui/testitemroot.res index 5253019..5d04e8e 100644 --- a/resource/ui/testitemroot.res +++ b/resource/ui/testitemroot.res @@ -70,7 +70,7 @@ "ControlName" "CheckButton" "fieldName" "ClassCheckBox0" "labelText" "#IT_Classes_All" - "Font" "ItemFontAttribSmall" + "Font" "HudFontSmallestBold" "textAlignment" "west" "xpos" "45" "ypos" "15" @@ -83,14 +83,14 @@ "enabled" "1" "dulltext" "0" "brighttext" "0" - "disabledfgcolor2_override" "TextColor" + "disabledfgcolor2_override" "ItemFlags" } "ClassCheckBox1" { "ControlName" "CheckButton" "fieldName" "ClassCheckBox1" "labelText" "#TF_Class_Name_Scout" - "Font" "ItemFontAttribSmall" + "Font" "HudFontSmallestBold" "textAlignment" "west" "xpos" "145" "ypos" "15" @@ -103,14 +103,14 @@ "enabled" "1" "dulltext" "0" "brighttext" "0" - "disabledfgcolor2_override" "TextColor" + "disabledfgcolor2_override" "ItemFlags" } "ClassCheckBox2" { "ControlName" "CheckButton" "fieldName" "ClassCheckBox2" "labelText" "#TF_Class_Name_Sniper" - "Font" "ItemFontAttribSmall" + "Font" "HudFontSmallestBold" "textAlignment" "west" "xpos" "220" "ypos" "15" @@ -123,14 +123,14 @@ "enabled" "1" "dulltext" "0" "brighttext" "0" - "disabledfgcolor2_override" "TextColor" + "disabledfgcolor2_override" "ItemFlags" } "ClassCheckBox3" { "ControlName" "CheckButton" "fieldName" "ClassCheckBox3" "labelText" "#TF_Class_Name_Soldier" - "Font" "ItemFontAttribSmall" + "Font" "HudFontSmallestBold" "textAlignment" "west" "xpos" "295" "ypos" "15" @@ -150,7 +150,7 @@ "ControlName" "CheckButton" "fieldName" "ClassCheckBox4" "labelText" "#TF_Class_Name_Demoman" - "Font" "ItemFontAttribSmall" + "Font" "HudFontSmallestBold" "textAlignment" "west" "xpos" "145" "ypos" "40" @@ -170,7 +170,7 @@ "ControlName" "CheckButton" "fieldName" "ClassCheckBox5" "labelText" "#TF_Class_Name_Medic" - "Font" "ItemFontAttribSmall" + "Font" "HudFontSmallestBold" "textAlignment" "west" "xpos" "220" "ypos" "40" @@ -190,7 +190,7 @@ "ControlName" "CheckButton" "fieldName" "ClassCheckBox6" "labelText" "#TF_Class_Name_HWGuy" - "Font" "ItemFontAttribSmall" + "Font" "HudFontSmallestBold" "textAlignment" "west" "xpos" "295" "ypos" "40" @@ -210,7 +210,7 @@ "ControlName" "CheckButton" "fieldName" "ClassCheckBox7" "labelText" "#TF_Class_Name_Pyro" - "Font" "ItemFontAttribSmall" + "Font" "HudFontSmallestBold" "textAlignment" "west" "xpos" "145" "ypos" "65" @@ -230,7 +230,7 @@ "ControlName" "CheckButton" "fieldName" "ClassCheckBox8" "labelText" "#TF_Class_Name_Spy" - "Font" "ItemFontAttribSmall" + "Font" "HudFontSmallestBold" "textAlignment" "west" "xpos" "220" "ypos" "65" @@ -250,7 +250,7 @@ "ControlName" "CheckButton" "fieldName" "ClassCheckBox9" "labelText" "#TF_Class_Name_Engineer" - "Font" "ItemFontAttribSmall" + "Font" "HudFontSmallestBold" "textAlignment" "west" "xpos" "295" "ypos" "65" @@ -318,7 +318,7 @@ { "ControlName" "CExLabel" "fieldName" "TestItemEntry0" - "font" "ItemFontAttribSmall" + "font" "HudFontSmallestBold" "labelText" "#IT_TestingSlot_Empty" "textAlignment" "center" "xpos" "95" @@ -330,7 +330,7 @@ "pinCorner" "0" "visible" "1" "enabled" "1" - "fgcolor_override" "200 80 60 255" + "fgcolor_override" "LightRed" "bgcolor_override" "24 24 24 128" } "TestItemButton0" @@ -385,7 +385,7 @@ { "ControlName" "CExLabel" "fieldName" "TestingHeadgearLabel" - "font" "HudFontSmallest" + "font" "HudFontSmallestBold" "labelText" "#IT_TestingSlot_Headgear" "textAlignment" "east" "xpos" "0" @@ -402,7 +402,7 @@ { "ControlName" "CExLabel" "fieldName" "TestItemEntry1" - "font" "ItemFontAttribSmall" + "font" "HudFontSmallestBold" "labelText" "#IT_TestingSlot_Empty" "textAlignment" "center" "xpos" "95" @@ -414,7 +414,7 @@ "pinCorner" "0" "visible" "1" "enabled" "1" - "fgcolor_override" "200 80 60 255" + "fgcolor_override" "LightRed" "bgcolor_override" "24 24 24 128" } "TestItemButton1" @@ -469,7 +469,7 @@ { "ControlName" "CExLabel" "fieldName" "TestingMisc1Label" - "font" "HudFontSmallest" + "font" "HudFontSmallestBold" "labelText" "#IT_TestingSlot_Misc1" "textAlignment" "east" "xpos" "0" @@ -486,7 +486,7 @@ { "ControlName" "CExLabel" "fieldName" "TestItemEntry2" - "font" "ItemFontAttribSmall" + "font" "HudFontSmallestBold" "labelText" "#IT_TestingSlot_Empty" "textAlignment" "center" "xpos" "95" @@ -498,7 +498,7 @@ "pinCorner" "0" "visible" "1" "enabled" "1" - "fgcolor_override" "200 80 60 255" + "fgcolor_override" "LightRed" "bgcolor_override" "24 24 24 128" } "TestItemButton2" @@ -553,7 +553,7 @@ { "ControlName" "CExLabel" "fieldName" "TestingMisc2Label" - "font" "HudFontSmallest" + "font" "HudFontSmallestBold" "labelText" "#IT_TestingSlot_Misc2" "textAlignment" "east" "xpos" "0" @@ -570,7 +570,7 @@ { "ControlName" "CExLabel" "fieldName" "TestItemEntry3" - "font" "ItemFontAttribSmall" + "font" "HudFontSmallestBold" "labelText" "#IT_TestingSlot_Empty" "textAlignment" "center" "xpos" "95" @@ -582,7 +582,7 @@ "pinCorner" "0" "visible" "1" "enabled" "1" - "fgcolor_override" "200 80 60 255" + "fgcolor_override" "LightRed" "bgcolor_override" "24 24 24 128" } "TestItemButton3" @@ -670,7 +670,7 @@ "ControlName" "CheckButton" "fieldName" "AutoAddBotsCheckBox" "labelText" "#IT_Bot_AutoAdd" - "Font" "ItemFontAttribSmall" + "Font" "HudFontSmallestBold" "textAlignment" "west" "xpos" "10" "ypos" "20" @@ -691,7 +691,7 @@ "ControlName" "CheckButton" "fieldName" "AutoAddBotsCheckBox" "labelText" "#IT_Bot_BlueTeam" - "Font" "ItemFontAttribSmall" + "Font" "HudFontSmallestBold" "textAlignment" "west" "xpos" "110" "ypos" "20" @@ -736,7 +736,7 @@ { "ControlName" "ComboBox" "fieldName" "BotSelectionComboBox" - "Font" "HudFontSmallest" + "Font" "HudFontSmallestBold" "xpos" "95" "ypos" "45" "zpos" "1" diff --git a/resource/ui/textwindow.res b/resource/ui/textwindow.res index 6d8c379..4a4e509 100644 --- a/resource/ui/textwindow.res +++ b/resource/ui/textwindow.res @@ -49,7 +49,7 @@ "textAlignment" "center" "dulltext" "0" "brighttext" "0" - "font" "Cerbetica24" + "font" "HudFontMedium" "fgcolor" "TanLight" } @@ -118,7 +118,7 @@ "wrap" "0" "command" "okay" "default" "1" - "font" "Cerbetica24" + "font" "HudFontMedium" "paintbackground" "0" "fgcolor" "TanLight" diff --git a/resource/ui/wavestatuspanel.res b/resource/ui/wavestatuspanel.res index 54a9b4a..e1a1df9 100644 --- a/resource/ui/wavestatuspanel.res +++ b/resource/ui/wavestatuspanel.res @@ -45,8 +45,8 @@ "fieldName" "WaveCountLabelShadow" "font" "CerbeticaBold16" "fgcolor" "TransparentBlack" - "xpos" "-2" - "ypos" "-2" + "xpos" "-1" + "ypos" "-1" "zpos" "3" "wide" "200" "tall" "15" diff --git a/resource/ui/winpanel.res b/resource/ui/winpanel.res index 00c23eb..b06b977 100644 --- a/resource/ui/winpanel.res +++ b/resource/ui/winpanel.res @@ -64,7 +64,7 @@ { "ControlName" "CExLabel" "fieldName" "BlueTeamScore" - "font" "Cerbetica48" + "font" "CerbeticaBold40" "labelText" "%blueteamscore%" "textAlignment" "east" "xpos" "15" @@ -81,7 +81,7 @@ { "ControlName" "CExLabel" "fieldName" "BlueTeamScoreDropshadow" - "font" "Cerbetica48" + "font" "CerbeticaBold40" "fgcolor" "TransparentBlack" "labelText" "%blueteamscore%" "textAlignment" "east" @@ -138,7 +138,7 @@ { "ControlName" "CExLabel" "fieldName" "RedTeamScore" - "font" "Cerbetica48" + "font" "CerbeticaBold40" "labelText" "%redteamscore%" "textAlignment" "west" "xpos" "105" @@ -155,7 +155,7 @@ { "ControlName" "CExLabel" "fieldName" "RedTeamScoreDropshadow" - "font" "Cerbetica48" + "font" "CerbeticaBold40" "fgcolor" "TransparentBlack" "labelText" "%redteamscore%" "textAlignment" "west" @@ -208,21 +208,18 @@ } "WinPanelBG2" { - "ControlName" "ImagePanel" + "ControlName" "EditablePanel" "fieldName" "WinPanelBG2" "xpos" "0" "ypos" "55" - "zpos" "0" + "zpos" "-3" "wide" "300" "tall" "152" "visible" "1" "enabled" "1" - "scaleImage" "1" - "fillcolor" "0 0 0 250" - "src_corner_height" "3" - "src_corner_width" "3" - "draw_corner_width" "0" - "draw_corner_height" "0" + "paintborder" "0" + "bgcolor_override" "0 0 0 250" + "PaintBackgroundType" "2" } "WinningTeamLabel" { @@ -256,8 +253,8 @@ "tall" "40" "autoResize" "0" "pinCorner" "0" - "visible" "1" - "enabled" "1" + "visible" "0" + "enabled" "0" "labelText" "%WinningTeamLabel%" "textAlignment" "Center" "dulltext" "0" @@ -321,7 +318,7 @@ { "ControlName" "CExLabel" "fieldName" "DetailsLabel" - "font" "Cerbetica9" + "font" "ScoreboardVerySmall" "xpos" "10" "ypos" "82" "zpos" "1" @@ -347,7 +344,7 @@ { "ControlName" "CExLabel" "fieldName" "TopPlayerLabel" - "font" "Cerbetica9" + "font" "ScoreboardVerySmall" "xpos" "15" "ypos" "100" "zpos" "3" @@ -366,7 +363,7 @@ { "ControlName" "CExLabel" "fieldName" "PointsThisRoundLabel" - "font" "Cerbetica9" + "font" "ScoreboardVerySmall" "xpos" "45" "ypos" "100" "zpos" "3" @@ -655,7 +652,7 @@ { "ControlName" "CExLabel" "fieldName" "KillStreakLeaderLabel" - "font" "Cerbetica9" + "font" "ScoreboardVerySmall" "xpos" "15" "ypos" "164" "zpos" "3" @@ -675,7 +672,7 @@ { "ControlName" "CExLabel" "fieldName" "KillStreakMaxCountLabel" - "font" "Cerbetica9" + "font" "ScoreboardVerySmall" "xpos" "116" "ypos" "0" "zpos" "3" diff --git a/scripts/hudanimations_custom.txt b/scripts/hudanimations_custom.txt index 1e152d6..d245234 100644 --- a/scripts/hudanimations_custom.txt +++ b/scripts/hudanimations_custom.txt @@ -1,58 +1,54 @@ // Bonus Health Pulse event HudHealthBonusPulse { - Animate PlayerStatusHealthBonusImage Alpha "255" Linear 0.0 0.2 - Animate PlayerStatusHealthBonusImage Alpha "0" Linear 0.2 0.4 + Animate PlayerStatusHealthBonusImage Alpha "255" Linear 0.0 0.2 + Animate PlayerStatusHealthBonusImage Alpha "0" Linear 0.2 0.4 - Animate PlayerStatusHealthValue FgColor "Health Buff" Accel 0.0 0.0 - Animate PlayerStatusHealthValueSpectator FgColor "Health Buff" Accel 0.0 0.0 - Animate PlayerStatusHealthValueFreezePanel FgColor "Health Buff" Accel 0.0 0.0 + Animate PlayerStatusHealthValue FgColor "Health Buff" Accel 0.0 0.0 + Animate GuiPlayerHealth FgColor "Health Buff" Accel 0.0 0.0 - RunEvent HudHealthBonusPulseLoop 0.4 + RunEvent HudHealthBonusPulseLoop 0.4 } event HudHealthBonusPulseStop { - StopEvent HudHealthBonusPulse 0.0 - StopEvent HudHealthBonusPulseLoop 0.0 + StopEvent HudHealthBonusPulse 0.0 + StopEvent HudHealthBonusPulseLoop 0.0 - Animate PlayerStatusHealthValue FgColor "Health Normal" Accel 0.0 0.0 - Animate PlayerStatusHealthValueSpectator FgColor "Health Normal" Accel 0.0 0.0 - Animate PlayerStatusHealthValueFreezePanel FgColor "Health Normal" Accel 0.0 0.0 + Animate PlayerStatusHealthValue FgColor "Health Normal" Accel 0.0 0.0 + Animate GuiPlayerHealth FgColor "Health Normal" Accel 0.0 0.0 } //================================================================================== // Low Health Pulse event HudHealthDyingPulse { - Animate PlayerStatusHealthBonusImage Alpha "255" Linear 0.0 0.2 - Animate PlayerStatusHealthBonusImage Alpha "0" Linear 0.2 0.2 + Animate PlayerStatusHealthBonusImage Alpha "255" Linear 0.0 0.2 + Animate PlayerStatusHealthBonusImage Alpha "0" Linear 0.2 0.2 - Animate PlayerStatusHealthValue FgColor "Health Hurt" Accel 0.0 0.0 - Animate PlayerStatusHealthValueSpectator FgColor "Health Hurt" Accel 0.0 0.0 - Animate PlayerStatusHealthValueFreezePanel FgColor "Health Hurt" Accel 0.0 0.0 + Animate PlayerStatusHealthValue FgColor "Health Hurt" Accel 0.0 0.0 + Animate GuiPlayerHealth FgColor "Health Hurt" Accel 0.0 0.0 - RunEvent HudHealthDyingPulseLoop 0.4 + RunEvent HudHealthDyingPulseLoop 0.4 } event HudHealthDyingPulseStop { - StopEvent HudHealthDyingPulse 0.0 - StopEvent HudHealthDyingPulseLoop 0.0 + StopEvent HudHealthDyingPulse 0.0 + StopEvent HudHealthDyingPulseLoop 0.0 - Animate PlayerStatusHealthValue FgColor "Health Normal" Accel 0.0 0.0 - Animate PlayerStatusHealthValueSpectator FgColor "Health Normal" Accel 0.0 0.0 - Animate PlayerStatusHealthValueFreezePanel FgColor "Health Normal" Accel 0.0 0.0 + Animate PlayerStatusHealthValue FgColor "Health Normal" Accel 0.0 0.0 + Animate GuiPlayerHealth FgColor "Health Normal" Accel 0.0 0.0 } //================================================================================== // Low Ammo Pulse event HudLowAmmoPulse { - Animate HudWeaponLowAmmoImage Alpha "255" Linear 0.0 0.075 - Animate HudWeaponLowAmmoImage Alpha "0" Linear 0.125 0.075 + Animate HudWeaponLowAmmoImage Alpha "255" Linear 0.0 0.075 + Animate HudWeaponLowAmmoImage Alpha "0" Linear 0.125 0.075 - Animate AmmoInClip FgColor "Ammo In Clip Low" Linear 0.0 0.0 - Animate AmmoInReserve FgColor "Ammo In Reserve Low" Linear 0.0 0.0 - Animate AmmoNoClip FgColor "Ammo In Clip Low" Linear 0.0 0.0 + Animate AmmoInClip FgColor "Ammo In Clip Low" Linear 0.0 0.0 + Animate AmmoInReserve FgColor "Ammo In Reserve Low" Linear 0.0 0.0 + Animate AmmoNoClip FgColor "Ammo In Clip Low" Linear 0.0 0.0 RunEvent HudLowAmmoPulseLoop 0.4 } @@ -62,16 +58,16 @@ event HudLowAmmoPulseStop StopEvent HudLowAmmoPulse 0.0 StopEvent HudLowAmmoPulseLoop 0.0 - Animate AmmoInClip FgColor "Ammo In Clip" Accel 0.0 0.0 - Animate AmmoInReserve FgColor "Ammo In Reserve" Accel 0.0 0.0 - Animate AmmoNoClip FgColor "Ammo In Clip" Accel 0.0 0.0 + Animate AmmoInClip FgColor "Ammo In Clip" Accel 0.0 0.0 + Animate AmmoInReserve FgColor "Ammo In Reserve" Accel 0.0 0.0 + Animate AmmoNoClip FgColor "Ammo In Clip" Accel 0.0 0.0 } //================================================================================== // Ubercharge Meters event HudMedicCharged { RunEvent HudMedicOrangePulseCharge 0.0 -// RunEvent HudMedicSolidColorCharge 0.0 +// RunEvent HudMedicSolidColorCharge 0.0 // RunEvent HudMedicRainbowCharged 0.0 RunEvent HudMedicChargedLoop 0.6 @@ -79,39 +75,39 @@ event HudMedicCharged event HudMedicRainbowCharged { - Animate ChargeLabel FgColor "ColorGreen" Linear 0.0 0.1 - Animate ChargeLabel FgColor "ColorCyan" Linear 0.1 0.1 - Animate ChargeLabel FgColor "ColorBlue" Linear 0.2 0.1 - Animate ChargeLabel FgColor "ColorMagenta" Linear 0.3 0.1 - Animate ChargeLabel FgColor "ColorRed" Linear 0.4 0.1 - Animate ChargeLabel FgColor "ColorYellow" Linear 0.5 0.1 + Animate ChargeLabel FgColor "ColorGreen" Linear 0.0 0.1 + Animate ChargeLabel FgColor "ColorCyan" Linear 0.1 0.1 + Animate ChargeLabel FgColor "ColorBlue" Linear 0.2 0.1 + Animate ChargeLabel FgColor "ColorMagenta" Linear 0.3 0.1 + Animate ChargeLabel FgColor "ColorRed" Linear 0.4 0.1 + Animate ChargeLabel FgColor "ColorYellow" Linear 0.5 0.1 - Animate ChargeMeter FgColor "ColorGreen" Linear 0.0 0.1 - Animate ChargeMeter FgColor "ColorCyan" Linear 0.1 0.1 - Animate ChargeMeter FgColor "ColorBlue" Linear 0.2 0.1 - Animate ChargeMeter FgColor "ColorMagenta" Linear 0.3 0.1 - Animate ChargeMeter FgColor "ColorRed" Linear 0.4 0.1 - Animate ChargeMeter FgColor "ColorYellow" Linear 0.5 0.1 + Animate ChargeMeter FgColor "ColorGreen" Linear 0.0 0.1 + Animate ChargeMeter FgColor "ColorCyan" Linear 0.1 0.1 + Animate ChargeMeter FgColor "ColorBlue" Linear 0.2 0.1 + Animate ChargeMeter FgColor "ColorMagenta" Linear 0.3 0.1 + Animate ChargeMeter FgColor "ColorRed" Linear 0.4 0.1 + Animate ChargeMeter FgColor "ColorYellow" Linear 0.5 0.1 RunEvent HudMedicChargedLoop 0.6 } event HudMedicSolidColorCharge { - Animate ChargeLabel FgColor "Solid Color Uber" Linear 0.0 0.0 + Animate ChargeLabel FgColor "Solid Color Uber" Linear 0.0 0.0 - Animate ChargeMeter FgColor "Solid Color Uber" Linear 0.0 0.0 + Animate ChargeMeter FgColor "Solid Color Uber" Linear 0.0 0.0 RunEvent HudMedicChargedLoop 0.6 } event HudMedicOrangePulseCharge { - Animate ChargeLabel FgColor "Flashing Uber Color1" Linear 0.0 0.3 - Animate ChargeLabel FgColor "Flashing Uber Color2" Linear 0.3 0.3 + Animate ChargeLabel FgColor "Flashing Uber Color1" Linear 0.0 0.3 + Animate ChargeLabel FgColor "Flashing Uber Color2" Linear 0.3 0.3 - Animate ChargeMeter FgColor "Flashing Uber Color1" Linear 0.0 0.3 - Animate ChargeMeter FgColor "Flashing Uber Color2" Linear 0.3 0.3 + Animate ChargeMeter FgColor "Flashing Uber Color1" Linear 0.0 0.3 + Animate ChargeMeter FgColor "Flashing Uber Color2" Linear 0.3 0.3 RunEvent HudMedicChargedLoop 0.6 } @@ -124,8 +120,8 @@ event HudMedicChargedStop StopEvent HudMedicOrangePulseCharge 0.0 StopEvent HudMedicChargedLoop 0.0 - Animate ChargeMeter FgColor "Uber Bar Color" Linear 0.0 0.0001 - Animate ChargeLabel FgColor "Ammo In Clip" Linear 0.0 0.0001 + Animate ChargeMeter FgColor "Uber Bar Color" Linear 0.0 0.0001 + Animate ChargeLabel FgColor "Ammo In Clip" Linear 0.0 0.0001 } //================================================================================== // Hitmarker Pulse @@ -137,33 +133,35 @@ event DamagedPlayer event HitMarker { - Animate CustomCrosshair FgColor "CrosshairDamage" Linear 0.0 0.0 - Animate CustomCrosshair FgColor "Crosshair" Linear 0.15 0.0 + Animate CustomCrosshair FgColor "CrosshairDamage" Linear 0.0 0.0 + Animate CustomCrosshair FgColor "Crosshair" Linear 0.15 0.0 } //================================================================================== // Spy Disguise event HudSpyDisguiseFadeIn { -// RunEvent HudSpyDisguiseChanged 0.0 -// Animate PlayerStatusSpyImage Alpha "255" Linear 0.9 0.1 +// RunEvent HudSpyDisguiseChanged 0.0 +// Animate PlayerStatusSpyImage Alpha "255" Linear 0.9 0.1 } event HudSpyDisguiseFadeOut { -// RunEvent HudSpyDisguiseChanged 0.0 -// Animate PlayerStatusSpyImage Alpha "0" Linear 0.9 0.1 +// RunEvent HudSpyDisguiseChanged 0.0 +// Animate PlayerStatusSpyImage Alpha "0" Linear 0.9 0.1 } //================================================================================== event HudSnapShotReminderIn { - RunEvent HudHealthDyingPulseStop 10.0 - RunEvent HudHealthBonusPulseStop 10.0 - RunEvent HudLowAmmoPulseStop 10.0 - RunEvent HudMedicChargedStop 10.0 + RunEvent DefaultAnimHudSnapShotReminderIn 0.0 + + RunEvent HudHealthBonusPulseStop 0.0 + RunEvent HudHealthDyingPulseStop 0.0 + RunEvent HudLowAmmoPulseStop 0.0 + RunEvent HudMedicChargedStop 0.0 } //================================================================================== -// Do not move chat window -event CompetitiveGame_LowerChatWindow { } -event CompetitiveGame_RestoreChatWindow { } -event HudTournament_MoveChatWindow { }
\ No newline at end of file + +event CompetitiveGame_LowerChatWindow { } +event CompetitiveGame_RestoreChatWindow { } +event HudTournament_MoveChatWindow { }
\ No newline at end of file diff --git a/scripts/hudlayout.res b/scripts/hudlayout.res index a27313c..e6a8d05 100644 --- a/scripts/hudlayout.res +++ b/scripts/hudlayout.res @@ -49,7 +49,7 @@ "fieldName" "HudPlayerStatus" "visible" "1" "enabled" "1" - "xpos" "-15" + "xpos" "0" "ypos" "1" "wide" "f0" "tall" "480" @@ -262,8 +262,8 @@ "fieldName" "DisguiseStatus" "visible" "1" "enabled" "1" - "xpos" "20" - "ypos" "r50" + "xpos" "c55" + "ypos" "r40" "wide" "150" "tall" "30" } @@ -1177,11 +1177,11 @@ "ControlName" "EditablePanel" "fieldName" "HudAchievementTracker" "xpos" "5" - "NormalY" "330" + "NormalY" "300" "EngineerY" "150" "zpos" "0" "wide" "200" - "tall" "170" + "tall" "125" "visible" "1" "enabled" "1" } |