diff options
30 files changed, 179 insertions, 123 deletions
diff --git a/customizations/player_model/hudplayerclass.res b/customizations/player_model/hudplayerclass.res index 113321b..8232284 100644 --- a/customizations/player_model/hudplayerclass.res +++ b/customizations/player_model/hudplayerclass.res @@ -72,7 +72,7 @@ "xpos" "r210" "ypos" "r148" "zpos" "2" - "wide" "75" + "wide" "80" "tall" "150" "autoResize" "0" "pinCorner" "0" @@ -170,8 +170,8 @@ "angles_x" "-5" "angles_y" "150" "angles_z" "0" - "origin_x" "175" - "origin_y" "-5" + "origin_x" "190" + "origin_y" "-13" "origin_z" "-90" } "Spy" diff --git a/customizations/team_menu/teammenu.res b/customizations/team_menu/teammenu.res index 4314de3..0cff4a4 100644 --- a/customizations/team_menu/teammenu.res +++ b/customizations/team_menu/teammenu.res @@ -336,8 +336,8 @@ "tall" "50" "autoResize" "0" "pinCorner" "0" - "visible" "1" - "enabled" "1" + "visible" "0" + "enabled" "0" "labelText" "#TF_Highlander_Mode" "textAlignment" "Center" "dulltext" "0" diff --git a/materials/sprites/obj_icons/icon_obj_a.vmt b/materials/sprites/obj_icons/icon_obj_a.vmt index 2cae5cf..fe8adc9 100644 --- a/materials/sprites/obj_icons/icon_obj_a.vmt +++ b/materials/sprites/obj_icons/icon_obj_a.vmt @@ -1,11 +1,11 @@ "UnlitGeneric" { - "$translucent" "1" - "$baseTexture" "vgui\replay\thumbnails\cp_icons\icon_obj_a" - "$alpha" "1" - "$vertexalpha" "1" - "$vertexcolor" "1" - "$no_fullbright" "1" - "$ignorez" "1" - "%keywords" "tf" + "$translucent" "1" + "$baseTexture" "vgui\replay\thumbnails\cp_icons\icon_obj_a" + "$alpha" "1" + "$vertexalpha" "1" + "$vertexcolor" "1" + "$no_fullbright" "1" + "$ignorez" "1" + "%keywords" "tf" }
\ No newline at end of file diff --git a/materials/sprites/obj_icons/icon_obj_b.vmt b/materials/sprites/obj_icons/icon_obj_b.vmt index addbe86..d4ec548 100644 --- a/materials/sprites/obj_icons/icon_obj_b.vmt +++ b/materials/sprites/obj_icons/icon_obj_b.vmt @@ -1,11 +1,11 @@ "UnlitGeneric" { - "$translucent" "1" - "$baseTexture" "vgui\replay\thumbnails\cp_icons\icon_obj_b" - "$alpha" "1" - "$vertexalpha" "1" - "$vertexcolor" "1" - "$no_fullbright" "1" - "$ignorez" "1" - "%keywords" "tf" + "$translucent" "1" + "$baseTexture" "vgui\replay\thumbnails\cp_icons\icon_obj_b" + "$alpha" "1" + "$vertexalpha" "1" + "$vertexcolor" "1" + "$no_fullbright" "1" + "$ignorez" "1" + "%keywords" "tf" }
\ No newline at end of file diff --git a/materials/sprites/obj_icons/icon_obj_blu.vmt b/materials/sprites/obj_icons/icon_obj_blu.vmt index 222821c..1bd49e8 100644 --- a/materials/sprites/obj_icons/icon_obj_blu.vmt +++ b/materials/sprites/obj_icons/icon_obj_blu.vmt @@ -1,11 +1,11 @@ "UnlitGeneric" { - "$translucent" "1" - "$baseTexture" "vgui\replay\thumbnails\cp_icons\icon_obj_blu" - "$alpha" "1" - "$vertexalpha" "1" - "$vertexcolor" "1" - "$no_fullbright" "1" - "$ignorez" "1" - "%keywords" "tf" + "$translucent" "1" + "$baseTexture" "vgui\replay\thumbnails\cp_icons\icon_obj_blu" + "$alpha" "1" + "$vertexalpha" "1" + "$vertexcolor" "1" + "$no_fullbright" "1" + "$ignorez" "1" + "%keywords" "tf" }
\ No newline at end of file diff --git a/materials/sprites/obj_icons/icon_obj_blu_locked.vmt b/materials/sprites/obj_icons/icon_obj_blu_locked.vmt index c34c79d..87a7968 100644 --- a/materials/sprites/obj_icons/icon_obj_blu_locked.vmt +++ b/materials/sprites/obj_icons/icon_obj_blu_locked.vmt @@ -1,11 +1,11 @@ "UnlitGeneric" { - "$translucent" "1" - "$baseTexture" "vgui\replay\thumbnails\cp_icons\icon_obj_blu_locked" - "$alpha" "1" - "$vertexalpha" "1" - "$vertexcolor" "1" - "$no_fullbright" "1" - "$ignorez" "1" - "%keywords" "tf" + "$translucent" "1" + "$baseTexture" "vgui\replay\thumbnails\cp_icons\icon_obj_blu_locked" + "$alpha" "1" + "$vertexalpha" "1" + "$vertexcolor" "1" + "$no_fullbright" "1" + "$ignorez" "1" + "%keywords" "tf" }
\ No newline at end of file diff --git a/materials/sprites/obj_icons/icon_obj_c.vmt b/materials/sprites/obj_icons/icon_obj_c.vmt index 2988db7..b0b9a7e 100644 --- a/materials/sprites/obj_icons/icon_obj_c.vmt +++ b/materials/sprites/obj_icons/icon_obj_c.vmt @@ -1,11 +1,11 @@ "UnlitGeneric" { - "$translucent" "1" - "$baseTexture" "vgui\replay\thumbnails\cp_icons\icon_obj_c" - "$alpha" "1" - "$vertexalpha" "1" - "$vertexcolor" "1" - "$no_fullbright" "1" - "$ignorez" "1" - "%keywords" "tf" + "$translucent" "1" + "$baseTexture" "vgui\replay\thumbnails\cp_icons\icon_obj_c" + "$alpha" "1" + "$vertexalpha" "1" + "$vertexcolor" "1" + "$no_fullbright" "1" + "$ignorez" "1" + "%keywords" "tf" }
\ No newline at end of file diff --git a/materials/sprites/obj_icons/icon_obj_cap_blu.vmt b/materials/sprites/obj_icons/icon_obj_cap_blu.vmt new file mode 100644 index 0000000..e55c41e --- /dev/null +++ b/materials/sprites/obj_icons/icon_obj_cap_blu.vmt @@ -0,0 +1,9 @@ +"UnlitGeneric" +{ + "$translucent" "1" + "$baseTexture" "vgui\replay\thumbnails\cp_icons\icon_obj_cap_blu" + "$vertexcolor" "1" + "$no_fullbright" "1" + "$ignorez" "1" + "%keywords" "tf" +}
\ No newline at end of file diff --git a/materials/sprites/obj_icons/icon_obj_cap_mask.vmt b/materials/sprites/obj_icons/icon_obj_cap_mask.vmt index 977da33..2184614 100644 --- a/materials/sprites/obj_icons/icon_obj_cap_mask.vmt +++ b/materials/sprites/obj_icons/icon_obj_cap_mask.vmt @@ -1,8 +1,8 @@ "UnlitGeneric" { - "$translucent" "1" - "$baseTexture" "vgui\replay\thumbnails\cp_icons\icon_obj_cap_mask" - "$no_fullbright" "1" - "$ignorez" "1" - "%keywords" "tf" -} + "$translucent" "1" + "$baseTexture" "vgui\replay\thumbnails\cp_icons\icon_obj_cap_mask" + "$no_fullbright" "1" + "$ignorez" "1" + "%keywords" "tf" +}
\ No newline at end of file diff --git a/materials/sprites/obj_icons/icon_obj_cap_red.vmt b/materials/sprites/obj_icons/icon_obj_cap_red.vmt new file mode 100644 index 0000000..f2fc136 --- /dev/null +++ b/materials/sprites/obj_icons/icon_obj_cap_red.vmt @@ -0,0 +1,9 @@ +"UnlitGeneric" +{ + "$translucent" "1" + "$baseTexture" "vgui\replay\thumbnails\cp_icons\icon_obj_cap_red" + "$vertexcolor" "1" + "$no_fullbright" "1" + "$ignorez" "1" + "%keywords" "tf" +}
\ No newline at end of file diff --git a/materials/sprites/obj_icons/icon_obj_d.vmt b/materials/sprites/obj_icons/icon_obj_d.vmt index a9faf23..927a6e3 100644 --- a/materials/sprites/obj_icons/icon_obj_d.vmt +++ b/materials/sprites/obj_icons/icon_obj_d.vmt @@ -1,11 +1,11 @@ "UnlitGeneric" { - "$translucent" "1" - "$baseTexture" "vgui\replay\thumbnails\cp_icons\icon_obj_d" - "$alpha" "1" - "$vertexalpha" "1" - "$vertexcolor" "1" - "$no_fullbright" "1" - "$ignorez" "1" - "%keywords" "tf" + "$translucent" "1" + "$baseTexture" "vgui\replay\thumbnails\cp_icons\icon_obj_d" + "$alpha" "1" + "$vertexalpha" "1" + "$vertexcolor" "1" + "$no_fullbright" "1" + "$ignorez" "1" + "%keywords" "tf" }
\ No newline at end of file diff --git a/materials/sprites/obj_icons/icon_obj_e.vmt b/materials/sprites/obj_icons/icon_obj_e.vmt index 0259adb..7a72109 100644 --- a/materials/sprites/obj_icons/icon_obj_e.vmt +++ b/materials/sprites/obj_icons/icon_obj_e.vmt @@ -1,11 +1,11 @@ "UnlitGeneric" { - "$translucent" "1" - "$baseTexture" "vgui\replay\thumbnails\cp_icons\icon_obj_e" - "$alpha" "1" - "$vertexalpha" "1" - "$vertexcolor" "1" - "$no_fullbright" "1" - "$ignorez" "1" - "%keywords" "tf" + "$translucent" "1" + "$baseTexture" "vgui\replay\thumbnails\cp_icons\icon_obj_e" + "$alpha" "1" + "$vertexalpha" "1" + "$vertexcolor" "1" + "$no_fullbright" "1" + "$ignorez" "1" + "%keywords" "tf" }
\ No newline at end of file diff --git a/materials/sprites/obj_icons/icon_obj_neutral.vmt b/materials/sprites/obj_icons/icon_obj_neutral.vmt index 648d9b5..bf4029c 100644 --- a/materials/sprites/obj_icons/icon_obj_neutral.vmt +++ b/materials/sprites/obj_icons/icon_obj_neutral.vmt @@ -1,11 +1,11 @@ "UnlitGeneric" { - "$translucent" "1" - "$baseTexture" "vgui\replay\thumbnails\cp_icons\icon_obj_neutral" - "$alpha" "1" - "$vertexalpha" "1" - "$vertexcolor" "1" - "$no_fullbright" "1" - "$ignorez" "1" - "%keywords" "tf" + "$translucent" "1" + "$baseTexture" "vgui\replay\thumbnails\cp_icons\icon_obj_neutral" + "$alpha" "1" + "$vertexalpha" "1" + "$vertexcolor" "1" + "$no_fullbright" "1" + "$ignorez" "1" + "%keywords" "tf" }
\ No newline at end of file diff --git a/materials/sprites/obj_icons/icon_obj_neutral_locked.vmt b/materials/sprites/obj_icons/icon_obj_neutral_locked.vmt index d8ab795..30f3060 100644 --- a/materials/sprites/obj_icons/icon_obj_neutral_locked.vmt +++ b/materials/sprites/obj_icons/icon_obj_neutral_locked.vmt @@ -1,11 +1,11 @@ "UnlitGeneric" { - "$translucent" "1" - "$baseTexture" "vgui\replay\thumbnails\cp_icons\icon_obj_neutral_locked" - "$alpha" "1" - "$vertexalpha" "1" - "$vertexcolor" "1" - "$no_fullbright" "1" - "$ignorez" "1" - "%keywords" "tf" + "$translucent" "1" + "$baseTexture" "vgui\replay\thumbnails\cp_icons\icon_obj_neutral_locked" + "$alpha" "1" + "$vertexalpha" "1" + "$vertexcolor" "1" + "$no_fullbright" "1" + "$ignorez" "1" + "%keywords" "tf" }
\ No newline at end of file diff --git a/materials/sprites/obj_icons/icon_obj_red.vmt b/materials/sprites/obj_icons/icon_obj_red.vmt index bc2a3a6..7242020 100644 --- a/materials/sprites/obj_icons/icon_obj_red.vmt +++ b/materials/sprites/obj_icons/icon_obj_red.vmt @@ -1,11 +1,11 @@ "UnlitGeneric" { - "$translucent" "1" - "$baseTexture" "vgui\replay\thumbnails\cp_icons\icon_obj_red" - "$alpha" "1" - "$vertexalpha" "1" - "$vertexcolor" "1" - "$no_fullbright" "1" - "$ignorez" "1" - "%keywords" "tf" + "$translucent" "1" + "$baseTexture" "vgui\replay\thumbnails\cp_icons\icon_obj_red" + "$alpha" "1" + "$vertexalpha" "1" + "$vertexcolor" "1" + "$no_fullbright" "1" + "$ignorez" "1" + "%keywords" "tf" }
\ No newline at end of file diff --git a/materials/sprites/obj_icons/icon_obj_red_locked.vmt b/materials/sprites/obj_icons/icon_obj_red_locked.vmt index 3e08fc4..0c93e94 100644 --- a/materials/sprites/obj_icons/icon_obj_red_locked.vmt +++ b/materials/sprites/obj_icons/icon_obj_red_locked.vmt @@ -1,11 +1,11 @@ "UnlitGeneric" { - "$translucent" "1" - "$baseTexture" "vgui\replay\thumbnails\cp_icons\icon_obj_red_locked" - "$alpha" "1" - "$vertexalpha" "1" - "$vertexcolor" "1" - "$no_fullbright" "1" - "$ignorez" "1" - "%keywords" "tf" + "$translucent" "1" + "$baseTexture" "vgui\replay\thumbnails\cp_icons\icon_obj_red_locked" + "$alpha" "1" + "$vertexalpha" "1" + "$vertexcolor" "1" + "$no_fullbright" "1" + "$ignorez" "1" + "%keywords" "tf" }
\ No newline at end of file diff --git a/materials/sprites/obj_icons/icon_obj_white.vmt b/materials/sprites/obj_icons/icon_obj_white.vmt new file mode 100644 index 0000000..f5becf0 --- /dev/null +++ b/materials/sprites/obj_icons/icon_obj_white.vmt @@ -0,0 +1,11 @@ +"UnlitGeneric" +{ + "$translucent" "1" + "$baseTexture" "vgui\replay\thumbnails\cp_icons\icon_obj_white" + "$alpha" "1" + "$vertexalpha" "1" + "$vertexcolor" "1" + "$no_fullbright" "1" + "$ignorez" "1" + "%keywords" "tf" +}
\ No newline at end of file diff --git a/materials/vgui/replay/thumbnails/cp_icons/icon_obj_cap_blu.vtf b/materials/vgui/replay/thumbnails/cp_icons/icon_obj_cap_blu.vtf Binary files differnew file mode 100644 index 0000000..e7dbefb --- /dev/null +++ b/materials/vgui/replay/thumbnails/cp_icons/icon_obj_cap_blu.vtf diff --git a/materials/vgui/replay/thumbnails/cp_icons/icon_obj_cap_red.vtf b/materials/vgui/replay/thumbnails/cp_icons/icon_obj_cap_red.vtf Binary files differnew file mode 100644 index 0000000..c362720 --- /dev/null +++ b/materials/vgui/replay/thumbnails/cp_icons/icon_obj_cap_red.vtf diff --git a/materials/vgui/replay/thumbnails/cp_icons/icon_obj_neutral.vtf b/materials/vgui/replay/thumbnails/cp_icons/icon_obj_neutral.vtf Binary files differindex 44131c4..3e0666b 100644 --- a/materials/vgui/replay/thumbnails/cp_icons/icon_obj_neutral.vtf +++ b/materials/vgui/replay/thumbnails/cp_icons/icon_obj_neutral.vtf diff --git a/materials/vgui/replay/thumbnails/cp_icons/icon_obj_neutral_locked.vtf b/materials/vgui/replay/thumbnails/cp_icons/icon_obj_neutral_locked.vtf Binary files differindex 1205402..8ed5481 100644 --- a/materials/vgui/replay/thumbnails/cp_icons/icon_obj_neutral_locked.vtf +++ b/materials/vgui/replay/thumbnails/cp_icons/icon_obj_neutral_locked.vtf diff --git a/materials/vgui/replay/thumbnails/cp_icons/icon_obj_white.vtf b/materials/vgui/replay/thumbnails/cp_icons/icon_obj_white.vtf Binary files differnew file mode 100644 index 0000000..3c5efda --- /dev/null +++ b/materials/vgui/replay/thumbnails/cp_icons/icon_obj_white.vtf diff --git a/resource/preload.res b/resource/preload.res index f460957..f691a9f 100644 --- a/resource/preload.res +++ b/resource/preload.res @@ -60,6 +60,16 @@ "image" "../sprites/obj_icons/icon_obj_neutral_locked" } + "cpiconwhite" + { + "ControlName" "ImagePanel" + "fieldName" "cpiconwhite" + "xpos" "9999" + "visible" "1" + "enabled" "1" + "image" "../sprites/obj_icons/icon_obj_white" + } + "cpicona" { "ControlName" "ImagePanel" @@ -110,6 +120,26 @@ "image" "../sprites/obj_icons/icon_obj_e" } + "cpiconcapblu" + { + "ControlName" "ImagePanel" + "fieldName" "cpiconcapblu" + "xpos" "9999" + "visible" "1" + "enabled" "1" + "image" "../sprites/obj_icons/icon_obj_cap_blu" + } + + "cpiconcapred" + { + "ControlName" "ImagePanel" + "fieldName" "cpiconcapred" + "xpos" "9999" + "visible" "1" + "enabled" "1" + "image" "../sprites/obj_icons/icon_obj_cap_red" + } + "cpiconcapmask" { "ControlName" "ImagePanel" diff --git a/resource/ui/freezepanel_basic.res b/resource/ui/freezepanel_basic.res index f121cac..96d2cdc 100644 --- a/resource/ui/freezepanel_basic.res +++ b/resource/ui/freezepanel_basic.res @@ -13,7 +13,7 @@ "bgcolor_override" "255 255 255 0" "PaintBackgroundType" "0" - "model_ypos" "10" + "model_ypos" "20" "model_center_x" "1" "model_wide" "90" "model_tall" "60" diff --git a/resource/ui/matchmakingdashboard.res b/resource/ui/matchmakingdashboard.res index 7d476cb..f3c6e78 100644 --- a/resource/ui/matchmakingdashboard.res +++ b/resource/ui/matchmakingdashboard.res @@ -589,8 +589,8 @@ "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "armedBgColor_override" "192 28 0 255" - "defaultBgColor_override" "192 28 0 205" + "armedBgColor_override" "195 20 0 255" + "defaultBgColor_override" "175 25 11 255" "defaultFgColor_override" "TanLight" "armedFgColor_override" "TanLight" @@ -648,8 +648,8 @@ "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "armedBgColor_override" "192 28 0 255" - "defaultBgColor_override" "192 28 0 205" + "armedBgColor_override" "195 20 0 255" + "defaultBgColor_override" "175 25 11 255" "defaultFgColor_override" "TanLight" "armedFgColor_override" "TanLight" @@ -706,8 +706,8 @@ "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "armedBgColor_override" "170 221 183 255" - "defaultBgColor_override" "170 221 183 205" + "armedBgColor_override" "140 180 150 255" + "defaultBgColor_override" "100 120 100 255" "defaultFgColor_override" "TanLight" "armedFgColor_override" "TanLight" @@ -764,8 +764,8 @@ "sound_depressed" "UI/buttonclick.wav" "sound_released" "UI/buttonclickrelease.wav" - "armedBgColor_override" "CreditsGreen" - "defaultBgColor_override" "GreenSolid" + "armedBgColor_override" "94 150 49 255" + "defaultBgColor_override" "76 107 34 255" "defaultFgColor_override" "TanLight" "armedFgColor_override" "TanLight" diff --git a/resource/ui/objectivestatusescort.res b/resource/ui/objectivestatusescort.res index 13a73f8..fb18971 100644 --- a/resource/ui/objectivestatusescort.res +++ b/resource/ui/objectivestatusescort.res @@ -229,7 +229,7 @@ { "ControlName" "CExLabel" "fieldName" "RecedeTime" - "font" "Cerbetica10" + "font" "Cerbetica8" "xpos" "27" "ypos" "78" "zpos" "2" @@ -382,19 +382,17 @@ "if_multiple_trains" { - "xpos" "22" - "wide" "8" - "tall" "8" + "xpos" "23" } "if_multiple_trains_top" { - "ypos" "46" + "ypos" "47" } "if_multiple_trains_bottom" { - "ypos" "83" + "ypos" "84" } } @@ -434,9 +432,9 @@ { "ControlName" "CExLabel" "fieldName" "CapNumPlayers" - "font" "Cerbetica10" - "xpos" "32" - "ypos" "79" + "font" "Cerbetica8" + "xpos" "31" + "ypos" "78" "zpos" "5" "wide" "15" "tall" "8" diff --git a/resource/ui/spectator.res b/resource/ui/spectator.res index 02f8ef7..a6ac0e9 100644 --- a/resource/ui/spectator.res +++ b/resource/ui/spectator.res @@ -166,7 +166,7 @@ "paintbackground" "1" "PaintBackgroundType" "0" - "model_ypos" "10" + "model_ypos" "20" "model_center_x" "1" "model_wide" "90" "model_tall" "60" diff --git a/resource/ui/spectatortournament.res b/resource/ui/spectatortournament.res index 2dcb952..1aa3bed 100644 --- a/resource/ui/spectatortournament.res +++ b/resource/ui/spectatortournament.res @@ -436,7 +436,7 @@ "bgcolor_override" "255 255 255 0" "PaintBackgroundType" "0" - "model_ypos" "10" + "model_ypos" "20" "model_center_x" "1" "model_wide" "90" "model_tall" "60" diff --git a/resource/ui/textwindow.res b/resource/ui/textwindow.res index 4844aef..b9b7eb4 100644 --- a/resource/ui/textwindow.res +++ b/resource/ui/textwindow.res @@ -69,7 +69,7 @@ "ypos" "c-90" "zpos" "1" "wide" "340" - "tall" "185" + "tall" "181" "autoResize" "3" "pinCorner" "0" "visible" "1" diff --git a/scripts/hudlayout.res b/scripts/hudlayout.res index 4b7d36e..e7d63f5 100644 --- a/scripts/hudlayout.res +++ b/scripts/hudlayout.res @@ -663,8 +663,8 @@ "zpos" "-100" "wide" "f0" "tall" "480" - "visible" "0" // Change to "1" to enable - "enabled" "0" // Change to "1" to enable + "visible" "0" + "enabled" "0" "image" "replay/thumbnails/transparent" "scaleImage" "1" } @@ -940,7 +940,6 @@ "enabled" "1" "xpos" "0" "ypos" "0" - "ypos_minmode" "c-20" "wide" "640" "tall" "480" "PaintBackgroundType" "2" |