Merge pull request #110 from momentum-mod/bugfix_and_qol

Bugfixes and Quality of Life changes
momentum-mod · Oct 25, 2016 · 39208c0 · 39208c0
2 parents 5446a54 + 1140677
commit 39208c0
Show file tree

Hide file tree

Showing 100 changed files with 644 additions and 580 deletions.
diff --git a/mp/game/momentum/resource/momentum_english.txt b/mp/game/momentum/resource/momentum_english.txt
diff --git a/mp/game/momentum/resource/ui/ReplayUI.res b/mp/game/momentum/resource/ui/ReplayUI.res
@@ -30,7 +30,8 @@
 		"enabled"		"1"
 		"tabPosition"		"0"
 		"labelText"		"#MOM_ReplayStatusPlaying"
-		"textAlignment"		"west"
+        "font" "DefaultSmall"
+		"textAlignment"		"center"
 		"dulltext"		"0"
 		"brighttext"		"0"
 		"wrap"		"0"
@@ -52,7 +53,7 @@
 		"enabled"		"1"
 		"tabPosition"		"0"
 		"labelText"		"|<"
-		"textAlignment"		"west"
+		"textAlignment"		"center"
 		"dulltext"		"0"
 		"brighttext"		"0"
 		"wrap"		"0"
@@ -74,7 +75,7 @@
 		"enabled"		"1"
 		"tabPosition"		"0"
 		"labelText"		">|"
-		"textAlignment"		"west"
+		"textAlignment"		"center"
 		"dulltext"		"0"
 		"brighttext"		"0"
 		"wrap"		"0"
@@ -96,7 +97,7 @@
 		"enabled"		"1"
 		"tabPosition"		"0"
 		"labelText"		"<"
-		"textAlignment"		"west"
+		"textAlignment"		"center"
 		"dulltext"		"0"
 		"brighttext"		"0"
 		"wrap"			"0"
@@ -118,7 +119,7 @@
 		"enabled"		"1"
 		"tabPosition"		"0"
 		"labelText"		">"
-		"textAlignment"		"west"
+		"textAlignment"		"center"
 		"dulltext"		"0"
 		"brighttext"		"0"
 		"wrap"		"0"
@@ -151,14 +152,15 @@
 		"fieldName"		"ReplayProgressLabelFrame"
 		"xpos"		"12"
 		"ypos"		"113"
-		"wide"		"116"
+		"wide"		"130"
 		"tall"		"24"
 		"autoResize"		"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"		"0"
 		"textAlignment"		"west"
+        "font" "DefaultSmall"
 		"dulltext"		"0"
 		"brighttext"		"1"
 		"wrap"		"0"
@@ -169,14 +171,15 @@
 		"fieldName"		"ReplayProgressLabelTime"
 		"xpos"		"13"
 		"ypos"		"29"
-		"wide"		"160"
+		"wide"		"250"
 		"tall"		"24"
 		"autoResize"		"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"		"0"
 		"textAlignment"		"west"
+        "font" "DefaultSmall"
 		"dulltext"		"0"
 		"brighttext"		"1"
 		"wrap"		"0"
@@ -195,6 +198,7 @@
 		"enabled"		"1"
 		"tabPosition"		"0"
 		"labelText"		"#MOM_ReplayTimescale"
+        "font" "DefaultSmall"
 		"textAlignment"		"west"
 		"dulltext"		"0"
 		"brighttext"		"0"
