jessieh/doghud
jessieh/doghud
1
Fork 0
mirror of https://gitlab.com/jessieh/doghud.git synced 2024-09-18 21:31:47 +00:00
Code Releases Activity

Merge changes from TF2 update (upstream)

Browse Source
This commit is contained in:
Jessie Hildebrandt 2023-01-14 17:57:35 -05:00
parent 45987b9cfc
commit be4766eb98
4 changed files with 44 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
resource/ui/matchmakingdashboardmvmcriteria.res
View File

@ -7,7 +7,7 @@
"fieldName" "MVMCriteria" "fieldName" "MVMCriteria"
"xpos" "r0" "xpos" "r0"
"ypos" "10" "ypos" "10"
"zpos" "1002" "zpos" "1003"
"wide" "420" "wide" "420"
"tall" "f70" "tall" "f70"
"visible" "1" "visible" "1"
@ -42,24 +42,21 @@
"pinCorner" "3" "pinCorner" "3"
"visible" "1" "visible" "1"
"enabled" "1" "enabled" "1"
"tabPosition" "0"
"font" "Size 18" "font" "Size 18"
"textAlignment" "center" "textAlignment" "center"
"AllCaps" "1" "AllCaps" "1"
"dulltext" "0"
"brighttext" "0"
"Command" "back" "Command" "back"
"proportionaltoparent" "1" "proportionaltoparent" "1"
"labeltext" "BACK" "labeltext" "BACK"
"mouseinputenabled" "1" "mouseinputenabled" "1"
"keyboardinputenabled" "0" "keyboardinputenabled" "0"
//"actionsignallevel" "1" //"actionsignallevel" "1"
"sound_depressed" "UI/buttonclick.wav" "sound_depressed" "UI/buttonclick.wav"
"sound_released" "UI/buttonclickrelease.wav" "sound_released" "UI/buttonclickrelease.wav"
"paintbackground" "0" "paintbackground" "0"
"border_default" "MaterialGrayDark" "border_default" "MaterialGrayDark"
"border_armed" "MaterialHypno" "border_armed" "MaterialHypno"
@ -81,13 +78,10 @@
"pinCorner" "3" "pinCorner" "3"
"visible" "0" "visible" "0"
"enabled" "1" "enabled" "1"
"tabPosition" "0"
"font" "Size 18" "font" "Size 18"
"textAlignment" "west" "textAlignment" "west"
"textinsetx" "30" "textinsetx" "30"
"AllCaps" "1" "AllCaps" "1"
"dulltext" "0"
"brighttext" "0"
"Command" "start_search" "Command" "start_search"
"proportionaltoparent" "1" "proportionaltoparent" "1"
"labeltext" "#TF_Matchmaking_StartSearch" "labeltext" "#TF_Matchmaking_StartSearch"
@ -97,9 +91,9 @@
"sound_depressed" "UI/buttonclick.wav" "sound_depressed" "UI/buttonclick.wav"
"sound_released" "UI/buttonclickrelease.wav" "sound_released" "UI/buttonclickrelease.wav"
"paintbackground" "0" "paintbackground" "0"
"border_default" "MaterialGrayDark" "border_default" "MaterialGrayDark"
"border_armed" "MaterialHypno" "border_armed" "MaterialHypno"
@ -121,13 +115,10 @@
"pinCorner" "3" "pinCorner" "3"
"visible" "1" "visible" "1"
"enabled" "1" "enabled" "1"
"tabPosition" "0"
"font" "Size 18" "font" "Size 18"
"textAlignment" "west" "textAlignment" "west"
"textinsetx" "30" "textinsetx" "30"
"AllCaps" "1" "AllCaps" "1"
"dulltext" "0"
"brighttext" "0"
"Command" "start_search" "Command" "start_search"
"proportionaltoparent" "1" "proportionaltoparent" "1"
"labeltext" "#TF_Matchmaking_StartSearch" "labeltext" "#TF_Matchmaking_StartSearch"
@ -137,9 +128,9 @@
"sound_depressed" "UI/buttonclick.wav" "sound_depressed" "UI/buttonclick.wav"
"sound_released" "UI/buttonclickrelease.wav" "sound_released" "UI/buttonclickrelease.wav"
"paintbackground" "0" "paintbackground" "0"
"border_default" "MaterialGrayDark" "border_default" "MaterialGrayDark"
"border_armed" "MaterialHypno" "border_armed" "MaterialHypno"
@ -161,13 +152,10 @@
"pinCorner" "3" "pinCorner" "3"
"visible" "1" "visible" "1"
"enabled" "1" "enabled" "1"
"tabPosition" "0"
"font" "Size 18" "font" "Size 18"
"textAlignment" "west" "textAlignment" "west"
"textinsetx" "30" "textinsetx" "30"
"AllCaps" "1" "AllCaps" "1"
"dulltext" "0"
"brighttext" "0"
"Command" "select_tour" "Command" "select_tour"
"proportionaltoparent" "1" "proportionaltoparent" "1"
"labeltext" "SELECT MISSION" "labeltext" "SELECT MISSION"
@ -177,9 +165,9 @@
"sound_depressed" "UI/buttonclick.wav" "sound_depressed" "UI/buttonclick.wav"
"sound_released" "UI/buttonclickrelease.wav" "sound_released" "UI/buttonclickrelease.wav"
"paintbackground" "0" "paintbackground" "0"
"border_default" "MaterialGrayDark" "border_default" "MaterialGrayDark"
"border_armed" "MaterialHypno" "border_armed" "MaterialHypno"
@ -204,7 +192,7 @@
"JoinLateLabel" "JoinLateLabel"
{ {
"ControlName" "Label" "ControlName" "CExLabel"
"fieldName" "JoinLateLabel" "fieldName" "JoinLateLabel"
"xpos" "rs1-5" "xpos" "rs1-5"
"ypos" "rs1-9" "ypos" "rs1-9"
@ -215,6 +203,6 @@
"labelText" "#TF_Matchmaking_JoinInProgress" "labelText" "#TF_Matchmaking_JoinInProgress"
"AllCaps" "1" "AllCaps" "1"
"proportionaltoparent" "1" "proportionaltoparent" "1"
"fgcolor_override" "WhiteDark" "fgcolor" "WhiteDark"
} }
} }

