Merge pull request #160 from raysfire/dev

v2020.1230

1 files changed, 113 insertions, 112 deletions

diff --git a/resource/ui/charinfopanel.res b/resource/ui/charinfopanel.res
index 804fc26..53b9ec4 100644
--- a/resource/ui/charinfopanel.res
+++ b/resource/ui/charinfopanel.res
@@ -2,104 +2,104 @@
 {
 	"character_info"
 	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"character_info"
-		"xpos"			"0"
-		"ypos"			"0"
-		"wide"			"f0"
-		"tall"			"480"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"	"0"
+		"ControlName"			"EditablePanel"
+		"fieldName"				"character_info"
+		"xpos"					"0"
+		"ypos"					"0"
+		"wide"					"f0"
+		"tall"					"480"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"visible"				"1"
+		"enabled"				"1"
+		"tabPosition"			"0"
 		"settitlebarvisible"	"1"
 		"PaintBackgroundType"	"0"
-		"bgcolor_override"				"27 27 27 0"
-		"infocus_bgcolor_override"		"27 27 27 0"
-		"outoffocus_bgcolor_override"	"27 27 27 0"
+		"bgcolor_override"					"27 27 27 0"
+		"infocus_bgcolor_override"			"27 27 27 0"
+		"outoffocus_bgcolor_override"		"27 27 27 0"
 
-		"title"			"#CharInfoAndSetup"
-		"title_font"	"HudFontMediumBold"
-		"titletextinsetX"	"40"
-		"titletextinsetY"	"0"
-		"titlebarfgcolor_override"				"HudOffWhite"
-		"titlebardisabledfgcolor_override"		"HudOffWhite"
-		"titlebarbgcolor_override"				"DarkGrey"
+		"title"								"#CharInfoAndSetup"
+		"title_font"						"HudFontMediumBold"
+		"titletextinsetX"					"40"
+		"titletextinsetY"					"0"
+		"titlebarfgcolor_override"			"HudOffWhite"
+		"titlebardisabledfgcolor_override"	"HudOffWhite"
+		"titlebarbgcolor_override"			"DarkGrey"
 
-		"clientinsetx_override"			"0"
-		"sheetinset_bottom"				"40"
+		"clientinsetx_override"				"0"
+		"sheetinset_bottom"					"40"
 	}
 
 	"BackgroundHeader"
 	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"BackgroundHeader"
-		"xpos"			"0"
-		"ypos"			"0"
-		"zpos"			"-2"
-		"wide"			"f0"
-		"tall"			"120"
-		"visible"		"1"
-		"enabled"		"1"
-		"image"			"loadout_header"
-		"tileImage"		"1"
+		"ControlName"		"ImagePanel"
+		"fieldName"			"BackgroundHeader"
+		"xpos"				"0"
+		"ypos"				"0"
+		"zpos"				"-2"
+		"wide"				"f0"
+		"tall"				"120"
+		"visible"			"1"
+		"enabled"			"1"
+		"image"				"loadout_header"
+		"tileImage"			"1"
 	}
 	"BackgroundHeader2"
 	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"BackgroundHeader2"
-		"xpos"			"0"
-		"ypos"			"0"
-		"zpos"			"-2"
-		"wide"			"f0"
-		"tall"			"120"
-		"visible"		"1"
-		"enabled"		"1"
-		"fillcolor"		"27 27 27 200"
-		"tileImage"		"1"
+		"ControlName"		"ImagePanel"
+		"fieldName"			"BackgroundHeader2"
+		"xpos"				"0"
+		"ypos"				"0"
+		"zpos"				"-2"
+		"wide"				"f0"
+		"tall"				"120"
+		"visible"			"1"
+		"enabled"			"1"
+		"fillcolor"			"27 27 27 200"
+		"tileImage"			"1"
 	}
 
 	"BackgroundFooter"
 	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"BackgroundFooter"
-		"xpos"			"0"
-		"ypos"			"420"
-		"zpos"			"0"
-		"wide"			"f0"
-		"tall"			"60"
-		"visible"		"1"
-		"enabled"		"1"
-		"image"			"loadout_header"
-		"tileImage"		"1"
+		"ControlName"		"ImagePanel"
+		"fieldName"			"BackgroundFooter"
+		"xpos"				"0"
+		"ypos"				"420"
+		"zpos"				"0"
+		"wide"				"f0"
+		"tall"				"60"
+		"visible"			"1"
+		"enabled"			"1"
+		"image"				"loadout_header"
+		"tileImage"			"1"
 	}
 	"BackgroundFooter2"
 	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"BackgroundFooter2"