@@ -205,7 +209,7 @@
     {
         "ControlName" "CCvarSlider"
         "fieldName" "TimescaleSlider"
-        "xpos" "80"
+        "xpos" "95"
         "ypos" "148"
         "wide"		"110"
 		"tall"		"40"
@@ -219,6 +223,7 @@
 		"tabPosition"		"0"
 		"leftText"		"#GameUI_Low"
 		"rightText"		"#GameUI_High"
+        "font" "DefaultSmall"
         "minvalue" "0.1"
         "maxvalue" "10.0"
         "cvar_name" "mom_replay_timescale"
@@ -231,7 +236,7 @@
 	{
 		"ControlName"		"TextEntry"
 		"fieldName"		"TimescaleEntry"
-		"xpos"		"196"
+		"xpos"		"220"
 		"ypos"		"148"
 		"wide"		"60"
 		"tall"		"24"
@@ -252,7 +257,7 @@
 	{
 		"ControlName"		"Button"
 		"fieldName"		"ReplayGo"
-		"xpos"		"133"
+		"xpos"		"150"
 		"ypos"		"113"
 		"wide"		"48"
 		"tall"		"24"
@@ -262,8 +267,9 @@
 		"enabled"		"1"
 		"tabPosition"		"0"
 		"labelText"		"#MOM_ReplayGoto"
-		"textAlignment"		"west"
+		"textAlignment"		"center"
 		"dulltext"		"0"
+        "font" "DefaultSmall"
 		"brighttext"		"0"
 		"wrap"		"0"
 		"Command"		"gototick"
@@ -274,7 +280,7 @@
 	{
 		"ControlName"		"TextEntry"
 		"fieldName"		"ReplayGoToTick"
-		"xpos"		"196"
+		"xpos"		"205"
 		"ypos"		"113"
 		"wide"		"60"
 		"tall"		"24"
@@ -306,7 +312,7 @@
 		"enabled"		"1"
 		"tabPosition"		"0"
 		"labelText"		">>"
-		"textAlignment"		"west"
+		"textAlignment"		"center"
 		"dulltext"		"0"
 		"brighttext"		"0"
 		"wrap"		"0"
@@ -327,7 +333,7 @@
 		"enabled"		"1"
 		"tabPosition"		"0"
 		"labelText"		"<<"
-		"textAlignment"		"west"
+		"textAlignment"		"center"
 		"dulltext"		"0"
 		"brighttext"		"0"
 		"wrap"		"0"

diff --git a/mp/game/momentum/resource/ui/SettingsPanel_ComparisonsSettings.res b/mp/game/momentum/resource/ui/SettingsPanel_ComparisonsSettings.res
@@ -42,6 +42,7 @@
 		"Default"		"0"
 		"cvar_name"		"mom_comparisons"
 		"cvar_value"		"1"
+        "actionsignallevel" "1"
     }
 
     "CompareFormat"
@@ -73,6 +74,7 @@
 		"Default"		"0"
 		"cvar_name"		"mom_comparisons_format_output"
 		"cvar_value"		"1"
+        "actionsignallevel" "1"
     }
 
     "ZonesLabel"
@@ -126,6 +128,7 @@
 		"maxchars"		"-1"
 		"NumericInputOnly"		"1"
 		"unicode"		"0"
+        "actionsignallevel" "1"
 	}
 
     "TimeTypeLabel"
@@ -180,6 +183,7 @@
 		"NumericInputOnly"		"0"
 		"unicode"		"0"
         "font" "DefaultVerySmall"
+        "actionsignallevel" "1"
 	}
 
     "TimeShowOverall"
@@ -212,6 +216,7 @@
 		"Default"		"0"
 		"cvar_name"		"mom_comparisons_time_show_overall"
 		"cvar_value"		"1"
+        "actionsignallevel" "1"
     }
 
     "TimeShowZone"
@@ -244,6 +249,7 @@
 		"Default"		"0"
 		"cvar_name"		"mom_comparisons_time_show_perzone"
 		"cvar_value"		"1"
+        "actionsignallevel" "1"
     }
 
     "VelShow"
@@ -275,6 +281,7 @@
 		"Default"		"0"
 		"cvar_name"		"mom_comparisons_vel_show"
 		"cvar_value"		"1"
+        "actionsignallevel" "1"
     }
 
     "VelShowAvg"
@@ -306,6 +313,7 @@
 		"Default"		"0"
 		"cvar_name"		"mom_comparisons_vel_show_avg"
 		"cvar_value"		"1"
+        "actionsignallevel" "1"
     }
 
     "VelShowMax"
@@ -337,6 +345,7 @@
 		"Default"		"0"
 		"cvar_name"		"mom_comparisons_vel_show_max"
 		"cvar_value"		"1"
+        "actionsignallevel" "1"
     }
 
     "VelShowEnter"
