summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--info.vdf2
-rw-r--r--resource/ChatScheme.res1
-rw-r--r--resource/scheme/clientscheme_borders.res221
-rw-r--r--resource/scheme/clientscheme_colors.res14
-rw-r--r--resource/scheme/clientscheme_fonts.res61
-rw-r--r--resource/ui/HudPlayerHealth.res73
-rw-r--r--resource/ui/MainMenuOverride.res238
-rw-r--r--scripts/hudlayout.res16
8 files changed, 606 insertions, 20 deletions
diff --git a/info.vdf b/info.vdf
index 5cb17b4..049278e 100644
--- a/info.vdf
+++ b/info.vdf
@@ -1,4 +1,4 @@
"rayshud"
{
- "ui_version" "1"
+ "ui_version" "2"
} \ No newline at end of file
diff --git a/resource/ChatScheme.res b/resource/ChatScheme.res
index 8f76446..ab81210 100644
--- a/resource/ChatScheme.res
+++ b/resource/ChatScheme.res
@@ -21,6 +21,7 @@ Scheme
"QuickListBGSelected" "131 121 104 150"
"Blank" "0 0 0 0"
"White" "255 255 255 255"
+ "Green" "63 185 73 255"
"ControlBG" "76 88 68 255"
"ControlDarkBG" "90 106 80 255"
"WindowBG" "62 70 55 255"
diff --git a/resource/scheme/clientscheme_borders.res b/resource/scheme/clientscheme_borders.res
index df4d7d5..b392ea2 100644
--- a/resource/scheme/clientscheme_borders.res
+++ b/resource/scheme/clientscheme_borders.res
@@ -3133,6 +3133,227 @@ Scheme
"src_corner_width" "5"
"draw_corner_width" "4" // screen size of the corners ( and sides ), proportional
"draw_corner_height" "4"
+ }
+
+ CYOAScreenBorder
+ {
+ "bordertype" "scalable_image"
+ "backgroundtype" "2"
+
+ "image" "cyoa/cyoa_map_screen_border"
+ "src_corner_height" "63" // pixels inside the image
+ "src_corner_width" "63"
+ "draw_corner_width" "26" // screen size of the corners ( and sides ), proportional
+ "draw_corner_height" "26"
+ }
+
+ CYOANodeViewBorder
+ {
+ "bordertype" "scalable_image"
+ "backgroundtype" "2"
+
+ "image" "cyoa/node_view_border"
+ "src_corner_height" "127" // pixels inside the image
+ "src_corner_width" "127"
+ "draw_corner_width" "24" // screen size of the corners ( and sides ), proportional
+ "draw_corner_height" "24"
+ }
+
+ CYOANodeViewBorder_Active
+ {
+ "bordertype" "scalable_image"
+ "backgroundtype" "2"
+
+ "image" "cyoa/node_view_border_active"
+ "src_corner_height" "127" // pixels inside the image
+ "src_corner_width" "127"
+ "draw_corner_width" "24" // screen size of the corners ( and sides ), proportional
+ "draw_corner_height" "24"
+ }
+
+ CYOANodeViewBorder_Inactive
+ {
+ "bordertype" "scalable_image"
+ "backgroundtype" "2"
+
+ "image" "cyoa/node_view_border_inactive"
+ "src_corner_height" "127" // pixels inside the image
+ "src_corner_width" "127"
+ "draw_corner_width" "24" // screen size of the corners ( and sides ), proportional
+ "draw_corner_height" "24"
+ }
+
+ CYOANodeViewBorder_TurnIn
+ {
+ "bordertype" "scalable_image"
+ "backgroundtype" "2"
+
+ "image" "cyoa/node_view_border_turnin"
+ "src_corner_height" "127" // pixels inside the image
+ "src_corner_width" "127"
+ "draw_corner_width" "24" // screen size of the corners ( and sides ), proportional
+ "draw_corner_height" "24"
+ }
+
+ CYOAPopupBorder
+ {
+ "inset" "0 0 1 1"
+ Left
+ {
+ "1"
+ {
+ "color" "QuestMap_ActiveOrange"
+ "offset" "0 1"
+ }
+ "2"
+ {
+ "color" "QuestMap_ActiveOrange"
+ "offset" "0 1"
+ }
+ }
+
+ Right
+ {
+ "1"
+ {
+ "color" "QuestMap_ActiveOrange"
+ "offset" "1 0"
+ }
+ "2"
+ {
+ "color" "QuestMap_ActiveOrange"
+ "offset" "1 0"
+ }
+ }
+
+ Top
+ {
+ "1"
+ {
+ "color" "QuestMap_ActiveOrange"
+ "offset" "0 0"
+ }
+ "2"
+ {
+ "color" "QuestMap_ActiveOrange"
+ "offset" "0 0"
+ }
+ }
+
+ Bottom
+ {
+ "1"
+ {
+ "color" "QuestMap_ActiveOrange"
+ "offset" "0 0"
+ }
+ "2"
+ {
+ "color" "QuestMap_ActiveOrange"
+ "offset" "0 0"
+ }
+ }
+ }
+
+ FriendHighlightBorder
+ {
+ "inset" "0 0 1 1"
+ Left
+ {
+ "1"
+ {
+ "color" "CreditsGreen"
+ "offset" "0 1"
+ }
+
+ }
+
+ Right
+ {
+ "1"
+ {
+ "color" "CreditsGreen"
+ "offset" "1 0"
+ }
+ }
+
+ Top
+ {
+ "1"
+ {
+ "color" "CreditsGreen"
+ "offset" "0 0"
+ }
+ }
+
+ Bottom
+ {
+ "1"
+ {
+ "color" "CreditsGreen"
+ "offset" "0 0"
+ }
+ }
+ }
+
+ FriendHighlightBorderThick
+ {
+ "inset" "0 0 1 1"
+ Left
+ {
+ "1"
+ {
+ "color" "CreditsGreen"
+ "offset" "0 1"
+ }
+ "2"
+ {
+ "color" "CreditsGreen"
+ "offset" "0 1"
+ }
+ }
+
+ Right
+ {
+ "1"
+ {
+ "color" "CreditsGreen"
+ "offset" "1 0"
+ }
+ "2"
+ {
+ "color" "CreditsGreen"
+ "offset" "1 0"
+ }
+ }
+
+ Top
+ {
+ "1"
+ {
+ "color" "CreditsGreen"
+ "offset" "0 0"
+ }
+ "2"
+ {
+ "color" "CreditsGreen"
+ "offset" "0 0"
+ }
+ }
+
+ Bottom
+ {
+ "1"
+ {
+ "color" "CreditsGreen"
+ "offset" "0 0"
+ }
+ "2"
+ {
+ "color" "CreditsGreen"
+ "offset" "0 0"
+ }
+ }
}
}
} \ No newline at end of file
diff --git a/resource/scheme/clientscheme_colors.res b/resource/scheme/clientscheme_colors.res
index 2c7312f..d15c8ea 100644
--- a/resource/scheme/clientscheme_colors.res
+++ b/resource/scheme/clientscheme_colors.res
@@ -96,6 +96,7 @@ Scheme
"LightOrange" "188 112 0 128"
"GoalOrange" "255 133 0"
"TFOrange" "145 73 59 255"
+ "Purple" "137 69 99 255"
"QuestGold" "208 147 75 255"
"HalloweenThemeColor2015_Light" "238 126 17 255"
@@ -103,6 +104,19 @@ Scheme
"HalloweenThemeColor2015_Dark" "108 49 21 255"
"QuestStandardHighlight" "0 255 0 255"
"QuestBonusHighlight" "150 160 255 255"
+ "QuestUncommitted" "183 147 100 255"
+
+ "QuestMap_Bonus" "222 217 166 255"
+ "QuestMap_ActiveOrange" "212 127 25 255"
+ "QuestMap_InactiveGrey" "100 100 100 255"
+ "QuestMap_BGImages" "56 58 60 255"
+
+ "PartyMember1" "124 173 255 255"
+ "PartyMember2" "99 232 167 255"
+ "PartyMember3" "229 255 121 255"
+ "PartyMember4" "232 184 99 255"
+ "PartyMember5" "255 118 108 255"
+ "PartyMember6" "255 133 255 255"
"White" "235 235 235 255"
"Red" "192 28 0 140"
diff --git a/resource/scheme/clientscheme_fonts.res b/resource/scheme/clientscheme_fonts.res
index f3fe1e8..0578b05 100644
--- a/resource/scheme/clientscheme_fonts.res
+++ b/resource/scheme/clientscheme_fonts.res
@@ -2870,6 +2870,67 @@ Scheme
"antialias" "1"
}
}
+
+ "QuestMap_Small_Blur"
+ {
+ "1"
+ {
+ "name" "ocra"
+ "tall" "7"
+ "weight" "0"
+ "blur" "3"
+ "additive" "1"
+ "antialias" "1"
+ }
+ }
+
+ "QuestMap_Small"
+ {
+ "1"
+ {
+ "name" "ocra"
+ "tall" "7"
+ "weight" "400"
+ "additive" "0"
+ "antialias" "1"
+ }
+ }
+
+ "QuestMap_Medium"
+ {
+ "1"
+ {
+ "name" "ocra"
+ "tall" "10"
+ "weight" "400"
+ "additive" "0"
+ "antialias" "1"
+ }
+ }
+
+ "QuestMap_Large"
+ {
+ "1"
+ {
+ "name" "ocra"
+ "tall" "14"
+ "weight" "400"
+ "additive" "0"
+ "antialias" "1"
+ }
+ }
+
+ "QuestMap_Huge"
+ {
+ "1"
+ {
+ "name" "ocra"
+ "tall" "30"
+ "weight" "400"
+ "additive" "0"
+ "antialias" "1"
+ }
+ }
}
//////////////////////// BITMAP FONT FILES /////////////////////////////
diff --git a/resource/ui/HudPlayerHealth.res b/resource/ui/HudPlayerHealth.res
index 75d8da6..dce7d8b 100644
--- a/resource/ui/HudPlayerHealth.res
+++ b/resource/ui/HudPlayerHealth.res
@@ -94,11 +94,47 @@
"visible" "1"
"enabled" "1"
"labelText" "%Health%"
- "textAlignment" "center"
+ "textAlignment" "center"
"font" "CerbeticaBold56"
"font_minmode" "CerbeticaBold32"
"fgcolor" "TransparentBlack"
- }
+ }
+ "PlayerStatusMaxHealthValue"
+ {
+ "ControlName" "CExLabel"
+ "fieldName" "PlayerStatusMaxHealthValue"
+ "xpos" "76"
+ "xpos_minmode" "61"
+ "ypos" "20"
+ "zpos" "6"
+ "wide" "50"
+ "tall" "18"
+ "visible" "1"
+ "enabled" "1"
+ "labelText" "%MaxHealth%"
+ "textAlignment" "center"
+ "font" "CerbeticaBold56"
+ "font_minmode" "CerbeticaBold32"
+ "fgcolor" "TanDark"
+ }
+ "PlayerStatusMaxHealthValueShadow"
+ {
+ "ControlName" "CExLabel"
+ "fieldName" "PlayerStatusMaxHealthValueShadow"
+ "xpos" "76"
+ "xpos_minmode" "61"
+ "ypos" "20"
+ "zpos" "6"
+ "wide" "50"
+ "tall" "18"
+ "visible" "1"
+ "enabled" "1"
+ "labelText" "%MaxHealth%"
+ "textAlignment" "center"
+ "font" "CerbeticaBold56"
+ "font_minmode" "CerbeticaBold32"
+ "fgcolor" "TransparentBlack"
+ }
"PlayerStatusBleedImage"
{
"ControlName" "ImagePanel"
@@ -137,6 +173,22 @@
"image" "../vgui/bleed_drop"
"fgcolor" "TanDark"
}
+ "PlayerStatusGasImage"
+ {
+ "ControlName" "ImagePanel"
+ "fieldName" "PlayerStatusGasImage"
+ "xpos" "117"
+ "xpos_minmode" "102"
+ "ypos" "0"
+ "zpos" "7"
+ "wide" "32"
+ "tall" "32"
+ "visible" "1"
+ "enabled" "1"
+ "scaleImage" "1"
+ "image" "../vgui/covered_in_gas"
+ "fgcolor" "TanDark"
+ }
"PlayerStatusMarkedForDeathImage"
{
"ControlName" "ImagePanel"
@@ -609,5 +661,20 @@
"image" "../Effects/powerup_supernova_hud"
"fgcolor" "TanDark"
}
-
+ "PlayerStatusSlowed"
+ {
+ "ControlName" "ImagePanel"
+ "fieldName" "PlayerStatusSlowed"
+ "xpos" "85"
+ "xpos_minmode" "70"
+ "ypos" "0"
+ "zpos" "7"
+ "wide" "32"
+ "tall" "32"
+ "visible" "1"
+ "enabled" "1"
+ "scaleImage" "1"
+ "image" "../vgui/slowed"
+ "fgcolor" "TanDark"
+ }
}
diff --git a/resource/ui/MainMenuOverride.res b/resource/ui/MainMenuOverride.res
index 23c6a6e..aa32fb3 100644
--- a/resource/ui/MainMenuOverride.res
+++ b/resource/ui/MainMenuOverride.res
@@ -252,8 +252,8 @@
{
"ControlName" "ImagePanel"
"fieldName" "HudNameBG"
- "xpos" "75"
- "ypos" "90"
+ "xpos" "5"
+ "ypos" "20"
"zpos" "0"
"wide" "220"
"tall" "25"
@@ -268,8 +268,8 @@
{
"ControlName" "CExImageButton"
"fieldName" "HudName"
- "xpos" "80"
- "ypos" "91"
+ "xpos" "10"
+ "ypos" "21"
"zpos" "1"
"wide" "56"
"tall" "25"
@@ -375,13 +375,43 @@
}
}
+ "JungleInfernoImage"
+ {
+ "ControlName" "ImagePanel"
+ "fieldName" "JungleInfernoImage"
+ "xpos" "c-290+64"
+ "ypos" "64"
+ "zpos" "1"
+ "wide" "o4"
+ "tall" "32"
+ "visible" "0"
+ "enabled" "0"
+ "image" "../logo/inferno_logo_anim"
+ "scaleImage" "1"
+ "mouseinputenabled" "0"
+
+ if_operation
+ {
+ "visible" "0"
+ }
+ }
+
"TFCharacterImage"
{
"ControlName" "ImagePanel"
"fieldName" "TFCharacterImage"
- "xpos" "9999"
- "ypos" "9999"
- "zpos" "-99"
+ "xpos" "c-173"
+
+ if_taller
+ {
+ if_operation
+ {
+ "xpos" "c-173"
+ }
+ }
+
+ "ypos" "-80"
+ "zpos" "-1"
"wide" "600"
"tall" "600"
"visible" "1"
@@ -421,6 +451,44 @@
"enabled" "1"
"fgcolor_override" "235 227 203 255"
}
+
+ "RankModelPanel"
+ {
+ "ControlName" "CPvPRankPanel"
+ "fieldName" "RankModelPanel"
+ "xpos" "cs-0.5-350"
+ "ypos" "cs-0.5-120"
+
+ "zpos" "-51"
+ "wide" "1000"
+ "tall" "1000"
+ "visible" "1"
+ "proportionaltoparent" "1"
+ "mouseinputenabled" "1"
+
+ "matchgroup" "MatchGroup_Casual_12v12"
+
+ "show_progress" "0"
+ }
+
+ "RankPanel"
+ {
+ "ControlName" "CPvPRankPanel"
+ "fieldName" "RankPanel"
+ "xpos" "c-400"
+ "ypos" "72"
+ "zpos" "-52"
+ "wide" "320"
+ "tall" "100"
+ "visible" "1"
+ "proportionaltoparent" "1"
+ "mouseinputenabled" "0"
+
+ "matchgroup" "MatchGroup_Casual_12v12"
+ "xp_source_notification_center_x" "350"
+
+ "show_model" "0"
+ }
"TooltipPanel"
{
@@ -1417,7 +1485,145 @@
"visible" "1"
}
}
- }
+ }
+
+ "CompetitiveAccessInfoPanel"
+ {
+ "ControlName" "CCompetitiveAccessInfoPanel"
+ "fieldName" "CompetitiveAccessInfoPanel"
+ "xpos" "cs-0.5"
+ "ypos" "cs-0.5"
+ "zpos" "1000"
+ "wide" "f0"
+ "tall" "f0"
+ "visible" "0"
+ }
+
+ "FriendsContainer"
+ {
+ "ControlName" "EditablePanel"
+ "fieldname" "FriendsContainer"
+ "xpos" "30"
+ "ypos" "300"
+ "zpos" "5"
+ "wide" "260"
+ "tall" "150"
+ "visible" "1"
+
+ "border" "MainMenuBGBorder"
+
+ "TitleLabel"
+ {
+ "ControlName" "CExLabel"
+ "fieldName" "TitleLabel"
+ "font" "HudFontSmallBold"
+ "labelText" "#TF_Competitive_Friends"
+ "textAlignment" "west"
+ "xpos" "12"
+ "ypos" "0"
+ "wide" "f0"
+ "tall" "30"
+ "autoResize" "0"
+ "pinCorner" "0"
+ "visible" "1"
+ "enabled" "1"
+ "textinsetx" "0"
+ "fgcolor_override" "235 227 203 255"
+ }
+
+ "InnerShadow"
+ {
+ "ControlName" "EditablePanel"
+ "fieldname" "InnerShadow"
+ "xpos" "cs-0.5"
+ "ypos" "rs1-10"
+ "zpos" "501"
+ "wide" "f20"
+ "tall" "110"
+ "visible" "1"
+ "PaintBackgroundType" "0"
+ "proportionaltoparent" "1"
+ "mouseinputenabled" "0"
+
+ "paintborder" "1"
+ "border" "InnerShadowBorder"
+ }
+
+ "SteamFriendsList"
+ {
+ "ControlName" "CSteamFriendsListPanel"
+ "fieldname" "SteamFriendsList"
+ "xpos" "cs-0.5"
+ "ypos" "rs1-10"
+ "zpos" "500"
+ "wide" "f20"
+ "tall" "110"
+ "visible" "1"
+ "proportionaltoparent" "1"
+
+ "columns_count" "2"
+ "inset_x" "10"
+ "inset_y" "5"
+ "row_gap" "5"
+ "column_gap" "20"
+ "restrict_width" "0"
+
+ "friendpanel_kv"
+ {
+ "wide" "100"
+ "tall" "20"
+ }
+
+ "ScrollBar"
+ {
+ "ControlName" "ScrollBar"
+ "FieldName" "ScrollBar"
+ "xpos" "rs1-1"
+ "ypos" "0"
+ "tall" "f0"
+ "wide" "5" // This gets slammed from client schme. GG.
+ "zpos" "1000"
+ "nobuttons" "1"
+ "proportionaltoparent" "1"
+
+ "Slider"
+ {
+ "fgcolor_override" "TanDark"
+ }
+
+ "UpButton"
+ {
+ "ControlName" "Button"
+ "FieldName" "UpButton"
+ "visible" "0"
+ }
+
+ "DownButton"
+ {
+ "ControlName" "Button"
+ "FieldName" "DownButton"
+ "visible" "0"
+ }
+ }
+ }
+
+ "BelowDarken"
+ {
+ "ControlName" "EditablePanel"
+ "fieldname" "BelowDarken"
+ "xpos" "cs-0.5"
+ "ypos" "rs1-10"
+ "zpos" "499"
+ "wide" "f20"
+ "tall" "110"
+ "visible" "1"
+ "PaintBackgroundType" "0"
+ "proportionaltoparent" "1"
+ "mouseinputenabled" "0"
+
+ "bgcolor_override" "0 0 0 100"
+ }
+ }
"HTMLContainer"
{
@@ -2177,8 +2383,8 @@
"wide" "220"
"tall" "18"
"autoResize" "0"
- "visible" "1"
- "enabled" "1"
+ "visible" "0"
+ "enabled" "0"
"tabPosition" "0"
"font" "Cerbetica16"
"textAlignment" "west"
@@ -2240,8 +2446,8 @@
"wide" "220"
"tall" "18"
"autoResize" "0"
- "visible" "1"
- "enabled" "1"
+ "visible" "0"
+ "enabled" "0"
"tabPosition" "0"
"font" "Cerbetica16"
"textAlignment" "west"
@@ -2303,8 +2509,8 @@
"wide" "220"
"tall" "18"
"autoResize" "0"
- "visible" "1"
- "enabled" "1"
+ "visible" "0"
+ "enabled" "0"
"tabPosition" "0"
"font" "Cerbetica16"
"textAlignment" "west"
@@ -2368,8 +2574,8 @@
"wide" "220"
"tall" "18"
"autoResize" "0"
- "visible" "1"
- "enabled" "1"
+ "visible" "0"
+ "enabled" "0"
"tabPosition" "0"
"font" "Cerbetica16"
"textAlignment" "west"
diff --git a/scripts/hudlayout.res b/scripts/hudlayout.res
index c86581a..87ed232 100644
--- a/scripts/hudlayout.res
+++ b/scripts/hudlayout.res
@@ -2260,4 +2260,20 @@
"wide" "f0"
"tall" "f0"
}
+
+ "QueueHUDStatus"
+ {
+ "fieldName" "QueueHUDStatus"
+ "visible" "1"
+ "enabled" "1"
+ "xpos" "rs1-5"
+ "ypos" "1"
+ "zpos" "1001"
+ "wide" "200"
+ "tall" "18"
+ "proportionaltoparent" "1"
+ "keyboardinputenabled" "1"
+ "mouseinputenabled" "0"
+ "alpha" "100"
+ }
}