diff options
Diffstat (limited to 'resource')
21 files changed, 140 insertions, 623 deletions
diff --git a/resource/ui/HudDemomanCharge.res b/resource/ui/HudDemomanCharge.res index 190bb39..ca97bed 100644 --- a/resource/ui/HudDemomanCharge.res +++ b/resource/ui/HudDemomanCharge.res @@ -4,7 +4,6 @@ { "ControlName" "ContinuousProgressBar" "fieldName" "ChargeMeter" - "font" "Cerbetica12" "xpos" "0" "ypos" "87" "xpos_minmode" "15" @@ -12,7 +11,6 @@ "zpos" "2" "wide" "120" "tall" "8" - "wide_minmode" "120" "tall_minmode" "5" "autoResize" "0" "pinCorner" "0" @@ -23,10 +21,10 @@ "brighttext" "0" "fgcolor_override" "White" } - "ChargeMeterLabel" + "ItemEffectMeterLabel" { "ControlName" "CExLabel" - "fieldName" "ChargeMeterLabel" + "fieldName" "ItemEffectMeterLabel" "xpos" "125" "ypos" "87" "xpos_minmode" "9999" @@ -39,11 +37,10 @@ "visible" "1" "enabled" "1" "tabPosition" "0" - "labelText" "CHARGE" + "labelText" "#TF_Charge" "textAlignment" "west" "dulltext" "0" "brighttext" "0" "font" "Cerbetica10" - "fgcolor_override" "White" } }
\ No newline at end of file diff --git a/resource/ui/HudDemomanPipes.res b/resource/ui/HudDemomanPipes.res index a370ff8..ec45666 100644 --- a/resource/ui/HudDemomanPipes.res +++ b/resource/ui/HudDemomanPipes.res @@ -1,25 +1,5 @@ "Resource/UI/HudDemomanPipes.res" { - "background" - { - "ControlName" "CTFImagePanel" - "fieldName" "background" - "xpos" "9999" - "ypos" "9999" - "zpos" "0" - "wide" "76" - "tall" "38" - "visible" "1" - "visible_minmode" "0" - "enabled" "1" - "image" "../hud/misc_ammo_area_blue" - "scaleImage" "1" - "teambg_2" "../hud/misc_ammo_area_red" - "teambg_2_lodef" "../hud/misc_ammo_area_red_lodef" - "teambg_3" "../hud/misc_ammo_area_blue" - "teambg_3_lodef" "../hud/misc_ammo_area_blue_lodef" - } - "ChargeLabel" { "ControlName" "CExLabel" @@ -41,14 +21,12 @@ "dulltext" "0" "brighttext" "0" "font" "Cerbetica10" - "fgcolor_override" "White" } "ChargeMeter" { "ControlName" "ContinuousProgressBar" "fieldName" "ChargeMeter" - "font" "Default" "xpos" "0" "ypos" "99" "xpos_minmode" "15" @@ -56,7 +34,6 @@ "zpos" "1" "wide" "120" "tall" "8" - "wide_minmode" "120" "tall_minmode" "5" "autoResize" "0" "pinCorner" "0" @@ -79,22 +56,6 @@ "tall" "50" "visible" "1" - "PipeIcon" - { - "ControlName" "CTFImagePanel" - "fieldName" "PipeIcon" - "xpos" "9999" - "ypos" "9999" - "wide" "20" - "tall" "20" - "visible" "1" - "enabled" "1" - "image" "../hud/ico_stickybomb_red" - "scaleImage" "1" - "teambg_2" "../hud/ico_stickybomb_red" - "teambg_3" "../hud/ico_stickybomb_blue" - } - "NumPipesLabel" { "ControlName" "CExLabel" @@ -122,9 +83,8 @@ { "ControlName" "CExLabel" "fieldName" "NumPipesLabelDropshadow" - "xpos" "35" - "ypos" "9" - "ypos_minmode" "11" + "xpos" "-1" + "ypos" "-1" "zpos" "2" "wide" "35" "tall" "24" @@ -141,6 +101,10 @@ "font" "CerbeticaBold32" "font_minmode" "CerbeticaBold20" "fgcolor" "TransparentBlack" + + "pin_to_sibling" "NumPipesLabel" + "pin_corner_to_sibling" "PIN_TOPLEFT" + "pin_to_sibling_corner" "PIN_TOPLEFT" } } @@ -155,25 +119,6 @@ "tall" "50" "visible" "1" - "PipeIcon" - { - "ControlName" "CTFImagePanel" - "fieldName" "PipeIcon" - "xpos" "26" - "ypos" "16" - "ypos_minmode" "12" - "wide" "20" - "wide_minmode" "14" - "tall" "20" - "tall_minmode" "14" - "visible" "1" - "enabled" "1" - "image" "../hud/ico_stickybomb_red_faded" - "scaleImage" "1" - "teambg_2" "../hud/ico_stickybomb_red_faded" - "teambg_3" "../hud/ico_stickybomb_blue_faded" - } - "NumPipesLabel" { "ControlName" "CExLabel" @@ -203,11 +148,9 @@ { "ControlName" "CExLabel" "fieldName" "NumPipesLabelDropshadow" - "xpos" "51" - "xpos_minmode" "43" - "ypos" "19" - "ypos_minmode" "13" - "zpos" "2" + "xpos" "-1" + "ypos" "-1" + "zpos" "1" "wide" "35" "tall" "24" "tall_minmode" "20" @@ -223,7 +166,11 @@ "font" "HudFontMedium" "font_minmode" "HudFontSmall" "font_lodef" "HudFontMediumBig" - "fgcolor" "black" + "fgcolor" "TransparentBlack" + + "pin_to_sibling" "NumPipesLabel" + "pin_corner_to_sibling" "PIN_TOPLEFT" + "pin_to_sibling_corner" "PIN_TOPLEFT" } } }
\ No newline at end of file diff --git a/resource/ui/HudItemEffectMeter.res b/resource/ui/HudItemEffectMeter.res index fc54b77..24b3519 100644 --- a/resource/ui/HudItemEffectMeter.res +++ b/resource/ui/HudItemEffectMeter.res @@ -6,7 +6,7 @@ "visible" "1"
"enabled" "1"
"xpos" "c-75"
- "ypos" "c123"
+ "ypos" "c103"
"ypos_minmode" "c60"
"wide" "200"
"tall" "500"
@@ -49,7 +49,6 @@ "zpos" "2"
"wide" "120"
"tall" "8"
- "wide_minmode" "120"
"tall_minmode" "5"
"autoResize" "0"
"pinCorner" "0"
diff --git a/resource/ui/HudItemEffectMeter_Cleaver.res b/resource/ui/HudItemEffectMeter_Cleaver.res index f798b59..bacf449 100644 --- a/resource/ui/HudItemEffectMeter_Cleaver.res +++ b/resource/ui/HudItemEffectMeter_Cleaver.res @@ -4,7 +4,7 @@ {
"HudItemEffectMeter"
{
- "ypos" "c103"
+ "ypos" "c83"
"ypos_minmode" "c53"
}
diff --git a/resource/ui/HudItemEffectMeter_Demoman.res b/resource/ui/HudItemEffectMeter_Demoman.res index be5ec92..d46df50 100644 --- a/resource/ui/HudItemEffectMeter_Demoman.res +++ b/resource/ui/HudItemEffectMeter_Demoman.res @@ -5,7 +5,7 @@ "fieldName" "HudItemEffectMeter"
"visible" "1"
"enabled" "1"
- "xpos" "c25"
+ "xpos" "c5"
"ypos" "355"
"wide" "500"
"tall" "500"
@@ -19,10 +19,10 @@ "fieldName" "ItemEffectMeterLabel"
"xpos" "190"
"xpos_minmode" "192"
- "ypos" "-1"
+ "ypos" "0"
"zpos" "2"
"wide" "40"
- "tall" "12"
+ "tall" "11"
"autoResize" "1"
"pinCorner" "2"
"visible" "1"
@@ -43,7 +43,7 @@ "xpos" "25"
"ypos" "23"
"ypos_minmode" "0"
- "xpos_minmode" "0"
+ "xpos_minmode" "50"
"zpos" "2"
"wide" "40"
"wide_minmode" "50"
@@ -84,10 +84,8 @@ {
"ControlName" "CExLabel"
"fieldName" "ItemEffectMeterCountShadow"
- "xpos" "191"
- "ypos" "11"
- "xpos_minmode" "193"
- "ypos_minmode" "6"
+ "xpos" "-1"
+ "ypos" "-1"
"zpos" "2"
"wide" "40"
"tall" "20"
@@ -101,6 +99,10 @@ "brighttext" "0"
"font" "CerbeticaBold28"
"font_minmode" "CerbeticaBold16"
- "fgcolor" "transparentblack"
+ "fgcolor" "TransparentBlack"
+
+ "pin_to_sibling" "ItemEffectMeterCount"
+ "pin_corner_to_sibling" "PIN_TOPLEFT"
+ "pin_to_sibling_corner" "PIN_TOPLEFT"
}
}
\ No newline at end of file diff --git a/resource/ui/HudItemEffectMeter_Engineer.res b/resource/ui/HudItemEffectMeter_Engineer.res index 543e330..a137185 100644 --- a/resource/ui/HudItemEffectMeter_Engineer.res +++ b/resource/ui/HudItemEffectMeter_Engineer.res @@ -1,102 +1,6 @@ +#base "huditemeffectmeter_demoman.res"
+
"Resource/UI/HudItemEffectMeter_Engineer.res"
{
- HudItemEffectMeter
- {
- "fieldName" "HudItemEffectMeter"
- "visible" "1"
- "enabled" "1"
- "xpos" "c25"
- "ypos" "355"
- "wide" "500"
- "tall" "500"
- "MeterFG" "White"
- "MeterBG" "Gray"
- }
-
- "ItemEffectMeterLabel"
- {
- "ControlName" "CExLabel"
- "fieldName" "ItemEffectMeterLabel"
- "xpos" "190"
- "xpos_minmode" "145"
- "ypos" "-1"
- "zpos" "2"
- "wide" "40"
- "tall" "12"
- "autoResize" "1"
- "pinCorner" "2"
- "visible" "1"
- "enabled" "1"
- "tabPosition" "0"
- "labelText" "#TF_Ball"
- "textAlignment" "center"
- "dulltext" "0"
- "brighttext" "0"
- "font" "Cerbetica12"
- }
- "ItemEffectMeter"
- {
- "ControlName" "ContinuousProgressBar"
- "fieldName" "ItemEffectMeter"
- "font" "Default"
- "xpos" "25"
- "ypos" "23"
- "zpos" "2"
- "wide" "40"
- "tall" "6"
- "autoResize" "0"
- "pinCorner" "0"
- "visible" "0"
- "enabled" "0"
- "textAlignment" "Center"
- "dulltext" "0"
- "brighttext" "0"
- }
-
- "ItemEffectMeterCount"
- {
- "ControlName" "CExLabel"
- "fieldName" "ItemEffectMeterCount"
- "xpos" "190"
- "ypos" "10"
- "xpos_minmode" "145"
- "ypos_minmode" "5"
- "zpos" "2"
- "wide" "40"
- "tall" "20"
- "pinCorner" "2"
- "visible" "1"
- "enabled" "1"
- "tabPosition" "0"
- "labelText" "%progresscount%"
- "textAlignment" "center"
- "dulltext" "0"
- "brighttext" "0"
- "font" "CerbeticaBold28"
- "font_minmode" "CerbeticaBold16"
- }
- "ItemEffectMeterCountBackground"
- {
- "ControlName" "CExLabel"
- "fieldName" "ItemEffectMeterCountBackground"
- "xpos" "191"
- "ypos" "11"
- "xpos_minmode" "146"
- "ypos_minmode" "6"
- "zpos" "2"
- "wide" "40"
- "tall" "20"
- "pinCorner" "2"
- "visible" "1"
- "enabled" "1"
- "tabPosition" "0"
- "labelText" "%progresscount%"
- "textAlignment" "center"
- "dulltext" "0"
- "brighttext" "0"
- "font" "CerbeticaBold28"
- "font_minmode" "CerbeticaBold16"
- "fgcolor" "transparentblack"
- }
}
\ No newline at end of file diff --git a/resource/ui/HudItemEffectMeter_Heavy.res b/resource/ui/HudItemEffectMeter_Heavy.res index 4936ad7..903601c 100644 --- a/resource/ui/HudItemEffectMeter_Heavy.res +++ b/resource/ui/HudItemEffectMeter_Heavy.res @@ -1,10 +1,10 @@ #base "huditemeffectmeter.res" -"Resource/UI/HudItemEffectMeter_Cleaver.res" +"Resource/UI/HudItemEffectMeter_Scout.res" { "HudItemEffectMeter" { - "ypos" "c113" + "ypos" "c93" "ypos_minmode" "c53" } diff --git a/resource/ui/HudItemEffectMeter_ParticleCannon.res b/resource/ui/HudItemEffectMeter_ParticleCannon.res index b3c8814..aa360cf 100644 --- a/resource/ui/HudItemEffectMeter_ParticleCannon.res +++ b/resource/ui/HudItemEffectMeter_ParticleCannon.res @@ -4,8 +4,7 @@ {
"HudItemEffectMeter"
{
- "xpos" "c-75" [$WIN32]
- "ypos" "c113" [$WIN32]
+ "ypos" "c93" [$WIN32]
"ypos_minmode" "c46" [$WIN32]
}
diff --git a/resource/ui/HudItemEffectMeter_Pomson.res b/resource/ui/HudItemEffectMeter_Pomson.res index dbab866..88f3458 100644 --- a/resource/ui/HudItemEffectMeter_Pomson.res +++ b/resource/ui/HudItemEffectMeter_Pomson.res @@ -4,7 +4,7 @@ {
"HudItemEffectMeter"
{
- "ypos" "c113"
+ "ypos" "c93"
"ypos_minmode" "c46"
}
diff --git a/resource/ui/HudItemEffectMeter_Raygun.res b/resource/ui/HudItemEffectMeter_Raygun.res index 86cc8f5..aa44c51 100644 --- a/resource/ui/HudItemEffectMeter_Raygun.res +++ b/resource/ui/HudItemEffectMeter_Raygun.res @@ -4,6 +4,7 @@ {
"HudItemEffectMeter"
{
+ "ypos" "c103"
"ypos_minmode" "c54"
}
diff --git a/resource/ui/HudItemEffectMeter_Sapper.res b/resource/ui/HudItemEffectMeter_Sapper.res index f2cc063..8c2339e 100644 --- a/resource/ui/HudItemEffectMeter_Sapper.res +++ b/resource/ui/HudItemEffectMeter_Sapper.res @@ -1,6 +1,6 @@ #base "huditemeffectmeter.res" -"Resource/UI/HudItemEffectMeter_SodaPopper.res" +"Resource/UI/HudItemEffectMeter_Sapper.res" { "HudItemEffectMeter" { diff --git a/resource/ui/HudItemEffectMeter_Scout.res b/resource/ui/HudItemEffectMeter_Scout.res index 4e679cd..8cf9dcf 100644 --- a/resource/ui/HudItemEffectMeter_Scout.res +++ b/resource/ui/HudItemEffectMeter_Scout.res @@ -4,7 +4,7 @@ {
"HudItemEffectMeter"
{
- "ypos" "c103"
+ "ypos" "c93"
"ypos_minmode" "c53"
}
diff --git a/resource/ui/HudItemEffectMeter_Sniper.res b/resource/ui/HudItemEffectMeter_Sniper.res index ed8e5dc..74fa08f 100644 --- a/resource/ui/HudItemEffectMeter_Sniper.res +++ b/resource/ui/HudItemEffectMeter_Sniper.res @@ -1,103 +1,6 @@ +#base "huditemeffectmeter_demoman.res"
+
"Resource/UI/HudItemEffectMeter_Sniper.res"
{
- HudItemEffectMeter
- {
- "fieldName" "HudItemEffectMeter"
- "visible" "1"
- "enabled" "1"
- "xpos" "c25"
- "ypos" "355"
- "wide" "500"
- "tall" "500"
- "MeterFG" "White"
- "MeterBG" "Gray"
- }
-
- "ItemEffectMeterLabel"
- {
- "ControlName" "CExLabel"
- "fieldName" "ItemEffectMeterLabel"
- "xpos" "190"
- "xpos_minmode" "192"
- "ypos" "-1"
- "zpos" "2"
- "wide" "40"
- "tall" "12"
- "autoResize" "1"
- "pinCorner" "2"
- "visible" "1"
- "enabled" "1"
- "tabPosition" "0"
- "labelText" "#TF_Ball"
- "textAlignment" "center"
- "dulltext" "0"
- "brighttext" "0"
- "font" "Cerbetica12"
- }
-
- "ItemEffectMeter"
- {
- "ControlName" "ContinuousProgressBar"
- "fieldName" "ItemEffectMeter"
- "font" "Default"
- "ypos" "0"
- "xpos" "0"
- "zpos" "2"
- "wide" "40"
- "tall" "6"
- "autoResize" "0"
- "pinCorner" "0"
- "visible" "0"
- "enabled" "0"
- "textAlignment" "Center"
- "dulltext" "0"
- "brighttext" "0"
- }
-
- "ItemEffectMeterCount"
- {
- "ControlName" "CExLabel"
- "fieldName" "ItemEffectMeterCount"
- "xpos" "190"
- "ypos" "10"
- "xpos_minmode" "192"
- "ypos_minmode" "6"
- "zpos" "2"
- "wide" "40"
- "tall" "20"
- "pinCorner" "2"
- "visible" "1"
- "enabled" "1"
- "tabPosition" "0"
- "labelText" "%progresscount%"
- "textAlignment" "center"
- "dulltext" "0"
- "brighttext" "0"
- "font" "CerbeticaBold28"
- "font_minmode" "CerbeticaBold16"
- }
- "ItemEffectMeterCountBackground"
- {
- "ControlName" "CExLabel"
- "fieldName" "ItemEffectMeterCountBackground"
- "xpos" "191"
- "ypos" "11"
- "xpos_minmode" "193"
- "ypos_minmode" "6"
- "zpos" "2"
- "wide" "40"
- "tall" "20"
- "pinCorner" "2"
- "visible" "1"
- "enabled" "1"
- "tabPosition" "0"
- "labelText" "%progresscount%"
- "textAlignment" "center"
- "dulltext" "0"
- "brighttext" "0"
- "font" "CerbeticaBold28"
- "font_minmode" "CerbeticaBold16"
- "fgcolor" "transparentblack"
- }
}
\ No newline at end of file diff --git a/resource/ui/HudItemEffectMeter_SniperFocus.res b/resource/ui/HudItemEffectMeter_SniperFocus.res index 4124c74..2f854a2 100644 --- a/resource/ui/HudItemEffectMeter_SniperFocus.res +++ b/resource/ui/HudItemEffectMeter_SniperFocus.res @@ -1,10 +1,10 @@ #base "huditemeffectmeter.res"
-"Resource/UI/HudItemEffectMeter_SodaPopper.res"
+"Resource/UI/HudItemEffectMeter_SniperFocus.res"
{
"HudItemEffectMeter"
{
- "ypos" "c111"
+ "ypos" "c93"
"ypos_minmode" "c46"
}
diff --git a/resource/ui/HudItemEffectMeter_SodaPopper.res b/resource/ui/HudItemEffectMeter_SodaPopper.res index fe63e43..582043d 100644 --- a/resource/ui/HudItemEffectMeter_SodaPopper.res +++ b/resource/ui/HudItemEffectMeter_SodaPopper.res @@ -4,7 +4,7 @@ {
"HudItemEffectMeter"
{
- "ypos" "c113"
+ "ypos" "c83"
"ypos_minmode" "c46"
}
diff --git a/resource/ui/HudItemEffectMeter_Spy.res b/resource/ui/HudItemEffectMeter_Spy.res index f2375e3..acf9ca0 100644 --- a/resource/ui/HudItemEffectMeter_Spy.res +++ b/resource/ui/HudItemEffectMeter_Spy.res @@ -1,106 +1,6 @@ +#base "huditemeffectmeter_demoman.res"
+
"Resource/UI/HudItemEffectMeter_Spy.res"
{
- HudItemEffectMeter
- {
- "fieldName" "HudItemEffectMeter"
- "visible" "1"
- "enabled" "1"
- "xpos" "c25"
- "ypos" "355"
- "wide" "500"
- "tall" "500"
- "MeterFG" "White"
- "MeterBG" "Gray"
- }
-
- "ItemEffectMeterLabel"
- {
- "ControlName" "CExLabel"
- "fieldName" "ItemEffectMeterLabel"
- "xpos" "190"
- "xpos_minmode" "192"
- "ypos" "-1"
- "zpos" "2"
- "wide" "40"
- "tall" "12"
- "autoResize" "1"
- "pinCorner" "2"
- "visible" "1"
- "enabled" "1"
- "tabPosition" "0"
- "labelText" "#TF_Ball"
- "textAlignment" "center"
- "dulltext" "0"
- "brighttext" "0"
- "font" "Cerbetica12"
- }
-
- "ItemEffectMeter"
- {
- "ControlName" "ContinuousProgressBar"
- "fieldName" "ItemEffectMeter"
- "font" "Default"
- "xpos" "25"
- "ypos" "23"
- "ypos_minmode" "0"
- "xpos_minmode" "0"
- "zpos" "2"
- "wide" "40"
- "wide_minmode" "50"
- "tall" "6"
- "autoResize" "0"
- "pinCorner" "0"
- "visible" "0"
- "enabled" "0"
- "textAlignment" "Center"
- "dulltext" "0"
- "brighttext" "0"
- }
-
- "ItemEffectMeterCount"
- {
- "ControlName" "CExLabel"
- "fieldName" "ItemEffectMeterCount"
- "xpos" "190"
- "ypos" "10"
- "xpos_minmode" "192"
- "ypos_minmode" "5"
- "zpos" "2"
- "wide" "40"
- "tall" "20"
- "pinCorner" "2"
- "visible" "1"
- "enabled" "1"
- "tabPosition" "0"
- "labelText" "%progresscount%"
- "textAlignment" "center"
- "dulltext" "0"
- "brighttext" "0"
- "font" "CerbeticaBold28"
- "font_minmode" "CerbeticaBold16"
- }
- "ItemEffectMeterCountBackground"
- {
- "ControlName" "CExLabel"
- "fieldName" "ItemEffectMeterCountBackground"
- "xpos" "191"
- "ypos" "11"
- "xpos_minmode" "193"
- "ypos_minmode" "6"
- "zpos" "2"
- "wide" "40"
- "tall" "20"
- "pinCorner" "2"
- "visible" "1"
- "enabled" "1"
- "tabPosition" "0"
- "labelText" "%progresscount%"
- "textAlignment" "center"
- "dulltext" "0"
- "brighttext" "0"
- "font" "CerbeticaBold28"
- "font_minmode" "CerbeticaBold16"
- "fgcolor" "transparentblack"
- }
}
\ No newline at end of file diff --git a/resource/ui/HudItemEffectMeter_SpyKnife.res b/resource/ui/HudItemEffectMeter_SpyKnife.res index 81d4b2d..1db0b2e 100644 --- a/resource/ui/HudItemEffectMeter_SpyKnife.res +++ b/resource/ui/HudItemEffectMeter_SpyKnife.res @@ -4,7 +4,7 @@ {
"HudItemEffectMeter"
{
- "ypos" "c113"
+ "ypos" "c93"
"ypos_minmode" "c53"
}
diff --git a/resource/ui/HudMedicCharge.res b/resource/ui/HudMedicCharge.res index a13388d..4c531fb 100644 --- a/resource/ui/HudMedicCharge.res +++ b/resource/ui/HudMedicCharge.res @@ -4,44 +4,25 @@ { "ControlName" "CTFImagePanel" "fieldName" "Background" - "xpos" "9999" - "ypos" "9999" + "xpos" "0" + "ypos" "0" "zpos" "0" "wide" "130" "tall" "65" - "visible" "1" - "enabled" "1" + "visible" "0" + "enabled" "0" "image" "../hud/medic_charge_blue_bg" "scaleImage" "1" "teambg_2" "../hud/medic_charge_red_bg" "teambg_3" "../hud/medic_charge_blue_bg" } - "ChargeBackground" - { - "ControlName" "ImagePanel" - "fieldName" "ChargeBackground" - "font" "Default" - "xpos" "75" - "ypos" "115" - "xpos_minmode" "0" - "ypos_minmode" "35" - "zpos" "2" - "wide" "150" - "tall" "20" - "wide_minmode" "124" - "tall_minmode" "14" - "visible" "0" - "enabled" "0" - "fillcolor" "255 255 255 50" - } - "ChargeLabel" { "ControlName" "CExLabel" "fieldName" "ChargeLabel" - "xpos" "236" - "ypos" "40" + "xpos" "150" + "ypos" "35" "xpos_minmode" "96" "ypos_minmode" "-5" "zpos" "2" @@ -87,19 +68,46 @@ "fgcolor" "Ammo In Clip" } + "ChargeMeterLabel" + { + "ControlName" "CExLabel" + "fieldName" "ChargeMeterLabel" + "xpos" "75" + "ypos" "117" + "xpos_minmode" "0" + "ypos_minmode" "34" + "zpos" "3" + "wide" "150" + "tall" "15" + "wide_minmode" "124" + "tall_minmode" "16" + "autoResize" "1" + "pinCorner" "2" + "visible" "1" + "enabled" "1" + "tabPosition" "0" + "labelText" "" + "textAlignment" "center" + "dulltext" "0" + "brighttext" "0" + "font" "Cerbetica16" + "font_minmode" "Cerbetica12" + "fgcolor" "150 150 150 255" + } + "ChargeMeter" { "ControlName" "ContinuousProgressBar" "fieldName" "ChargeMeter" "font" "Default" - "xpos" "75" - "ypos" "95" - "xpos_minmode" "2" - "ypos_minmode" "37" + "xpos" "0" + "ypos" "60" + "xpos_minmode" "10" + "ypos_minmode" "27" "zpos" "2" "wide" "150" "tall" "20" - "wide_minmode" "124" + "wide_minmode" "114" "tall_minmode" "10" "autoResize" "0" "pinCorner" "0" @@ -117,15 +125,16 @@ "ControlName" "ContinuousProgressBar" "fieldName" "ChargeMeter1" "font" "Default" - "xpos" "250" - "ypos" "55" + "xpos" "0" + "ypos" "60" "zpos" "3" - "wide" "100" - "xpos_minmode" "136" - "ypos_minmode" "23" + "xpos_minmode" "33" + "ypos_minmode" "22" "zpos_minmode" "4" + "wide" "36" + "tall" "20" "wide_minmode" "20" - "tall" "9" + "tall_minmode" "17" "autoResize" "0" "pinCorner" "0" "visible" "1" @@ -141,15 +150,13 @@ "ControlName" "ContinuousProgressBar" "fieldName" "ChargeMeter2" "font" "Default" - "xpos" "250" - "ypos" "66" - "zpos" "3" - "wide" "100" - "xpos_minmode" "158" - "ypos_minmode" "23" - "zpos_minmode" "4" - "wide_minmode" "19" - "tall" "10" + "xpos" "2" + "ypos" "0" + "zpos" "4" + "wide" "36" + "tall" "20" + "wide_minmode" "20" + "tall_minmode" "17" "autoResize" "0" "pinCorner" "0" "visible" "1" @@ -158,6 +165,10 @@ "dulltext" "0" "brighttext" "0" "fgcolor_override" "Uber Bar Color" + + "pin_to_sibling" "ChargeMeter1" + "pin_corner_to_sibling" "PIN_TOPLEFT" + "pin_to_sibling_corner" "PIN_TOPRIGHT" } "ChargeMeter3" @@ -165,15 +176,13 @@ "ControlName" "ContinuousProgressBar" "fieldName" "ChargeMeter3" "font" "Default" - "xpos" "250" - "ypos" "78" - "zpos" "3" - "wide" "100" - "tall" "10" - "xpos_minmode" "136" - "ypos_minmode" "34" - "zpos_minmode" "4" + "xpos" "2" + "ypos" "0" + "zpos" "4" + "wide" "36" + "tall" "20" "wide_minmode" "20" + "tall_minmode" "17" "autoResize" "0" "pinCorner" "0" "visible" "1" @@ -182,6 +191,10 @@ "dulltext" "0" "brighttext" "0" "fgcolor_override" "Uber Bar Color" + + "pin_to_sibling" "ChargeMeter2" + "pin_corner_to_sibling" "PIN_TOPLEFT" + "pin_to_sibling_corner" "PIN_TOPRIGHT" } "ChargeMeter4" @@ -189,16 +202,13 @@ "ControlName" "ContinuousProgressBar" "fieldName" "ChargeMeter4" "font" "Default" - "xpos" "250" - "ypos" "90" - "zpos" "3" - "xpos_minmode" "158" - "ypos_minmode" "34" - "zpos_minmode" "4" - "wide" "100" - "tall" "9" - "wide_minmode" "19" - "tall_minmode" "10" + "xpos" "2" + "ypos" "0" + "zpos" "4" + "wide" "36" + "tall" "20" + "wide_minmode" "20" + "tall_minmode" "17" "autoResize" "0" "pinCorner" "0" "visible" "1" @@ -207,43 +217,22 @@ "dulltext" "0" "brighttext" "0" "fgcolor_override" "Uber Bar Color" - } - "ChargeMeterLabel" - { - "ControlName" "CExLabel" - "fieldName" "ChargeMeterLabel" - "xpos" "75" - "ypos" "117" - "xpos_minmode" "0" - "ypos_minmode" "34" - "zpos" "3" - "wide" "150" - "tall" "15" - "wide_minmode" "124" - "tall_minmode" "16" - "autoResize" "1" - "pinCorner" "2" - "visible" "1" - "enabled" "1" - "tabPosition" "0" - "labelText" "" - "textAlignment" "center" - "dulltext" "0" - "brighttext" "0" - "font" "Cerbetica16" - "font_minmode" "Cerbetica12" - "fgcolor" "150 150 150 255" - } + "pin_to_sibling" "ChargeMeter3" + "pin_corner_to_sibling" "PIN_TOPLEFT" + "pin_to_sibling_corner" "PIN_TOPRIGHT" + } "ResistIconAnchor" { "ControlName" "EditablePanel" "fieldName" "ResistIconAnchor" - "xpos" "0" - "ypos" "22" - "wide" "25" - "tall" "25" + "xpos" "150" + "ypos" "57" + "xpos_minmode" "136" + "ypos_minmode" "18" + "wide" "45" + "tall" "45" "visible" "1" "enabled" "1" } @@ -253,7 +242,7 @@ "ControlName" "ImagePanel" "fieldName" "ResistIcon" "xpos" "0" - "ypos" "20" + "ypos" "0" "wide" "25" "tall" "25" "visible" "1" diff --git a/resource/ui/huditemeffectmeter_kartcharge.res b/resource/ui/huditemeffectmeter_kartcharge.res index 4dcf37d..1079577 100644 --- a/resource/ui/huditemeffectmeter_kartcharge.res +++ b/resource/ui/huditemeffectmeter_kartcharge.res @@ -14,25 +14,6 @@ "MeterBG" "Gray" } - "ItemEffectMeterBG" - { - "ControlName" "CTFImagePanel" - "fieldName" "ItemEffectMeterBG" - "xpos" "-30" - "ypos" "28" - "zpos" "0" - "wide" "150" - "tall" "75" - "visible" "0" - "enabled" "0" - "image" "../hud/misc_ammo_area_horiz2_blue" - "scaleImage" "1" - "teambg_2" "../hud/misc_ammo_area_horiz2_red" - "teambg_2_lodef" "../hud/misc_ammo_area_red_lodef" - "teambg_3" "../hud/misc_ammo_area_horiz2_blue" - "teambg_3_lodef" "../hud/misc_ammo_area_blue_lodef" - } - "ItemEffectMeterLabel" { "ControlName" "CExLabel" @@ -107,8 +88,8 @@ "ControlName" "CExLabel" "fieldName" "ItemEffectMeterCountShadow" "xpos" "2" - "ypos" "2" - "ypos_minmode" "6" + "xpos" "-1" + "ypos" "-1" "zpos" "2" "wide" "150" "tall" "30" @@ -123,5 +104,9 @@ "font" "CerbeticaBold28" "font_minmode" "CerbeticaBold20" "fgcolor_override" "TransparentBlack" + + "pin_to_sibling" "ItemEffectMeterCount" + "pin_corner_to_sibling" "PIN_TOPLEFT" + "pin_to_sibling_corner" "PIN_TOPLEFT" } }
\ No newline at end of file diff --git a/resource/ui/huditemeffectmeter_organs.res b/resource/ui/huditemeffectmeter_organs.res index 8ee7703..6429453 100644 --- a/resource/ui/huditemeffectmeter_organs.res +++ b/resource/ui/huditemeffectmeter_organs.res @@ -1,114 +1,6 @@ +#base "huditemeffectmeter_demoman.res" + "Resource/UI/HudItemEffectMeter_Scout.res" { - "HudItemEffectMeter" - { - "fieldName" "HudItemEffectMeter" - "visible" "1" - "enabled" "1" - "xpos" "c155" - "ypos" "363" - "wide" "75" - "tall" "20" - "MeterFG" "TanLight" - "MeterBG" "Gray" - } - - "ItemEffectMeterBG" - { - "ControlName" "CTFImagePanel" - "fieldName" "ItemEffectMeterBG" - "xpos" "9999" - "ypos" "9999" - "zpos" "0" - "wide" "100" - "tall" "50" - "visible" "1" - "enabled" "1" - "image" "../hud/misc_ammo_area_horiz2_blue" - "scaleImage" "1" - "teambg_2" "../hud/misc_ammo_area_horiz2_red" - "teambg_3" "../hud/misc_ammo_area_horiz2_blue" - } - - "ItemEffectMeterLabel" - { - "ControlName" "CExLabel" - "fieldName" "ItemEffectMeterLabel" - "xpos" "0" - "ypos" "5" - "zpos" "2" - "wide" "40" - "tall" "12" - "autoResize" "1" - "pinCorner" "2" - "visible" "1" - "enabled" "1" - "tabPosition" "0" - "textAlignment" "east" - "dulltext" "0" - "brighttext" "0" - "font" "CerbeticaBold12" - "fgcolor_override" "White" - } - - "ItemEffectMeter" - { - "ControlName" "ContinuousProgressBar" - "fieldName" "ItemEffectMeter" - "font" "Default" - "xpos" "45" - "ypos" "23" - "zpos" "2" - "wide" "30" - "tall" "5" - "autoResize" "0" - "pinCorner" "0" - "visible" "0" - "enabled" "1" - "textAlignment" "Left" - "dulltext" "0" - "brighttext" "0" - } - "ItemEffectMeterCount" - { - "ControlName" "CExLabel" - "fieldName" "ItemEffectMeterCount" - "xpos" "46" - "ypos" "0" - "zpos" "2" - "wide" "40" - "tall" "20" - "pinCorner" "2" - "visible" "1" - "enabled" "1" - "tabPosition" "0" - "labelText" "%progresscount%" - "textAlignment" "west" - "dulltext" "0" - "brighttext" "0" - "font" "CerbeticaBold28" - "font_minmode" "CerbeticaBold16" - } - "ItemEffectMeterCountBackground" - { - "ControlName" "CExLabel" - "fieldName" "ItemEffectMeterCountBackground" - "xpos" "47" - "ypos" "1" - "zpos" "2" - "wide" "40" - "tall" "20" - "pinCorner" "2" - "visible" "1" - "enabled" "1" - "tabPosition" "0" - "labelText" "%progresscount%" - "textAlignment" "west" - "dulltext" "0" - "brighttext" "0" - "font" "CerbeticaBold28" - "font_minmode" "CerbeticaBold16" - "fgcolor" "Black" - } }
\ No newline at end of file diff --git a/resource/ui/huditemeffectmeter_pyro.res b/resource/ui/huditemeffectmeter_pyro.res index 4125694..fe3426c 100644 --- a/resource/ui/huditemeffectmeter_pyro.res +++ b/resource/ui/huditemeffectmeter_pyro.res @@ -4,7 +4,6 @@ { "HudItemEffectMeter" { - "fieldName" "HudItemEffectMeter" - "ypos" "c113" + "ypos" "c93" } }
\ No newline at end of file |