45
resource/ui/matchmakingdashboardpopup_newmatch.res
View File

@ -6,11 +6,11 @@
"fieldName" "NewMatchFound" "fieldName" "NewMatchFound"
"xpos" "cs-0.5" "xpos" "cs-0.5"
"ypos" "0" "ypos" "0"
"zpos" "10000" "zpos" "9999"
"wide" "200" "wide" "200"
"tall" "60" "tall" "60"
"visible" "1" "visible" "1"
"proportionaltoparent" "1" "proportionaltoparent" "0"
"keyboardinputenabled" "0" "keyboardinputenabled" "0"
"mouseinputenabled" "1" "mouseinputenabled" "1"
@ -60,7 +60,7 @@
"proportionaltoparent" "1" "proportionaltoparent" "1"
"pinCorner" "3" "pinCorner" "3"
"AllCaps" "1" "AllCaps" "1"
"fonts" "fonts"
{ {
"0" "Size 11" "0" "Size 11"
@ -71,7 +71,7 @@
"AutoJoinLabel" "AutoJoinLabel"
{ {
"ControlName" "Label" "ControlName" "CExLabel"
"fieldName" "AutoJoinLabel" "fieldName" "AutoJoinLabel"
"xpos" "0" "xpos" "0"
"ypos" "rs1-17" "ypos" "rs1-17"
@ -81,7 +81,7 @@
"visible" "1" "visible" "1"
"enabled" "1" "enabled" "1"
"font" "Size 11" "font" "Size 11"
"fgcolor_override" "White" "fgcolor" "White"
"textAlignment" "center" "textAlignment" "center"
"labelText" "%auto_join%" "labelText" "%auto_join%"
"proportionaltoparent" "1" "proportionaltoparent" "1"
@ -102,17 +102,14 @@
"pinCorner" "3" "pinCorner" "3"
"visible" "1" "visible" "1"
if_queued "if_queued"
{ {
"visible" "0" "visible" "0"
} }
"enabled" "1" "enabled" "1"
"tabPosition" "0"
"font" "Size 11" "font" "Size 11"
"textAlignment" "center" "textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
"Command" "abandon_match" "Command" "abandon_match"
"proportionaltoparent" "1" "proportionaltoparent" "1"
"labeltext" "#TF_MM_Rejoin_Abandon" "labeltext" "#TF_MM_Rejoin_Abandon"
@ -122,9 +119,9 @@
"AllCaps" "1" "AllCaps" "1"
"sound_depressed" "UI/buttonclick.wav" "sound_depressed" "UI/buttonclick.wav"
"sound_released" "UI/buttonclickrelease.wav" "sound_released" "UI/buttonclickrelease.wav"
"paintbackground" "0" "paintbackground" "0"
"border_default" "MaterialRed" "border_default" "MaterialRed"
"border_armed" "MaterialHypno" "border_armed" "MaterialHypno"
@ -143,21 +140,18 @@
"zpos" "100" "zpos" "100"
"tall" "18" "tall" "18"
if_expected "if_expected"
{ {
"xpos" "cs-0.5" "xpos" "cs-0.5"
"wide" "150" "wide" "150"
} }
"autoResize" "0" "autoResize" "0"
"pinCorner" "3" "pinCorner" "3"
"visible" "1" "visible" "1"
"enabled" "1" "enabled" "1"
"tabPosition" "0"
"font" "Size 11" "font" "Size 11"
"textAlignment" "center" "textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
"Command" "join_match" "Command" "join_match"
"proportionaltoparent" "1" "proportionaltoparent" "1"
"labeltext" "#TF_Matchmaking_RollingQueue_JoinNow" "labeltext" "#TF_Matchmaking_RollingQueue_JoinNow"
@ -167,9 +161,9 @@
"AllCaps" "1" "AllCaps" "1"
"sound_depressed" "UI/buttonclick.wav" "sound_depressed" "UI/buttonclick.wav"
"sound_released" "UI/buttonclickrelease.wav" "sound_released" "UI/buttonclickrelease.wav"
"paintbackground" "0" "paintbackground" "0"
"border_default" "MaterialGreen" "border_default" "MaterialGreen"
"border_armed" "MaterialHypno" "border_armed" "MaterialHypno"
@ -177,7 +171,7 @@
"armedFgColor_override" "White" "armedFgColor_override" "White"
"depressedFgColor_override" "White" "depressedFgColor_override" "White"
} }
"WideJoinButton" "WideJoinButton"
{ {
"ControlName" "CExButton" "ControlName" "CExButton"
@ -187,16 +181,13 @@
"wide" "150" "wide" "150"
"zpos" "100" "zpos" "100"
"tall" "18" "tall" "18"
"autoResize" "0" "autoResize" "0"
"pinCorner" "3" "pinCorner" "3"
"visible" "1" "visible" "1"
"enabled" "1" "enabled" "1"
"tabPosition" "0"
"font" "Size 11" "font" "Size 11"
"textAlignment" "center" "textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
"Command" "join_match" "Command" "join_match"
"proportionaltoparent" "1" "proportionaltoparent" "1"
"labeltext" "#TF_Matchmaking_RollingQueue_JoinNow" "labeltext" "#TF_Matchmaking_RollingQueue_JoinNow"
@ -206,9 +197,9 @@
"AllCaps" "1" "AllCaps" "1"
"sound_depressed" "UI/buttonclick.wav" "sound_depressed" "UI/buttonclick.wav"
"sound_released" "UI/buttonclickrelease.wav" "sound_released" "UI/buttonclickrelease.wav"
"paintbackground" "0" "paintbackground" "0"
"border_default" "MaterialGreen" "border_default" "MaterialGreen"
"border_armed" "MaterialHypno" "border_armed" "MaterialHypno"
@ -219,7 +210,7 @@
"JoiningLabel" "JoiningLabel"
{ {
"ControlName" "Label" "ControlName" "CExLabel"
"fieldName" "JoiningLabel" "fieldName" "JoiningLabel"
"xpos" "cs-1" "xpos" "cs-1"
"ypos" "rs1-17" "ypos" "rs1-17"
@ -229,7 +220,7 @@
"visible" "1" "visible" "1"
"enabled" "1" "enabled" "1"
"font" "Size 11" "font" "Size 11"
"fgcolor_override" "White" "fgcolor" "White"
"textAlignment" "east" "textAlignment" "east"
"labelText" "#TF_Matchmaking_RollingQueue_MatchReadyJoining" "labelText" "#TF_Matchmaking_RollingQueue_MatchReadyJoining"
"proportionaltoparent" "1" "proportionaltoparent" "1"

18
resource/ui/matchmakingdashboardpopup_nextmapvoting.res
View File

@ -6,11 +6,11 @@
"fieldName" "NextMapVoting" "fieldName" "NextMapVoting"
"xpos" "cs-0.5" "xpos" "cs-0.5"
"ypos" "0" "ypos" "0"
"zpos" "10000" "zpos" "9999"
"wide" "260" "wide" "260"
"tall" "80" "tall" "80"
"visible" "1" "visible" "1"
"proportionaltoparent" "1" "proportionaltoparent" "0"
"keyboardinputenabled" "0" "keyboardinputenabled" "0"
"mouseinputenabled" "1" "mouseinputenabled" "1"
@ -55,11 +55,8 @@
"pinCorner" "0" "pinCorner" "0"
"visible" "1" "visible" "1"
"enabled" "1" "enabled" "1"
"tabPosition" "0"
"font" "Size 14" "font" "Size 14"
"textAlignment" "center" "textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
"default" "0" "default" "0"
"labeltext" "" "labeltext" ""
"sound_depressed" "UI/buttonclick.wav" "sound_depressed" "UI/buttonclick.wav"
@ -67,7 +64,7 @@
"Command" "toggle_hide" "Command" "toggle_hide"
"proportionaltoparent" "1" "proportionaltoparent" "1"
"actionsignallevel" "2" "actionsignallevel" "2"
"paintbackground" "0" "paintbackground" "0"
"image_default" "glyph_collapse" "image_default" "glyph_collapse"
@ -105,11 +102,8 @@
"pinCorner" "0" "pinCorner" "0"
"visible" "1" "visible" "1"
"enabled" "1" "enabled" "1"
"tabPosition" "0"
"font" "Size 14" "font" "Size 14"
"textAlignment" "center" "textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
"default" "0" "default" "0"
"labeltext" "" "labeltext" ""
"sound_depressed" "UI/buttonclick.wav" "sound_depressed" "UI/buttonclick.wav"
@ -117,7 +111,7 @@
"Command" "toggle_hide" "Command" "toggle_hide"
"proportionaltoparent" "1" "proportionaltoparent" "1"
"actionsignallevel" "2" "actionsignallevel" "2"
"paintbackground" "0" "paintbackground" "0"
"image_default" "glyph_expand" "image_default" "glyph_expand"
@ -144,7 +138,7 @@
"DescLabel" "DescLabel"
{ {
"ControlName" "Label" "ControlName" "CExLabel"
"fieldName" "DescLabel" "fieldName" "DescLabel"
"xpos" "0" "xpos" "0"
"ypos" "3" "ypos" "3"
@ -154,7 +148,7 @@
"visible" "1" "visible" "1"
"enabled" "1" "enabled" "1"
"font" "Size 14" "font" "Size 14"
"fgcolor_override" "White" "fgcolor" "White"
"textAlignment" "center" "textAlignment" "center"
"labelText" "#TF_Matchmaking_RollingQueue_MatchOver" "labelText" "#TF_Matchmaking_RollingQueue_MatchOver"
"proportionaltoparent" "1" "proportionaltoparent" "1"

16
resource/ui/matchmakingdashboardpopup_nextmapwinner.res
View File

@ -6,11 +6,11 @@
"fieldName" "NextMapWinner" "fieldName" "NextMapWinner"
"xpos" "cs-0.5" "xpos" "cs-0.5"
"ypos" "0" "ypos" "0"
"zpos" "10000" "zpos" "9999"
"wide" "260" "wide" "260"
"tall" "80" "tall" "80"
"visible" "1" "visible" "1"
"proportionaltoparent" "1" "proportionaltoparent" "0"
"keyboardinputenabled" "0" "keyboardinputenabled" "0"
"mouseinputenabled" "1" "mouseinputenabled" "1"
@ -44,7 +44,7 @@
"DescLabel" "DescLabel"
{ {
"ControlName" "Label" "ControlName" "CExLabel"
"fieldName" "DescLabel" "fieldName" "DescLabel"
"xpos" "0" "xpos" "0"
"ypos" "3" "ypos" "3"
@ -54,7 +54,7 @@
"visible" "1" "visible" "1"
"enabled" "1" "enabled" "1"
"font" "Size 14" "font" "Size 14"
"fgcolor_override" "White" "fgcolor" "White"
"textAlignment" "center" "textAlignment" "center"
"labelText" "#TF_Matchmaking_RollingQueue_NextMapWinner" "labelText" "#TF_Matchmaking_RollingQueue_NextMapWinner"
"proportionaltoparent" "1" "proportionaltoparent" "1"
@ -70,7 +70,7 @@
"wide" "50" "wide" "50"
"tall" "o0.75" "tall" "o0.75"
"zpos" "1" "zpos" "1"
"proportionaltoparent" "1" "proportionaltoparent" "1"
"mouseinputenabled" "0" "mouseinputenabled" "0"
"MapImage" "MapImage"
@ -83,14 +83,14 @@
"tall" "o1" "tall" "o1"
"zpos" "0" "zpos" "0"
"image" "..\vgui\maps\menu_thumb_pl_goldrush" "image" "..\vgui\maps\menu_thumb_pl_goldrush"
"proportionaltoparent" "1" "proportionaltoparent" "1"
"mouseinputenabled" "0" "mouseinputenabled" "0"
} }
} }
"NameLabel" "NameLabel"
{ {
"ControlName" "Label" "ControlName" "CExLabel"
"fieldName" "NameLabel" "fieldName" "NameLabel"
"xpos" "0" "xpos" "0"
"ypos" "rs1-2" "ypos" "rs1-2"
@ -100,7 +100,7 @@
"visible" "1" "visible" "1"
"enabled" "1" "enabled" "1"
"font" "MapVotesPercentage" "font" "MapVotesPercentage"
"fgcolor_override" "White" "fgcolor" "White"
"textAlignment" "south" "textAlignment" "south"
"labelText" "%mapname%" "labelText" "%mapname%"
"proportionaltoparent" "1" "proportionaltoparent" "1"