1
mirror of https://gitlab.com/jessieh/doghud.git synced 2024-09-19 13:41:46 +00:00

Merge changes from TF2 update (upstream)

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

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,12 +42,9 @@
"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"
@ -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"
@ -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"
@ -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"
@ -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"
} }
} }

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"
@ -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"
@ -143,7 +140,7 @@
"zpos" "100" "zpos" "100"
"tall" "18" "tall" "18"
if_expected "if_expected"
{ {
"xpos" "cs-0.5" "xpos" "cs-0.5"
"wide" "150" "wide" "150"
@ -153,11 +150,8 @@
"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"
@ -192,11 +186,8 @@
"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"
@ -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"

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"
@ -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"
@ -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"

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"
@ -90,7 +90,7 @@
"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"