prerelease update

conchkritz · Mar 22, 2022 · 45acccf · 45acccf
1 parent 7cdbca8
commit 45acccf
Show file tree

Hide file tree

Showing 58 changed files with 1,821 additions and 1,315 deletions.
diff --git a/materials/vgui/chalkboard_scroll_box.vtf b/materials/vgui/chalkboard_scroll_box.vtf
diff --git a/materials/vgui/chalkboard_scroll_down.vtf b/materials/vgui/chalkboard_scroll_down.vtf
diff --git a/materials/vgui/chalkboard_scroll_line.vtf b/materials/vgui/chalkboard_scroll_line.vtf
diff --git a/materials/vgui/chalkboard_scroll_up.vtf b/materials/vgui/chalkboard_scroll_up.vtf
diff --git a/materials/vgui/replay/thumbnails/buttons/alert.vmt b/materials/vgui/replay/thumbnails/buttons/alert.vmt
diff --git a/materials/vgui/replay/thumbnails/buttons/alert.vtf b/materials/vgui/replay/thumbnails/buttons/alert.vtf
diff --git a/materials/vgui/replay/thumbnails/buttons/chat.vmt b/materials/vgui/replay/thumbnails/buttons/chat.vmt
diff --git a/materials/vgui/replay/thumbnails/buttons/chat.vtf b/materials/vgui/replay/thumbnails/buttons/chat.vtf
diff --git a/materials/vgui/replay/thumbnails/buttons/check.vmt b/materials/vgui/replay/thumbnails/buttons/check.vmt
diff --git a/materials/vgui/replay/thumbnails/buttons/check.vtf b/materials/vgui/replay/thumbnails/buttons/check.vtf
diff --git a/materials/vgui/replay/thumbnails/buttons/heart.vmt b/materials/vgui/replay/thumbnails/buttons/heart.vmt
diff --git a/materials/vgui/replay/thumbnails/buttons/heart.vtf b/materials/vgui/replay/thumbnails/buttons/heart.vtf
diff --git a/materials/vgui/replay/thumbnails/buttons/motd.vmt b/materials/vgui/replay/thumbnails/buttons/motd.vmt
diff --git a/materials/vgui/replay/thumbnails/buttons/motd.vtf b/materials/vgui/replay/thumbnails/buttons/motd.vtf
diff --git a/materials/vgui/replay/thumbnails/buttons/pda.vmt b/materials/vgui/replay/thumbnails/buttons/pda.vmt
diff --git a/materials/vgui/replay/thumbnails/buttons/pda.vtf b/materials/vgui/replay/thumbnails/buttons/pda.vtf
diff --git a/materials/vgui/replay/thumbnails/buttons/shutdown.vmt b/materials/vgui/replay/thumbnails/buttons/shutdown.vmt
diff --git a/materials/vgui/replay/thumbnails/buttons/shutdown.vtf b/materials/vgui/replay/thumbnails/buttons/shutdown.vtf
diff --git a/materials/vgui/replay/thumbnails/buttons/twitch.vmt b/materials/vgui/replay/thumbnails/buttons/twitch.vmt
diff --git a/materials/vgui/replay/thumbnails/buttons/twitch.vtf b/materials/vgui/replay/thumbnails/buttons/twitch.vtf
diff --git a/materials/vgui/replay/thumbnails/buttons/x.vmt b/materials/vgui/replay/thumbnails/buttons/x.vmt
diff --git a/materials/vgui/replay/thumbnails/buttons/x.vtf b/materials/vgui/replay/thumbnails/buttons/x.vtf
diff --git a/materials/vgui/replay/thumbnails/icons/glyph_hudmode_centered.vmt b/materials/vgui/replay/thumbnails/icons/glyph_hudmode_centered.vmt
@@ -0,0 +1,9 @@
+"UnlitGeneric"
+{
+	"$basetexture" "vgui\replay\thumbnails\glyphs\glyph_hudmode_centered"
+	"$translucent" 1
+	"$alpha" 1
+	"$vertexalpha" 1
+	"$ignorez" 1
+	"$vertexcolor" 1
+}
diff --git a/materials/vgui/replay/thumbnails/icons/glyph_hudmode_centered.vtf b/materials/vgui/replay/thumbnails/icons/glyph_hudmode_centered.vtf
diff --git a/materials/vgui/replay/thumbnails/icons/glyph_hudmode_default.vmt b/materials/vgui/replay/thumbnails/icons/glyph_hudmode_default.vmt
@@ -0,0 +1,9 @@
+"UnlitGeneric"
+{
+	"$basetexture" "vgui\replay\thumbnails\icons\glyph_hudmode_default"
+	"$translucent" 1
+	"$alpha" 1
+	"$vertexalpha" 1
+	"$ignorez" 1
+	"$vertexcolor" 1
+}
diff --git a/materials/vgui/replay/thumbnails/icons/glyph_hudmode_default.vtf b/materials/vgui/replay/thumbnails/icons/glyph_hudmode_default.vtf
diff --git a/materials/vgui/replay/thumbnails/icons/glyph_reload.vmt b/materials/vgui/replay/thumbnails/icons/glyph_reload.vmt
@@ -0,0 +1,9 @@
+"UnlitGeneric"
+{
+	"$basetexture" "vgui\replay\thumbnails\icons\glyph_reload"
+	"$translucent" 1
+	"$alpha" 1
+	"$vertexalpha" 1
+	"$ignorez" 1
+	"$vertexcolor" 1
+}
diff --git a/materials/vgui/replay/thumbnails/icons/glyph_reload.vtf b/materials/vgui/replay/thumbnails/icons/glyph_reload.vtf
diff --git a/resource/fonts/TF2Crosshairs.png b/resource/fonts/TF2Crosshairs.png
diff --git a/resource/gamemenu.res b/resource/gamemenu.res
@@ -0,0 +1,60 @@
+"GameMenu" [$WIN32]
+{
+	"VRModeButton"
+	{
+		"label" "#MMenu_VRMode_Activate"
+		"command" "engine vr_toggle"
+		"subimage" "glyph_vr"
+		"OnlyWhenVREnabled" "1" // fix pls
+	}
+	// im a hud theif
+	"MinmodeButton"
+	{
+		"label" "Toggle Minmode"
+		"command" "engine toggle cl_hud_minmode"
+		"subimage" "../vgui/replay/thumbnails/icons/glyph_hudmode_default"
+		"tooltip" "Toggle Minmode"
+	}
+	"SteamWorkshopButton"
+	{
+		"label" "#MMenu_SteamWorkshop"
+		"command" "engine OpenSteamWorkshopDialog"
+		"subimage" "glyph_steamworkshop"
+		"tooltip" "#MMenu_SteamWorkshop"
+	}
+
+	// These buttons are only shown while in-game
+	// and also are positioned by the .res file
+	"CallVoteButton"
+	{
+		"label"			""
+		"command"		"callvote"
+		"OnlyInGame"	"1"
+		"subimage" "icon_checkbox"
+		"tooltip" "#MMenu_CallVote"
+	}
+	"MutePlayersButton"
+	{
+		"label"			""
+		"command"		"OpenMutePlayerDialog"
+		"OnlyInGame"	"1"
+		"subimage" "glyph_muted"
+		"tooltip" "#MMenu_MutePlayers"
+	}
+	"RequestCoachButton"
+	{
+		"label"			""
+		"command"		"engine cl_coach_find_coach"
+		"OnlyInGame"	"1"
+		"subimage" "icon_whistle"
+		"tooltip" "#MMenu_RequestCoach"
+	}
+	"ReportPlayerButton"
+	{
+		"label"			""
+		"command"		"OpenReportPlayerDialog"
+		"OnlyInGame"	"1"
+		"subimage"		"glyph_alert"
+		"tooltip"		"#MMenu_ReportPlayer"
+	}
+}
diff --git a/resource/scheme/clientscheme_borders.res b/resource/scheme/clientscheme_borders.res
@@ -273,7 +273,36 @@ Scheme
 				}
 			}
 		}
