Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 33 additions & 13 deletions gamedir/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,23 +15,28 @@ set( CLIENT_FILES
ui/gfx/default_avatar.tga
ui/gfx/hud/speaker.tga
ui/gfx/hud/speaker_self.tga
ui/gfx/hud/ammo_357.tga
ui/gfx/hud/ammo_9mm.tga
ui/gfx/hud/ammo_bolt.tga
ui/gfx/hud/ammo_buckshot.tga
ui/gfx/hud/ammo_energy.tga
ui/gfx/hud/ammo_grenade_frag.tga
ui/gfx/hud/ammo_grenade_hornet.tga
ui/gfx/hud/ammo_grenade_mp5.tga
ui/gfx/hud/ammo_grenade_rpg.tga
ui/gfx/hud/ammo_grenade_satchel.tga
ui/gfx/hud/ammo_grenade_tripmine.tga
ui/gfx/hud/ammo_snark.tga
ui/gfx/hud/default_ammo.tga
ui/gfx/muted_icon32.tga
ui/gfx/vgui/800corner1.tga
ui/gfx/vgui/800corner2.tga
ui/gfx/vgui/800corner3.tga
ui/gfx/vgui/800corner4.tga

ui/resource/Chat.res
ui/resource/ChatScheme.res
ui/resource/ChatSchemeBase.res
ui/resource/ClientScheme.res
ui/resource/ClientSchemeBase.res
ui/resource/ClientSourceScheme.res
ui/resource/ClientSourceSchemeBase.res
ui/resource/MOTD.res
ui/resource/ScorePanel.res
ui/resource/SpectatorInfoPanel.res
ui/resource/TeamMenu.res
ui/resource/fonts/HemiHead426-Regular.ttf
ui/resource/fonts/HemiHead426-Linux-Regular.ttf
ui/resource/fonts/boxrocket.ttf

ui/resource/language/bugfixedhl_english.utf8.txt
ui/resource/language/bugfixedhl_russian.utf8.txt
Expand All @@ -45,8 +50,6 @@ set( CLIENT_FILES
ui/resource/language/chat_spanish.utf8.txt
ui/resource/language/chat_tchinese.utf8.txt

ui/resource/open_source_software.txt

ui/resource/options/AboutSubOptions.res
ui/resource/options/ChatSubOptions.res
ui/resource/options/ColorPicker.res
Expand All @@ -62,6 +65,23 @@ set( CLIENT_FILES
ui/resource/updater/UpdateFileReplaceDialog.res
ui/resource/updater/UpdateNotificationDialog.res

ui/resource/Chat.res
ui/resource/ChatScheme.res
ui/resource/ChatSchemeBase.res
ui/resource/ClientScheme.res
ui/resource/ClientSchemeBase.res
ui/resource/ClientSourceScheme.res
ui/resource/ClientSourceSchemeBase.res
ui/resource/HudAmmo.res
ui/resource/HudAmmoSecondary.res
ui/resource/HudBattery.res
ui/resource/HudHealth.res
ui/resource/MOTD.res
ui/resource/open_source_software.txt
ui/resource/ScorePanel.res
ui/resource/SpectatorInfoPanel.res
ui/resource/TeamMenu.res

ui/scripts/HudAnimations.txt
ui/scripts/HudLayout.res
ui/scripts/HudLayoutBase.res
Expand Down
Binary file added gamedir/ui/gfx/hud/ammo_357.tga
Binary file not shown.
Binary file added gamedir/ui/gfx/hud/ammo_9mm.tga
Binary file not shown.
Binary file added gamedir/ui/gfx/hud/ammo_bolt.tga
Binary file not shown.
Binary file added gamedir/ui/gfx/hud/ammo_buckshot.tga
Binary file not shown.
Binary file added gamedir/ui/gfx/hud/ammo_energy.tga
Binary file not shown.
Binary file added gamedir/ui/gfx/hud/ammo_grenade_frag.tga
Binary file not shown.
Binary file added gamedir/ui/gfx/hud/ammo_grenade_hornet.tga
Binary file not shown.
Binary file added gamedir/ui/gfx/hud/ammo_grenade_mp5.tga
Binary file not shown.
Binary file added gamedir/ui/gfx/hud/ammo_grenade_rpg.tga
Binary file not shown.
Binary file added gamedir/ui/gfx/hud/ammo_grenade_satchel.tga
Binary file not shown.
Binary file added gamedir/ui/gfx/hud/ammo_grenade_tripmine.tga
Binary file not shown.
Binary file added gamedir/ui/gfx/hud/ammo_snark.tga
Binary file not shown.
Binary file added gamedir/ui/gfx/hud/default_ammo.tga
Binary file not shown.
72 changes: 71 additions & 1 deletion gamedir/ui/resource/ClientSchemeBase.res
Original file line number Diff line number Diff line change
Expand Up @@ -528,6 +528,74 @@ Scheme
"symbol" "1"
}
}

// Custom fonts for VGUI2 HUD
HudNumbers
{
"1"
{
"name" "Hemi Head 426" [$WINDOWS]
"name" "Hemi Head 426 Linux" [!$WINDOWS]
"tall" "26"
"weight" "0"
"additive" "1"
"antialias" "1"
}
}
HudNumbersGlow
{
"1"
{
"name" "Hemi Head 426" [$WINDOWS]
"name" "Hemi Head 426 Linux" [!$WINDOWS]
"tall" "26"
"weight" "0"
"additive" "1"
"antialias" "1"
"blur" "4"
"scanlines" "2"
"custom" "1"
}
}
HudNumbersSmall
{
"1"
{
"name" "Hemi Head 426" [$WINDOWS]
"name" "Hemi Head 426 Linux" [!$WINDOWS]
"tall" "18"
"weight" "0"
"additive" "1"
"antialias" "1"
}
}
HudNumbersSmallGlow
{
"1"
{
"name" "Hemi Head 426" [$WINDOWS]
"name" "Hemi Head 426 Linux" [!$WINDOWS]
"tall" "18"
"weight" "0"
"additive" "1"
"antialias" "1"
"blur" "4"
"scanlines" "2"
"custom" "1"
}
}
Icons // for health, armor, etc.
{
"1"
{
"name" "BoxRocket"
"tall" "24"
"weight" "0"
"additive" "1"
"antialias" "1"
"custom" "1"
}
}
}