@@ -369,6 +378,7 @@
 		"Default"		"0"
 		"cvar_name"		"mom_comparisons_vel_show_enter"
 		"cvar_value"		"1"
+        "actionsignallevel" "1"
     }
 
     "VelShowExit"
@@ -401,6 +411,7 @@
 		"Default"		"0"
 		"cvar_name"		"mom_comparisons_vel_show_exit"
 		"cvar_value"		"1"
+        "actionsignallevel" "1"
     }
 
     "SyncShow"
@@ -432,6 +443,7 @@
 		"Default"		"0"
 		"cvar_name"		"mom_comparisons_sync_show"
 		"cvar_value"		"0"
+        "actionsignallevel" "1"
     }
 
     "SyncShowS1"
@@ -464,6 +476,7 @@
 		"Default"		"0"
 		"cvar_name"		"mom_comparisons_sync_show_sync1"
 		"cvar_value"		"0"
+        "actionsignallevel" "1"
     }
 
     "SyncShowS2"
@@ -496,6 +509,7 @@
 		"Default"		"0"
 		"cvar_name"		"mom_comparisons_sync_show_sync2"
 		"cvar_value"		"0"
+        "actionsignallevel" "1"
     }
 
     "ShowJumps"
@@ -527,6 +541,7 @@
 		"Default"		"0"
 		"cvar_name"		"mom_comparisons_jumps_show"
 		"cvar_value"		"1"
+        "actionsignallevel" "1"
     }
 
     "ShowStrafes"
@@ -558,5 +573,6 @@
 		"Default"		"0"
 		"cvar_name"		"mom_comparisons_strafe_show"
 		"cvar_value"		"1"
+        "actionsignallevel" "1"
     }
 }
diff --git a/mp/game/momentum/scripts/titles.txt b/mp/game/momentum/scripts/titles.txt
@@ -211,91 +211,4 @@ CHEATER
 #MOM_Cheater_Message
 }
 
-$position -1 0.65
-
-GAMESAVING
-{
-#HL2_Saved
-}
-
-// In-Game messages
-$position 0.1 0.1
-$effect 2
-// This is the final color
-$color 100 100 100
-// This is the highlight color
-$color2 240 110 0
-// This is the time it takes to fade each character
-$fadein 0.00
-// This is the amount of time the highlight lags behind the leading edge of the text
-$fxtime 0.15
-// How long to hold the message on the screen (after it scans out)
-$holdtime 1.0
-// How long it takes to fade out the message after holding
-$fadeout 0.25
-
-$boxsize 0.4
-$boxcolor 31 31 31 127
-
-// The following message will clear any existing message of the given name
-$clearmessage GAMESAVING
-
-GAMESAVED_360
-{
-#HL2_Saved
-}
-
-$position -1 0.65
-
-GAMESAVED
-{
-#HL2_Saved
-}
-
-$clearmessage 0
-
-// Game title
-// This is a placeholder to hold the effects controls for the "Half-Life" title
-$position -1 -1
-// Only effect 0 is supported for game title
-$effect 0
-// This is the final color
-$color 180 180 180
-// Not used color2
-$color2 0 0 0
-// This is the time it takes to fade in the title
-$fadein 1.0
-// How long to hold the message on the screen (after it scans out)
-$holdtime 3.0
-// How long it takes to fade out the message after holding
-$fadeout 1.5
-
-$boxsize 0.0
-
-GAMETITLE
-{
-Half-Life
-}
-
-//HAZARD COURSE TEXT
-
-// Test values -- JAY
-$position -1 0.65
-// Scan-out text effect
-$effect 2
-// This is the final color
-$color 100 100 100
-// This is the highlight color
-$color2 0 200 50
-// This is the time it takes to fade each character
-$fadein 0.005
-// This is the amount of time the highlight lags behind the leading edge of the text
-$fxtime 0.5
-// How long to hold the message on the screen (after it scans out)
-$holdtime 3.5
-// How long it takes to fade out the message after holding
-
-$fadeout 1.5
-$position -1 0.65
-$position -1 0.3
-
+$position -1 0.65