-
+
+		ReloadHudBorder
+		{
+			"inset" "0 0 1 1"
+			"backgroundtype"		"2"
+			Left
+			{
+				"1"
+				{
+					"color" "TanDarker"
+					"offset" "0 1"
+				}
+			}
+
+		}
+
+		ReloadHudBorder2
+		{
+			"inset" "0 0 1 1"
+			"backgroundtype"		"2"
+			Right
+			{
+				"1"
+				{
+					"color" "TanDarker"
+					"offset" "0 1"
+				}
+			}
+
+		}	
 // 		===========================================
 // 		default edited border
 

diff --git a/resource/scheme/clientscheme_colors.res b/resource/scheme/clientscheme_colors.res
@@ -22,8 +22,8 @@ Scheme
 		"low"					"200 45 45 255" // low ammo/hp
 		"lowdark"				"175 45 45 255" // low ammo/hp
 		"overheal"				"75 175 255 255" // overhealed
-		"ubercharge1"			"60 160 255 255" // overhealed
-		"ubercharge2"			"95 205 255 2555" // overhealed
+		"ubercharge1"			"192 28 0 255" // uber 1
+		"ubercharge2"			"255 28 0 255" // uber 2 (fades into annd back to 1)
 		"meter1"				"255 192 0 255"
 		"meter2"				"255 128 0 255"
 		"meter3"				"255 64 0 255"