1.61 [Pick-Up]

fixed some tuff with picking up weapons
MedicodiBiscotti · Mar 21, 2016 · fc6f67f · fc6f67f
1 parent 169b25d
commit fc6f67f
Show file tree

Hide file tree

Showing 12 changed files with 35 additions and 57 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # biscottiHUD
-v. 1.60g
+v. 1.61
 
 This is my custom HUD for Team Fortress 2 (TF2).
 

diff --git a/biscottiHUD/customization/[FONT] custom/resource/ui/hudammoweapons.res b/biscottiHUD/customization/[FONT] custom/resource/ui/hudammoweapons.res
@@ -5,9 +5,7 @@
 		"ControlName"	"CTFImagePanel"
 		"fieldName"		"HudWeaponAmmoBG"
 		"xpos"			"28"
-		"xpos_minmode"	"28"
 		"ypos"			"17"
-		"ypos_minmode"	"17"
 		"zpos"			"1"
 		"wide"			"-90"
 		"tall"			"45"
@@ -23,12 +21,10 @@
 		"ControlName"	"ImagePanel"
 		"fieldName"		"HudWeaponLowAmmoImage"
 		"xpos"			"28"
-		"xpos_minmode"	"28"
 		"ypos"			"17"
-		"ypos_minmode"	"17"
 		"zpos"			"0"
-		"wide"			"58"			// 90
-		"tall"			"35"			// 45
+		"wide"			"58"
+		"tall"			"35"
 		"alpha"			"0"
 		"visible"		"1"
 		"enabled"		"1"

diff --git a/biscottiHUD/customization/[FONT] stock (default)/resource/ui/hudammoweapons.res b/biscottiHUD/customization/[FONT] stock (default)/resource/ui/hudammoweapons.res
@@ -5,9 +5,7 @@
 		"ControlName"	"CTFImagePanel"
 		"fieldName"		"HudWeaponAmmoBG"
 		"xpos"			"28"
-		"xpos_minmode"	"28"
 		"ypos"			"17"
-		"ypos_minmode"	"17"
 		"zpos"			"1"
 		"wide"			"-90"
 		"tall"			"45"
@@ -23,12 +21,10 @@
 		"ControlName"	"ImagePanel"
 		"fieldName"		"HudWeaponLowAmmoImage"
 		"xpos"			"28"
-		"xpos_minmode"	"28"
 		"ypos"			"17"
-		"ypos_minmode"	"17"
 		"zpos"			"0"
-		"wide"			"58"			// 90
-		"tall"			"35"			// 45
+		"wide"			"58"
+		"tall"			"35"
 		"alpha"			"0"
 		"visible"		"1"
 		"enabled"		"1"

diff --git a/biscottiHUD/incognito/scripts/hudlayout.res b/biscottiHUD/incognito/scripts/hudlayout.res
@@ -17,7 +17,7 @@
 		"visible" "1"
 		"enabled" "1"
 		"xpos"	"c115"	[$WIN32]
-		"xpos_minmode"	"c165"	[$WIN32]		// +50 from minmode 0		// c150
+		"xpos_minmode"	"c165"	[$WIN32]		// +50 from minmode 0
 		"ypos"	"c64"	[$WIN32]
 		"ypos_minmode"	"c144"	[$WIN32]		// +80 from minmode 0
 		"xpos"	"r131"	[$X360]

diff --git a/biscottiHUD/incognito_revert/scripts/hudlayout.res b/biscottiHUD/incognito_revert/scripts/hudlayout.res
@@ -17,7 +17,7 @@
 		"visible" "1"
 		"enabled" "1"
 		"xpos"	"c115"	[$WIN32]
-		"xpos_minmode"	"c165"	[$WIN32]		// +50 from minmode 0		// c150
+		"xpos_minmode"	"c165"	[$WIN32]		// +50 from minmode 0
 		"ypos"	"c64"	[$WIN32]
 		"ypos_minmode"	"c144"	[$WIN32]		// +80 from minmode 0
 		"xpos"	"r131"	[$X360]

