Squashed commit of the following:

commit 9321cc9 Author: PapaPeach <[email protected]> Date: Sun Aug 14 20:41:07 2022 -0400 Fixed bug with Vaccinator + Vita Saw commit e80c57b Author: PapaPeach <[email protected]> Date: Sun Aug 14 20:04:05 2022 -0400 Optimized materials and reduced console errors
PapaPeach · Aug 15, 2022 · c4dd2c1 · c4dd2c1
1 parent 33b91ef
commit c4dd2c1
Show file tree

Hide file tree

Showing 22 changed files with 42 additions and 1,217 deletions.
diff --git a/customizations/Crosshair_Animations.txt b/customizations/Crosshair_Animations.txt
@@ -15,4 +15,17 @@ event DamagedPlayer
 {
  //Animate "CustomCrosshair" FgColor "255 0 0 255" Linear 0.0 0.00001 // Crosshair color on hit
  //Animate "CustomCrosshair" FgColor "255 255 255 255" Linear 0.10 0.10001 // Should match your crosshair color in crosshair.res
+
+
+
+
+
+
+
+
+
+
+ //Do not edit these lines please :)
+ StopEvent HudSpyDisguiseFadeOut 0.0
+ RunEvent HudSpyDisguiseFadeOut 0.001
 }
diff --git a/materials/vgui/logos/killfeed icons black/dneg_images.vtf b/materials/vgui/logos/killfeed icons black/dneg_images.vtf
diff --git a/materials/vgui/logos/killfeed icons black/dneg_images_v2.vtf b/materials/vgui/logos/killfeed icons black/dneg_images_v2.vtf
diff --git a/materials/vgui/logos/killfeed icons black/dneg_images_v3.vtf b/materials/vgui/logos/killfeed icons black/dneg_images_v3.vtf
diff --git a/materials/vgui/logos/killfeed icons white/d_images.vtf b/materials/vgui/logos/killfeed icons white/d_images.vtf
diff --git a/materials/vgui/logos/killfeed icons white/d_images_v2.vtf b/materials/vgui/logos/killfeed icons white/d_images_v2.vtf
diff --git a/materials/vgui/logos/killfeed icons white/d_images_v3.vtf b/materials/vgui/logos/killfeed icons white/d_images_v3.vtf
diff --git a/materials/vgui/logos/killstreaks/blackdom.vtf b/materials/vgui/logos/killstreaks/blackdom.vtf
diff --git a/materials/vgui/logos/killstreaks/blackks.vtf b/materials/vgui/logos/killstreaks/blackks.vtf
diff --git a/materials/vgui/logos/killstreaks/whitedom.vtf b/materials/vgui/logos/killstreaks/whitedom.vtf
diff --git a/materials/vgui/logos/killstreaks/whiteks.vtf b/materials/vgui/logos/killstreaks/whiteks.vtf
diff --git a/materials/vgui/maps/menu_thumb_missing.vmt b/materials/vgui/maps/menu_thumb_missing.vmt
@@ -0,0 +1 @@
+"UnlitGeneric" {}
diff --git a/materials/vgui/replay/thumbnails/transparent.vmt b/materials/vgui/replay/thumbnails/transparent.vmt
@@ -1,9 +1,13 @@
 "Refract"
 {
- "%keywords" "tf"
  "$refractamount" "0.0"
- "$refracttint" "{255 255 255}"
- "$refractblur" "0.0"
- "$scale" "[1 1]"
- "$normalmap" "vgui/replay/thumbnails/transparent"
-}
+ "$refracttint" "{255 255 255}"
+ "$refractblur" "0.0"
+ "$normalmap" "vgui/replay/thumbnails/transparent"
+ "$dudvmap" "0"
+
+ "<dx90"
+ {
+ "$normalmap" "vgui/gfx/vgui/trans_background"
+ }
+}
diff --git a/materials/vgui/replay/thumbnails/transparent.vtf b/materials/vgui/replay/thumbnails/transparent.vtf
diff --git a/resource/gamemenu.res b/resource/gamemenu.res
@@ -44,7 +44,7 @@
  {
  "label" ""
  "command" "engine play items/samurai/tf_samurai_noisemaker_setb_02.wav"
- "tooltip" "Released June 30, 2022"
+ "tooltip" "Released August 14, 2022"
  "OnlyAtMenu" "1"
  }
  ///////////////////////////////////////////////////////////////////

