Merge pull request #57 from momentum-mod/vguiruninfo_wip

VGUI Run Info

.gitattributes

@@ -43,9 +43,11 @@ README text
 CONTRIBUTING text
 LICENSE text
 
+momentum_*.txt text
+gameui_*.txt text
+
 *.exe binary
 protoc binary
 ccache binary
 
 gtest_output_test_golden_lin.txt binary
-mod_*_english.txt binary

mp/game/momentum/momentum.fgd

@@ -33,15 +33,12 @@
 
 @SolidClass base(Trigger) = trigger_momentum_timer_start : "Trigger that starts the timer." 
 [
-	leavespeed(float) : "Max leave speed" : 290 : "Max speed (Units Per Second) the player will be able to leave the trigger if 'Limit Leave Speed' flag is set."
 	bhopleavespeed(float) : "Max leave speed if player bhopped" : 250 : "Max speed (Units Per Second) the player will be able to leave the trigger if they bhopped inside the start zone, and 'Limit leave speed if player bhopped' flag is set."
 	lookangles(angle) : "Look angles" : "0 0 0" : "Where player will look when teleported to start."
 	spawnflags(flags) =
 	[
 		1 : "Limit leave speed" : 1
 		2 : "Use look angles" : 0
-		4 : "Check only XY for leave speed check" : 1
-		8 : "Limit leave speed if player bhopped" : 1
 	]
 ]
 

mp/game/momentum/resource/ClientScheme.res

@@ -15,19 +15,23 @@ Scheme
 	Colors
 	{
 		// base colors
-		"Orange"			"255 176 0 255"
-		"OrangeDim"			"255 176 0 120"
-		"LightOrange"		"188 112 0 128"
+		"White"				"255 255 255 255"
+		"Light Gray"		"211 211 211 100"
+		"Gray" 				"128 128 128 150"
+		"Dark Gray" 		"64 64 64 200"
 
-		"Red"				"192 28 0 140"
-		"Black"				"0 0 0 196"
-		"TransparentBlack"	"0 0 0 196"
-		"TransparentLightBlack"	"0 0 0 90"
-
-		"Blank"				"0 0 0 0"
-		"ForTesting"		"255 0 0 32"
-		"ForTesting_Magenta"	"255 0 255 255"
-		"ForTesting_MagentaDim"	"255 0 255 120"
+		"Red"                "192 28 0 140"
+		"Black"                "0 0 0 196"
+		"TransparentBlack"    "0 0 0 196"
+		"TransparentLightBlack"    "0 0 0 90"
+
+		"Blank"                "0 0 0 1"
+
+		"MOM.Panel.Fg"				"255 255 255 125"
+		"MOM.Panel.Bg"				"0 0 0 76"
+		"MOM.Speedometer.Normal"	"255 255 255 125"
+		"MOM.Speedometer.Increase"	"30 150 210 255"
+		"MOM.Speedometer.Decrease"	"255 75 75 255"
 	}
 
 	///////////////////// BASE SETTINGS ////////////////////////
