Merge pull request #54 from CriticalFlaw/master

Version 2017.02.07 (Smissmas 2016 & Merge #52 Fixes)

1 files changed, 29 insertions, 82 deletions

diff --git a/resource/ui/MainMenuOverride.res b/resource/ui/MainMenuOverride.res
index dafac1b..18d893d 100644
--- a/resource/ui/MainMenuOverride.res
+++ b/resource/ui/MainMenuOverride.res
@@ -2121,7 +2121,7 @@
 			"use_proportional_insets" "1"
 			"font"			"Cerbetica14"
 			"textAlignment"	"east"
-			"labelText"		"v2016.10.25"
+			"labelText"		"v2017.02.07"
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"default"		"1"
@@ -3092,12 +3092,12 @@
 			"image"			"glyph_bug"
 			"scaleImage"	"1"
 		}				
-	}		
+	}
 	
-	"WarButton"
+	"SettingsButton"
 	{
 		"ControlName"	"CExImageButton"
-		"fieldName"		"WarButton"
+		"fieldName"		"SettingsButton"
 		"xpos"			"75"
 		"ypos"			"284"
 		"zpos"			"1"
@@ -3109,14 +3109,14 @@
 		"tabPosition"	"0"
 		"font"			"Cerbetica16"
 		"textAlignment"	"west"
-		"labelText"		"Pyro vs Heavy"
+		"labelText"		"Options"
 		"textinsetx"	"24"
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"default"		"1"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"Command"		"view_war"
+		"Command"		"OpenOptionsDialog"
 		
 		"border_default"	""
 		"border_armed"		"MainMenuTabs"
@@ -3131,6 +3131,7 @@
 		"depressedBgColor_override" "TransparentPanelBG"
 		
 		"image_drawcolor"	"117 107 94 255"
+		
 		"SubImage"
 		{
 			"ControlName"	"ImagePanel"
@@ -3144,15 +3145,15 @@
 			"enabled"		"1"
 			"scaleImage"	"1"
 			"image"			"glyph_options"
-		}						
-	}		
+		}			
+	}
 	
 	"TF2SettingsButton"
 	{
 		"ControlName"	"CExImageButton"
 		"fieldName"		"TF2SettingsButton"
 		"xpos"			"75"
-		"ypos"			"320"
+		"ypos"			"302"
 		"zpos"			"1"
 		"wide"			"220"
 		"tall"			"18"
@@ -3198,68 +3199,14 @@
 			"scaleImage"	"1"
 			"image"			"glyph_options"
 		}						
-	}		
-	
-	"SettingsButton"
-	{
-		"ControlName"	"CExImageButton"
-		"fieldName"		"SettingsButton"
-		"xpos"			"75"
-		"ypos"			"302"
-		"zpos"			"1"
-		"wide"			"220"
-		"tall"			"18"
-		"autoResize"	"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"	"0"
-		"font"			"Cerbetica16"
-		"textAlignment"	"west"
-		"labelText"		"Options"
-		"textinsetx"	"24"
-		"dulltext"		"0"
-		"brighttext"	"0"
-		"default"		"1"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
-		"Command"		"OpenOptionsDialog"
-		
-		"border_default"	""
-		"border_armed"		"MainMenuTabs"
-		"paintbackground"	"1"
-		
-		"defaultFgColor_override" "TanLight"
-		"armedFgColor_override" "TanLight"
-		"depressedFgColor_override" "TanLight"
-		
-		"defaultBgColor_override" "0 0 0 0"
-		"armedBgColor_override" "TransparentPanelBG"
-		"depressedBgColor_override" "TransparentPanelBG"
-		
-		"image_drawcolor"	"117 107 94 255"
-		
-		"SubImage"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"SubImage"
-			"xpos"			"16"
-			"ypos"			"6"
-			"zpos"			"1"
-			"wide"			"0"
-			"tall"			"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"scaleImage"	"1"
-			"image"			"glyph_options"
-		}			
-	}
+	}	
 	
 	"ScoreboardToggle"
 	{
 		"ControlName"	"CExImageButton"
 		"fieldName"		"ScoreboardToggle"
 		"xpos"			"75"
-		"ypos"			"338"
+		"ypos"			"320"
 		"zpos"			"1"
 		"wide"			"220"
 		"tall"			"18"
@@ -3307,13 +3254,13 @@
 		}			
 	}
 	
-	"QuitButton"
+	"ConsoleButton"
 	{
 		"ControlName"	"CExImageButton"
-		"fieldName"		"QuitButton"
+		"fieldName"		"ConsoleButton"
 		"xpos"			"75"
-		"ypos"			"392"
-		"zpos"			"1"
+		"ypos"			"338"
+		"zpos"			"11"
 		"wide"			"220"
 		"tall"			"18"
 		"autoResize"	"0"
@@ -3322,14 +3269,14 @@
 		"tabPosition"	"0"
 		"font"			"Cerbetica16"
 		"textAlignment"	"west"
-		"labelText"		"Quit"
+		"labelText"		"Console"
 		"textinsetx"	"24"
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"default"		"1"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"Command"		"engine replay_confirmquit"
+		"Command"		"engine toggleconsole"
 		
 		"border_default"	""
 		"border_armed"		"MainMenuTabs"
@@ -3365,7 +3312,7 @@
 		"ControlName"	"CExImageButton"
 		"fieldName"		"DemoUIButton"
 		"xpos"			"75"
-		"ypos"			"374"
+		"ypos"			"356"
 		"zpos"			"1"
 		"wide"			"220"
 		"tall"			"18"
@@ -3411,15 +3358,15 @@
 			"scaleImage"	"1"
 			"image"			"glyph_options"
 		}			
-	}		
-
-	"ConsoleButton"
+	}
+	
+	"QuitButton"
 	{
 		"ControlName"	"CExImageButton"
-		"fieldName"		"ConsoleButton"
+		"fieldName"		"QuitButton"
 		"xpos"			"75"
-		"ypos"			"356"
-		"zpos"			"11"
+		"ypos"			"374"
+		"zpos"			"1"
 		"wide"			"220"
 		"tall"			"18"
 		"autoResize"	"0"
@@ -3428,14 +3375,14 @@
 		"tabPosition"	"0"
 		"font"			"Cerbetica16"
 		"textAlignment"	"west"
-		"labelText"		"Console"
+		"labelText"		"Quit"
 		"textinsetx"	"24"
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"default"		"1"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"Command"		"engine toggleconsole"
+		"Command"		"engine replay_confirmquit"
 		
 		"border_default"	""
 		"border_armed"		"MainMenuTabs"
@@ -3464,14 +3411,14 @@
 			"scaleImage"	"1"
 			"image"			"glyph_options"
 		}			
-	}		
+	}
 	
 	"DisconnectButton"
 	{
 		"ControlName"	"CExImageButton"
 		"fieldName"		"DisconnectButton"
 		"xpos"			"75"
-		"ypos"			"392"
+		"ypos"			"374"
 		"zpos"			"1"
 		"wide"			"220"
 		"tall"			"18"