diff --git a/resource/ui/alternatives/Uber_Large.res b/resource/ui/alternatives/Uber_Large.res
@@ -49,7 +49,7 @@
  {
  "ControlName" "CExLabel"
  "fieldName" "IndividualChargesLabel"
- "xpos" "0"
+ "xpos" "-8"
  "ypos" "0"
  "zpos" "2"
  "wide" "100"
@@ -203,15 +203,15 @@
  {
  "ControlName" "EditablePanel"
  "fieldName" "ResistIconAnchor"
- "xpos" "-22"
+ "xpos" "-40"
  "ypos" "-14"
  "wide" "1"
  "tall" "50"
  "visible" "1"
  "enabled" "1"
 
  "pin_to_sibling" "IndividualChargesLabel"
- "pin_corner_to_sibling" "PIN_TOPLEFT"
+ "pin_corner_to_sibling" "PIN_TOPRIGHT"
  "pin_to_sibling_corner" "PIN_TOPRIGHT"
  }
 

diff --git a/resource/ui/alternatives/Uber_Small.res b/resource/ui/alternatives/Uber_Small.res
@@ -49,7 +49,7 @@
  {
  "ControlName" "CExLabel"
  "fieldName" "IndividualChargesLabel"
- "xpos" "0"
+ "xpos" "-8"
  "ypos" "0"
  "zpos" "2"
  "wide" "100"
@@ -191,15 +191,15 @@
  {
  "ControlName" "EditablePanel"
  "fieldName" "ResistIconAnchor"
- "xpos" "-22"
+ "xpos" "-40"
  "ypos" "-14"
  "wide" "1"
  "tall" "50"
  "visible" "1"
  "enabled" "1"
 
  "pin_to_sibling" "IndividualChargesLabel"
- "pin_corner_to_sibling" "PIN_TOPLEFT"
+ "pin_corner_to_sibling" "PIN_TOPRIGHT"
  "pin_to_sibling_corner" "PIN_TOPRIGHT"
  }
 

diff --git a/resource/ui/mainmenuoverride.res b/resource/ui/mainmenuoverride.res
@@ -247,17 +247,17 @@
  "textAlignment" "west"
  "AllCaps" "0"
  "use_proportional_insets" "1"
- "labelText" "Version 3.3.0"
+ "labelText" "Version 3.3.1"
  }
 
  "InfoSeparatorLine"
  {
  "ControlName" "EditablePanel"
  "fieldname" "InfoSeparatorLine"
- "xpos" "57" //xpos
+ "xpos" "55" //xpos
  "ypos" "148" //148
  "zpos" "2"
- "wide" "275" //xpos+wide=332
+ "wide" "277" //xpos+wide=332
  "tall" "1"
  "visible" "1"
  "bgcolor_override" "WhiteTransparent"
@@ -270,7 +270,7 @@
  "xpos" "12"
  "ypos" "145"
  "zpos" "100"
- "wide" "44" //Button Width
+ "wide" "42" //Button Width
  "tall" "6"
  "visible" "1"
 

diff --git a/resource/ui/pvprankpanel_peach.res b/resource/ui/pvprankpanel_peach.res
@@ -313,7 +313,7 @@
  {
  "ControlName" "EditablePanel"
  "fieldName" "StatsContainer"
- "xpos" "47" //StatsContainer xpos + ProgressBarsContainer wide=322
+ "xpos" "45" //StatsContainer xpos + ProgressBarsContainer wide=322
  "ypos" "rs1"
  "wide" "300"
  "tall" "40"
@@ -351,7 +351,7 @@
  "fieldName" "ProgressBarsContainer"
  "xpos" "0"
  "ypos" "r2"
- "wide" "275" //StatsContainer xpos + ProgressBarsContainer wide=322
+ "wide" "277" //StatsContainer xpos + ProgressBarsContainer wide=322
  "tall" "1"
  "proportionaltoparent" "1"
 
@@ -424,7 +424,7 @@
  "ControlName" "Label"
  "fieldName" "CurrentXPLabel"
  "xpos" "0"
- "ypos" "-1"
+ "ypos" "0"
  "zpos" "1"
  "wide" "0"
  "auto_wide_tocontents" "1"

diff --git a/scripts/hudanimations_peach.txt b/scripts/hudanimations_peach.txt
@@ -41,19 +41,11 @@ event HudHealthDyingPulse
  Animate PlayerStatusHealthValueTarget FgColor "Health Hurt Target" Linear 0.0 0.0
 
  Animate PlayerStatusHealthValueSpectator FgColor "Health Hurt Spec" Linear 0.0 0.0
-
- RunEvent HudHealthDyingPulseLoop 0.4
-}
-
-event HudHealthDyingPulseLoop
-{
- RunEvent HudHealthDyingPulse 0.0
 }
 
 event HudHealthDyingPulseStop
 {
  StopEvent HudHealthDyingPulse 0.0
- StopEvent HudHealthDyingPulseLoop 0.0
 
  Animate PlayerStatusHealthValue FgColor "Health" Linear 0.0 0.0
 
@@ -71,19 +63,11 @@ event HudLowAmmoPulse
  Animate AmmoInReserve FgColor "Ammo In Reserve Low" Linear 0.0 0.0
 
  Animate AmmoNoClip FgColor "Ammo No Clip Low" Linear 0.0 0.0
-
- RunEvent HudLowAmmoPulseLoop 0.4
 } 
 
-event HudLowAmmoPulseLoop
-{
- RunEvent HudLowAmmoPulse 0.0
-}
-
 event HudLowAmmoPulseStop
 {
  StopEvent HudLowAmmoPulse 0.0
- StopEvent HudLowAmmoPulseLoop 0.0
 
  Animate AmmoInClip FgColor "Ammo In Clip" Linear 0.0 0.0
 
@@ -191,8 +175,8 @@ event HudSpyDisguiseChanged
 
 event HudSpyDisguiseFadeIn
 {
- Animate HudPlayerClass Position "0 0" Linear 0.0 0.001
- Animate ModelPin Position "0 r120" Linear 0.0 0.001
+ Animate HudPlayerClass Position "0 0" Linear 0.01 0.001
+ Animate ModelPin Position "0 r120" Linear 0.01 0.001
 }
 
 event HudSpyDisguiseFadeOut
@@ -205,21 +189,12 @@ event HudSpyDisguiseFadeOut
 
 event ActiveTimerHighlight
 {
- Animate TimePanelValue FgColor "WhiteTransparent" Linear 0.1 0.1
- Animate TimePanelValue FgColor "WhiteTransparent" Linear 0.3 0.1
-
- Animate TimePanelValue FgColor "WhiteTransparent" Linear 0.5 0.1
- Animate TimePanelValue FgColor "WhiteTransparent" Linear 0.7 0.1
-
- Animate TimePanelValue FgColor "WhiteTransparent" Linear 0.9 0.1
- Animate TimePanelValue FgColor "WhiteTransparent" Linear 1.1 0.1
-
- Animate TimePanelValue FgColor "WhiteTransparent" Linear 1.3 0.3
+ Animate TimePanelValue FgColor "WhiteTransparent" Linear 0.0 0.1
 }
 
 event ActiveTimerDim
 {
- Animate TimePanelValue FgColor "WhiteTransparent" Linear 0.0 0.4
+ Animate TimePanelValue FgColor "WhiteTransparent" Linear 0.0 0.1
 }
 
 //====================================================================================================================