@@ -36,10 +40,10 @@ Scheme
 	// controls use these to determine their settings
 	BaseSettings
 	{
-		"FgColor"			"0 128 255 255"
+		"FgColor"			"255 255 255 255"
 		"BgColor"			"0 0 0 76"
 
-		"Panel.FgColor"			"0 128 255 100"
+		"Panel.FgColor"			"255 255 255 255"
 		"Panel.BgColor"			"0 0 0 76"
 
 		"BrightFg"		"128 255 255 255"
@@ -81,26 +85,26 @@ Scheme
 
 ///HERE
 				// vgui_controls color specifications
-		Border.Bright					"LightOrange"		// the lit side of a control
-		Border.Dark						"LightOrange"		// the dark/unlit side of a control
+		Border.Bright					"Gray"		// the lit side of a control
+		Border.Dark						"Gray"		// the dark/unlit side of a control
 		Border.Selection				"Blank"				// the additional border color for displaying the default/selected button
 
-		Button.TextColor				"Orange"
+		Button.TextColor				"White"
 		Button.BgColor					"Blank"
-		Button.ArmedTextColor			"Orange"
+		Button.ArmedTextColor			"White"
 		Button.ArmedBgColor				"Red"
-		Button.DepressedTextColor		"Orange"
+		Button.DepressedTextColor		"White"
 		Button.DepressedBgColor			"Red"
 
-		CheckButton.TextColor			"Orange"
-		CheckButton.SelectedTextColor	"Orange"
+		CheckButton.TextColor			"White"
+		CheckButton.SelectedTextColor	"White"
 		CheckButton.BgColor				"TransparentBlack"
 		CheckButton.Border1  			"Border.Dark" 		// the left checkbutton border
 		CheckButton.Border2  			"Border.Bright"		// the right checkbutton border
-		CheckButton.Check				"Orange"				// color of the check itself
+		CheckButton.Check				"White"				// color of the check itself
 
-		ComboBoxButton.ArrowColor		"Orange"
-		ComboBoxButton.ArmedArrowColor	"Orange"
+		ComboBoxButton.ArrowColor		"White"
+		ComboBoxButton.ArmedArrowColor	"White"
 		ComboBoxButton.BgColor			"TransparentBlack"
 		ComboBoxButton.DisabledBgColor	"Blank"
 
@@ -119,70 +123,70 @@ Scheme
 		FrameSystemButton.BgColor		"Blank"
 		FrameSystemButton.Icon			""
 		FrameSystemButton.DisabledIcon	""
-		FrameTitleBar.TextColor			"Orange"
+		FrameTitleBar.TextColor			"White"
 		FrameTitleBar.BgColor			"Blank"
-		FrameTitleBar.DisabledTextColor	"Orange"
+		FrameTitleBar.DisabledTextColor	"White"
 		FrameTitleBar.DisabledBgColor	"Blank"
 
-		GraphPanel.FgColor				"Orange"
+		GraphPanel.FgColor				"White"
 		GraphPanel.BgColor				"TransparentBlack"
 
-		Label.TextDullColor				"Orange"
-		Label.TextColor					"Orange"
-		Label.TextBrightColor			"Orange"
-		Label.SelectedTextColor			"Orange"
+		Label.TextDullColor				"White"
+		Label.TextColor					"White"
+		Label.TextBrightColor			"White"
+		Label.SelectedTextColor			"White"
 		Label.BgColor					"Blank"
 		Label.DisabledFgColor1			"Blank"
-		Label.DisabledFgColor2			"LightOrange"
+		Label.DisabledFgColor2			"Gray"
 
-		ListPanel.TextColor					"Orange"
+		ListPanel.TextColor					"White"
 		ListPanel.BgColor					"TransparentBlack"
 		ListPanel.SelectedTextColor			"Black"
 		ListPanel.SelectedBgColor			"Red"
 		ListPanel.SelectedOutOfFocusBgColor	"Red"
-		ListPanel.EmptyListInfoTextColor	"Orange"
+		ListPanel.EmptyListInfoTextColor	"White"
 
-		Menu.TextColor					"Orange"
+		Menu.TextColor					"White"
 		Menu.BgColor					"TransparentBlack"
-		Menu.ArmedTextColor				"Orange"
+		Menu.ArmedTextColor				"White"
 		Menu.ArmedBgColor				"Red"
 		Menu.TextInset					"6"
 
-		Chat.TypingText					"Orange"
+		Chat.TypingText					"White"
 
-		Panel.FgColor					"OrangeDim"
+		Panel.FgColor					"WhiteDim"
 		Panel.BgColor					"blank"
 
-		ProgressBar.FgColor				"Orange"
+		ProgressBar.FgColor				"White"
 		ProgressBar.BgColor				"TransparentBlack"
 
-		PropertySheet.TextColor			"Orange"
-		PropertySheet.SelectedTextColor	"Orange"
+		PropertySheet.TextColor			"White"
+		PropertySheet.SelectedTextColor	"White"
 		PropertySheet.TransitionEffectTime	"0.25"	// time to change from one tab to another
 
-		RadioButton.TextColor			"Orange"
-		RadioButton.SelectedTextColor	"Orange"
+		RadioButton.TextColor			"White"
+		RadioButton.SelectedTextColor	"White"
 
-		RichText.TextColor				"Orange"
+		RichText.TextColor				"White"
 		RichText.BgColor				"Blank"
-		RichText.SelectedTextColor		"Orange"
+		RichText.SelectedTextColor		"White"
 		RichText.SelectedBgColor		"Blank"
 
-				ScrollBarButton.FgColor				"Orange"
+		ScrollBarButton.FgColor				"White"
 		ScrollBarButton.BgColor				"Blank"
-		ScrollBarButton.ArmedFgColor		"Orange"
+		ScrollBarButton.ArmedFgColor		"White"
 		ScrollBarButton.ArmedBgColor		"Blank"
-		ScrollBarButton.DepressedFgColor	"Orange"
+		ScrollBarButton.DepressedFgColor	"White"
 		ScrollBarButton.DepressedBgColor	"Blank"
 
 		ScrollBarSlider.FgColor				"Blank"		// nob color
 		ScrollBarSlider.BgColor				"Blank"		// slider background color
 
-		SectionedListPanel.HeaderTextColor	"Orange"
+		SectionedListPanel.HeaderTextColor	"White"
 		SectionedListPanel.HeaderBgColor	"Blank"
 		SectionedListPanel.DividerColor		"Black"
-		SectionedListPanel.TextColor		"Orange"
-		SectionedListPanel.BrightTextColor	"Orange"
+		SectionedListPanel.TextColor		"White"
+		SectionedListPanel.BrightTextColor	"White"
 		SectionedListPanel.BgColor			"TransparentLightBlack"
 		SectionedListPanel.SelectedTextColor			"Black"
 		SectionedListPanel.SelectedBgColor				"Red"
@@ -195,17 +199,17 @@ Scheme
 		Slider.DisabledTextColor1	"117 117 117 255"
 		Slider.DisabledTextColor2	"30 30 30 255"
 
-		TextEntry.TextColor			"Orange"
+		TextEntry.TextColor			"White"
 		TextEntry.BgColor			"TransparentBlack"
-		TextEntry.CursorColor		"Orange"
-		TextEntry.DisabledTextColor	"Orange"
+		TextEntry.CursorColor		"White"
+		TextEntry.DisabledTextColor	"White"
 		TextEntry.DisabledBgColor	"Blank"
 		TextEntry.SelectedTextColor	"Black"
 		TextEntry.SelectedBgColor	"Red"
 		TextEntry.OutOfFocusSelectedBgColor	"Red"
 		TextEntry.FocusEdgeColor	"TransparentBlack"
 
-		ToggleButton.SelectedTextColor	"Orange"
+		ToggleButton.SelectedTextColor	"White"
 
 		Tooltip.TextColor			"TransparentBlack"
 		Tooltip.BgColor				"Red"
@@ -215,15 +219,15 @@ Scheme
 		WizardSubPanel.BgColor		"Blank"
 
 		// scheme-specific colors
-		"FgColor"		"Orange"
+		"FgColor"		"White"
 		"BgColor"		"TransparentBlack"
 
 		"ViewportBG"		"Blank"
 		"team0"			"204 204 204 255" // Spectators
 		"team1"			"255 64 64 255" // CT's
 		"team2"			"153 204 255 255" // T's
 
-		"MapDescriptionText"	"Orange" // the text used in the map description window
+		"MapDescriptionText"	"White" // the text used in the map description window
 		"CT_Blue"			"153 204 255 255"
 		"T_Red"				"255 64 64 255"
 		"Hostage_Yellow"	"Panel.FgColor"
@@ -276,6 +280,18 @@ Scheme
 	// describes all the fonts
 	Fonts
 	{
+		MomentumIcons
+		{
+			"1"
+			{
+				"name"		"MomIcons"
+				"tall"		"12"
+				"weight"	"0"
+				"antialias" "1"
+				"additive"	"1"
+				"custom"	"1"
+			}
+		}
 		Icons
 		{
 			"1"
@@ -649,6 +665,43 @@ Scheme
 				"custom"	"1"
 			}
 		}
+		HudNumbersSmallBold
+		{
+			"1"
+			{
+				"name"		"obsidian"
+				"tall"		"16"
+				"weight"	"1000"
+				"additive"	"1"
+				"antialias" "1"
+				"custom"	"1"
+				"bold"	"1"
+			}
+		}
+		HudNumbersVerySmall
+		{
+			"1"
+			{
+				"name"		"obsidian"
+				"tall"		"11"
+				"weight"	"1000"
+				"additive"	"1"
+				"antialias" "1"
+				"custom"	"1"
+			}
+		}
+		HudNumbersExtremelySmall
+		{
+			"1"
+			{
+				"name"		"obsidian"
+				"tall"		"9"
+				"weight"	"600"
+				"additive"	"1"
+				"antialias" "1"
+				"custom"	"1"
+			}
+		}
 		HudNumbersSmallGlow
 		{
 			"1"
@@ -1688,14 +1741,12 @@ Scheme
 	//
 	// specifies all the custom (non-system) font files that need to be loaded to service the above described fonts
 	CustomFontFiles
-	{		
+	{
 		"1"		"resource/HALFLIFE2.ttf"
-		"1"		"resource/HL2MP.ttf"
-		"1"		"resource/obsidian.ttf"
-		"1"		"resource/obsidianweaps.ttf"
-		"1"		"resource/custom.ttf"
-		"2"		"resource/HL2crosshairs.ttf"
-		"2"		"resource/cs.ttf"
+		"1"		"resource/MomIcons.ttf"
+		"2"		"resource/HL2MP.ttf"
+		"3"		"resource/HL2crosshairs.ttf"
+		"4"		"resource/cs.ttf"
 	}
 
 }

mp/game/momentum/resource/GameMenu.res

@@ -38,6 +38,12 @@
 		"InGameOrder" "90"
 	}
 	"6"
+	{
+	    "label" "#MOM_Settings"
+		"command" "engine mom_settings_show"
+		"InGameOrder" "100"
+	}
+	"6"
 	{
 		"label" "#MOM_Credits"
 		"command" "engine progress_enable \n map credits"
@@ -49,20 +55,20 @@
 	{
 		"label" "#MOM_QuitToMenu"
 		"command" "engine disconnect"
-		"InGameOrder" "90"
+		"InGameOrder" "100"
 		"OnlyInGame" "1"
 	}
 	"8"
 	{
 		"label" ""
 		"command" ""
-		"InGameOrder" "100"
+		"InGameOrder" "110"
 	}
 	"9"
 	{
 		"label" "#GameUI_GameMenu_Quit"
 		"command" "QuitNoConfirm"
-		"InGameOrder" "110"
+		"InGameOrder" "200"
 	}
 }