//
Expand Down Expand Up @@ -933,7 +1001,9 @@ Scheme
CustomFontFiles
{
"1" "resource/HALFLIFE2.ttf"

"2" "ui/resource/fonts/HemiHead426-Regular.ttf"
"3" "ui/resource/fonts/HemiHead426-Linux-Regular.ttf"
"4" "ui/resource/fonts/boxrocket.ttf"
}

}
221 changes: 221 additions & 0 deletions gamedir/ui/resource/HudAmmo.res
Original file line number Diff line number Diff line change
@@ -0,0 +1,221 @@
"ui/resource/HudAmmo.res"
{
"HudAmmoPanel"
{
"ControlName" "CHudAmmoPanel"
"fieldName" "HudAmmoPanel"
"xpos" "r120"
"ypos" "r35"
"wide" "100"
"tall" "25"
"autoResize" "0"
"pinCorner" "0"
"RoundedCorners" "15"
"pin_corner_to_sibling" "0"
"pin_to_sibling_corner" "0"
"visible" "0"
"enabled" "1"
"tabPosition" "0"
"PaintBackgroundType" "2"

"bgcolor_override" "0 0 0 96"

// Divider bar
"divider_xpos" "60"
"divider_ypos" "4"
"divider_wide" "2"
"divider_tall" "18"
"divider_offcolor" "128 128 128 96"

// Resize bar when weapon has no clip
"bar_shrink" "1"
"bar_wide" "80"
"bar_full_wide" "122"
"bar_xpos" "r100"
"bar_full_xpos" "r142"

// Ammo icon position
"ammoicon_xpos" "60"
"ammoicon_full_xpos" "102"
"ammoicon_ypos" "4"
"ammoicon_wide" "16"
"ammoicon_tall" "16"
}
"Clip"
{
"ControlName" "Label"
"fieldName" "Clip"
"fgcolor_override" "255 160 0 255"
"xpos" "4"
"ypos" "4"
"wide" "50" [$WINDOWS]
"wide" "52" [!$WINDOWS]
"tall" "20"
"autoResize" "0"
"pinCorner" "0"
"RoundedCorners" "15"
"pin_corner_to_sibling" "0"
"pin_to_sibling_corner" "0"
"visible" "1"
"enabled" "1"
"tabPosition" "0"
"Font" "HudNumbers"
"labelText" "000"
"textAlignment" "east"
"dulltext" "0"
"brighttext" "0"
"wrap" "0"
"centerwrap" "0"
"textinsetx" "5"
"textinsety" "0"
"auto_wide_tocontents" "0"
"use_proportional_insets" "0"
}
"ClipGlow"
{
"ControlName" "Label"
"fieldName" "ClipGlow"
"fgcolor_override" "255 160 0 255"
"xpos" "4"
"ypos" "4"
"wide" "50" [$WINDOWS]
"wide" "52" [!$WINDOWS]
"tall" "20"
"autoResize" "0"
"pinCorner" "0"
"RoundedCorners" "15"
"pin_corner_to_sibling" "0"
"pin_to_sibling_corner" "0"
"visible" "1"
"enabled" "1"
"tabPosition" "0"
"Font" "HudNumbersGlow"
"labelText" "000"
"textAlignment" "east"
"dulltext" "0"
"brighttext" "0"
"wrap" "0"
"centerwrap" "0"
"textinsetx" "5"
"textinsety" "0"
"auto_wide_tocontents" "0"
"use_proportional_insets" "0"
}
"ClipBg"
{
"ControlName" "Label"
"fieldName" "ClipBg"
"fgcolor_override" "128 128 128 16"
"xpos" "4"
"ypos" "4"
"wide" "50" [$WINDOWS]
"wide" "52" [!$WINDOWS]
"tall" "20"
"autoResize" "0"
"pinCorner" "0"
"pin_corner_to_sibling" "0"
"pin_to_sibling_corner" "0"
"visible" "1"
"enabled" "1"
"tabPosition" "0"
"Font" "HudNumbers"
"textAlignment" "east"
"dulltext" "0"
"brighttext" "0"
"wrap" "0"
"centerwrap" "0"
"textinsetx" "5"
"textinsety" "0"
"auto_wide_tocontents" "0"
"use_proportional_insets" "0"
}
"Ammo"
{
"ControlName" "Label"
"fieldName" "Ammo"
"fgcolor_override" "255 160 0 255"
"xpos" "50"
"ypos" "4"
"wide" "50" [$WINDOWS]
"wide" "52" [!$WINDOWS]
"tall" "20"
"autoResize" "0"
"pinCorner" "0"
"RoundedCorners" "15"
"pin_corner_to_sibling" "0"
"pin_to_sibling_corner" "0"
"visible" "1"
"enabled" "1"
"tabPosition" "0"
"Font" "HudNumbersSmall"
"labelText" "000"
"textAlignment" "east"
"dulltext" "0"
"brighttext" "0"
"wrap" "0"
"centerwrap" "0"
"textinsetx" "5"
"textinsety" "0"
"auto_wide_tocontents" "0"
"use_proportional_insets" "0"
}
"AmmoGlow"
{
"ControlName" "Label"
"fieldName" "AmmoGlow"
"fgcolor_override" "255 160 0 255"
"xpos" "50"
"ypos" "4"
"wide" "50" [$WINDOWS]
"wide" "52" [!$WINDOWS]
"tall" "20"
"autoResize" "0"
"pinCorner" "0"
"RoundedCorners" "15"
"pin_corner_to_sibling" "0"
"pin_to_sibling_corner" "0"
"visible" "1"
"enabled" "1"
"tabPosition" "0"
"Font" "HudNumbersSmallGlow"
"labelText" "000"
"textAlignment" "east"
"dulltext" "0"
"brighttext" "0"
"wrap" "0"
"centerwrap" "0"
"textinsetx" "5"
"textinsety" "0"
"auto_wide_tocontents" "0"
"use_proportional_insets" "0"
}
"AmmoBg"
{
"ControlName" "Label"
"fieldName" "AmmoBg"
"fgcolor_override" "128 128 128 16"
"xpos" "50"
"ypos" "4"
"wide" "50" [$WINDOWS]
"wide" "52" [!$WINDOWS]
"tall" "20"
"autoResize" "0"
"pinCorner" "0"
"RoundedCorners" "15"
"pin_corner_to_sibling" "0"
"pin_to_sibling_corner" "0"
"visible" "0"
"enabled" "1"
"tabPosition" "0"
"Font" "HudNumbersSmall"
"textAlignment" "east"
"dulltext" "0"
"brighttext" "0"
"wrap" "0"
"centerwrap" "0"
"textinsetx" "5"
"textinsety" "0"
"auto_wide_tocontents" "0"
"use_proportional_insets" "0"
}
}
Loading
Loading