-		"xpos"			"0"
-		"ypos"			"420"
-		"zpos"			"1"
-		"wide"			"f0"
-		"tall"			"60"
-		"visible"		"1"
-		"enabled"		"1"
-		"fillcolor"		"27 27 27 200"
-		"tileImage"		"1"
+		"ControlName"		"ImagePanel"
+		"fieldName"			"BackgroundFooter2"
+		"xpos"				"0"
+		"ypos"				"420"
+		"zpos"				"1"
+		"wide"				"f0"
+		"tall"				"60"
+		"visible"			"1"
+		"enabled"			"1"
+		"fillcolor"			"27 27 27 200"
+		"tileImage"			"1"
 	}
 
 	"FooterLine"
 	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"FooterLine"
-		"xpos"			"0"
-		"ypos"			"420"
-		"zpos"			"2"
-		"wide"			"f0"
-		"tall"			"2"
-		"visible"		"1"
-		"enabled"		"1"
+		"ControlName"		"EditablePanel"
+		"fieldName"			"FooterLine"
+		"xpos"				"0"
+		"ypos"				"420"
+		"zpos"				"2"
+		"wide"				"f0"
+		"tall"				"2"
+		"visible"			"1"
+		"enabled"			"1"
 		"PaintBackgroundType"	"2"
 		"bgcolor_override"		"ColorCyan"
 	}
@@ -132,56 +132,57 @@
 
 		"tabskv"
 		{
-			"textinsetx"		"25"
-			"textinsety"		"5"
-			"textAlignment"		"north"
-			"font"				"HudFontSmall"
-			"selectedcolor"		"TanLight"
-			"unselectedcolor"	"TanDark"
+			"textinsetx"				"25"
+			"textinsety"				"5"
+			"textAlignment"				"north"
+			"font"						"HudFontSmall"
+			"selectedcolor"				"TanLight"
+			"unselectedcolor"			"TanDark"
 			"defaultBgColor_override"	"DarkGrey"
 			"paintbackground"			"1"
 			"activeborder_override"		"CyanBorderTabs"
 			"normalborder_override"		"CyanBorderTabsInactive"
-			"unselectedBgColor_override"	"10 10 10 255"
-			"depressedBgColor_override"		"10 10 10 255"
+			"armedBgColor_override"		"10 10 10 255"
+			"selectedBgColor_override"	"10 10 10 255"
 		}
 	}
 
 	"BackButton"
 	{
-		"ControlName"	"CExButton"
-		"fieldName"		"BackButton"
-		"xpos"			"c-295"
-		"ypos"			"437"
-		"zpos"			"2"
-		"wide"			"100"
-		"tall"			"20"
-		"autoResize"	"0"
-		"pinCorner"		"3"
-		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"	"0"
-		"labelText"		"Back (&Q)"
-		"font"			"HudFontSmall"
-		"textAlignment"	"center"
-		"dulltext"		"0"
-		"brighttext"	"0"
-		"default"		"0"
-		"Command"		"back"
+		"ControlName"		"CExButton"
+		"fieldName"			"BackButton"
+		"xpos"				"c-295"
+		"ypos"				"437"
+		"zpos"				"2"
+		"wide"				"100"
+		"tall"				"20"
+		"autoResize"		"0"
+		"pinCorner"			"3"
+		"visible"			"1"
+		"enabled"			"1"
+		"tabPosition"		"0"
+		"labelText"			"Back (&Q)"
+		"font"				"HudFontSmall"
+		"textAlignment"		"center"
+		"dulltext"			"0"
+		"brighttext"		"0"
+		"default"			"0"
+		"Command"			"back"
+		
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
 	}
 
 	"NotificationsPresentPanel"
 	{
-		"ControlName"	"CNotificationsPresentPanel"
-		"fieldName"		"NotificationsPresentPanel"
-		"xpos"			"r200"
-		"ypos"			"10"
-		"zpos"			"10000"
-		"wide"			"190"
-		"tall"			"50"
-		"visible"		"0"
-		"enabled"		"1"
+		"ControlName"		"CNotificationsPresentPanel"
+		"fieldName"			"NotificationsPresentPanel"
+		"xpos"				"r200"
+		"ypos"				"10"
+		"zpos"				"10000"
+		"wide"				"190"
+		"tall"				"50"
+		"visible"			"0"
+		"enabled"			"1"
 	}
 }
\ No newline at end of file