diff --git a/biscottiHUD/resource/gamemenu.res b/biscottiHUD/resource/gamemenu.res
@@ -2,7 +2,7 @@
 {
 	"Version"
 	{
-		"label"			"biscottiHUD v. 1.60g"
+		"label"			"biscottiHUD v. 1.61"
 		"command"		"engine showconsole
 						 echo ..............................................................................................................
 						 echo ..............................................................................................................

diff --git a/biscottiHUD/resource/ui/hudammoweapons.res b/biscottiHUD/resource/ui/hudammoweapons.res
@@ -5,9 +5,7 @@
 		"ControlName"	"CTFImagePanel"
 		"fieldName"		"HudWeaponAmmoBG"
 		"xpos"			"28"
-		"xpos_minmode"	"28"
 		"ypos"			"17"
-		"ypos_minmode"	"17"
 		"zpos"			"1"
 		"wide"			"-90"
 		"tall"			"45"
@@ -23,12 +21,10 @@
 		"ControlName"	"ImagePanel"
 		"fieldName"		"HudWeaponLowAmmoImage"
 		"xpos"			"28"
-		"xpos_minmode"	"28"
 		"ypos"			"17"
-		"ypos_minmode"	"17"
 		"zpos"			"0"
-		"wide"			"58"			// 90
-		"tall"			"35"			// 45
+		"wide"			"58"
+		"tall"			"35"
 		"alpha"			"0"
 		"visible"		"1"
 		"enabled"		"1"

diff --git a/biscottiHUD/resource/ui/huditemeffectmeter_killstreak.res b/biscottiHUD/resource/ui/huditemeffectmeter_killstreak.res
@@ -14,7 +14,7 @@
 		"MeterBG"		"Gray"
 	}
 
-"ItemEffectMeterBG"
+	"ItemEffectMeterBG"
 	{
 		"ControlName"	"ImagePanel"
 		"fieldName"		"ItemEffectMeterBG"

diff --git a/biscottiHUD/resource/ui/hudobjectiveflagpanel.res b/biscottiHUD/resource/ui/hudobjectiveflagpanel.res
@@ -283,8 +283,9 @@
 	{
 		"ControlName"	"ImagePanel"
 		"fieldName"		"CarriedImage"
-		"xpos"			"0"					// c-50
-		"ypos"			"r127"	[$WIN32]	// r137
+		"xpos"			"0"
+		"ypos"			"r165"	[$WIN32]
+		"ypos_minmode"	"r127"	[$WIN32]
 		"ypos"			"r158"	[$X360]
 		"zpos"			"10"
 		"wide"			"100"

diff --git a/biscottiHUD/resource/ui/hudobjectiverobotdestruction.res b/biscottiHUD/resource/ui/hudobjectiverobotdestruction.res
@@ -120,8 +120,10 @@
 	{
 		"ControlName"		"EditablePanel"
 		"fieldName"			"CarriedContainer"
-		"xpos"				"c131"
-		"ypos"				"r187"
+		"xpos"				"c95"
+		"ypos"				"r267"
+		"xpos_minmode"		"c145"
+		"ypos_minmode"		"r187"
 		"zpos"				"1"
 		"wide"				"150"
 		"tall"				"80"

diff --git a/biscottiHUD/resource/ui/hudplayerclass.res b/biscottiHUD/resource/ui/hudplayerclass.res
@@ -111,7 +111,7 @@
 		"zpos"			"1"		
 		"wide"			"110"
 		"wide_minmode"	"100"
-		"tall"			"50"
+		"tall"			"40"
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"
@@ -342,15 +342,12 @@
 	{
 		"ControlName"			"EditablePanel"
 		"fieldName"				"CarryingWeapon"
-		"xpos"					"20"
-		"xpos_minmode"			"90"
-		"ypos"					"r27"
-		"ypos_minmode"			"r36"
-		"zpos"					"100"
+		"xpos"					"0"
+		"ypos"					"r114"
+		"ypos_minmode"			"r76"
+		"zpos"					"1"
 		"wide"					"500"
-		"wide_minmode"			"500"
-		"tall"	 				"28"
-		"tall_minmode"	 		"28"
+		"tall"	 				"32"
 
 		"CarryingBackground"
 		{
@@ -381,8 +378,8 @@
 			"src_corner_height"		"23"				// pixels inside the image
 			"src_corner_width"		"23"
 
-			"draw_corner_width"		"5"				// screen size of the corners ( and sides ), proportional
-			"draw_corner_height" 	"5"	
+			"draw_corner_width"		"0"				// screen size of the corners ( and sides ), proportional
+			"draw_corner_height" 	"0"	
 		}
 
 		"CarryingLabel"
@@ -392,19 +389,15 @@
 			"font"				"ReplayBrowserSmallest"
 			"font_minmode"		"TFFontMedium"
 			"xpos"				"5"
-			"xpos_minmode"		"5"
 			"ypos"				"3"
-			"ypos_minmode"		"2"
 			"zpos"				"1"
-			"wide"				"200"
-			"wide_minmode"		"f0"
+			"wide"				"f0"
 			"tall"	 			"f0"
-			"tall_minmode"		"f0"
 			"autoResize"		"0"
 			"pinCorner"			"0"
 			"visible"			"1"
 			"enabled"			"1"
-			"textAlignment"		"North-West"
+			"textAlignment"		"West"
 			"dulltext"			"0"
 			"brighttext"		"0"
 			"proportionaltoparent"	"1"
@@ -423,15 +416,13 @@
 			"ypos"				"p0.12"
 			"ypos_minmode"		"3"
 			"zpos"				"0"
-			"wide"				"200"
-			"wide_minmode"		"f0"
+			"wide"				"f0"
 			"tall"	 			"f0"
-			"tall_minmode"		"f0"
 			"autoResize"		"0"
 			"pinCorner"			"0"
-			"visible"			"1"
+			"visible"			"0"
 			"enabled"			"1"
-			"textAlignment"		"North-West"
+			"textAlignment"		"West"
 			"dulltext"			"0"
 			"brighttext"		"0"
 			"proportionaltoparent"	"1"
@@ -447,19 +438,15 @@
 			"font"				"FontStoreOriginalPrice"
 			"font_minmode"		"TFFontSmall"
 			"xpos"				"5"
-			"xpos_minmode"		"5"
 			"ypos"				"12"
-			"ypos_minmode"		"10"
 			"zpos"				"0"
-			"wide"				"200"
-			"wide_minmode"		"f0"
+			"wide"				"f0"
 			"tall"	 			"f0"
-			"tall_minmode"		"f0"
 			"autoResize"		"0"
 			"pinCorner"			"0"
 			"visible"			"1"
 			"enabled"			"1"
-			"textAlignment"		"North-West"
+			"textAlignment"		"West"
 			"dulltext"			"0"
 			"brighttext"		"0"
 			"proportionaltoparent"	"1"

diff --git a/biscottiHUD/scripts/hudlayout.res b/biscottiHUD/scripts/hudlayout.res
@@ -17,7 +17,7 @@
 		"visible" "1"
 		"enabled" "1"
 		"xpos"	"c115"	[$WIN32]
-		"xpos_minmode"	"c165"	[$WIN32]		// +50 from minmode 0		// c150
+		"xpos_minmode"	"c165"	[$WIN32]		// +50 from minmode 0
 		"ypos"	"c64"	[$WIN32]
 		"ypos_minmode"	"c144"	[$WIN32]		// +80 from minmode 0
 		"xpos"	"r131"	[$X360]
@@ -1493,7 +1493,7 @@
 		"wide"	"f0"
 		"tall"	"f0"
 	}
-
+	
 	HudMatchStatus
 	{
 		"fieldName"				"HudMatchStatus"