summaryrefslogtreecommitdiff
path: root/resource
diff options
context:
space:
mode:
Diffstat (limited to 'resource')
-rw-r--r--resource/chatscheme.res60
-rw-r--r--resource/clientscheme.res5
-rw-r--r--resource/fonts/Cerbetica.otfbin0 -> 67108 bytes
-rw-r--r--resource/fonts/Cerbetica_bold.otfbin0 -> 64844 bytes
-rw-r--r--resource/fonts/Cerbetica_bold.ttfbin58352 -> 0 bytes
-rw-r--r--resource/fonts/Cerbetica_edited.ttfbin46472 -> 0 bytes
-rw-r--r--resource/fonts/FlawHUDIcons.otfbin24108 -> 0 bytes
-rw-r--r--resource/fonts/Garm3nFont.ttfbin40684 -> 0 bytes
-rw-r--r--resource/fonts/Icons.otfbin0 -> 6988 bytes
-rw-r--r--resource/fonts/KnucklesCrosses.ttfbin9860 -> 0 bytes
-rw-r--r--resource/fonts/TF2Crosshairs.otfbin0 -> 51852 bytes
-rw-r--r--resource/fonts/crosshairs.ttfbin7736 -> 0 bytes
-rw-r--r--resource/gamemenu.res23
-rw-r--r--resource/preload.res30
-rw-r--r--resource/scheme/clientscheme_borders.res2
-rw-r--r--resource/scheme/clientscheme_colors.res10
-rw-r--r--resource/scheme/clientscheme_fonts.res926
-rw-r--r--resource/scheme/clientscheme_icons.res60
-rw-r--r--resource/scheme/clientscheme_settings.res26
-rw-r--r--resource/scheme/clientscheme_xhairs.res1025
-rw-r--r--resource/scheme/clientscheme_xhairs_blur.res237
-rw-r--r--resource/scheme/clientscheme_xhairs_outline.res237
-rw-r--r--resource/scheme/clientscheme_xhairs_shadow.res237
-rw-r--r--resource/sourcescheme.res25
-rw-r--r--resource/ui/basechat.res10
-rw-r--r--resource/ui/build_menu/base_active.res36
-rw-r--r--resource/ui/build_menu/base_active_teleport_target.res16
-rw-r--r--resource/ui/build_menu/base_already_built.res61
-rw-r--r--resource/ui/build_menu/base_cant_afford.res59
-rw-r--r--resource/ui/build_menu/base_unavailable.res188
-rw-r--r--resource/ui/build_menu/base_unavailable_teleport_target.res16
-rw-r--r--resource/ui/build_menu/hudmenuengybuild.res12
-rw-r--r--resource/ui/build_menu/hudmenueurekaeffect.res26
-rw-r--r--resource/ui/build_menu/pipboy/base_already_built.res23
-rw-r--r--resource/ui/build_menu/pipboy/base_cant_afford.res1
-rw-r--r--resource/ui/build_menu/pipboy/base_unavailable.res1
-rw-r--r--resource/ui/build_menu/pipboy/hudmenuengybuild.res2
-rw-r--r--resource/ui/build_menu/pipboy/hudmenueurekaeffect.res4
-rw-r--r--resource/ui/charinfoarmorysubpanel.res36
-rw-r--r--resource/ui/charinfoloadoutsubpanel.res32
-rw-r--r--resource/ui/charinfopanel.res11
-rw-r--r--resource/ui/classloadoutpanel.res26
-rw-r--r--resource/ui/compstats.res51
-rw-r--r--resource/ui/controlpointcountdown.res2
-rw-r--r--resource/ui/controlpointicon.res8
-rw-r--r--resource/ui/controlpointprogressbar.res2
-rw-r--r--resource/ui/craftingpanel.res2
-rw-r--r--resource/ui/craftingstatusdialog.res8
-rw-r--r--resource/ui/destroy_menu/base_active.res24
-rw-r--r--resource/ui/destroy_menu/base_inactive.res26
-rw-r--r--resource/ui/destroy_menu/hudmenuengydestroy.res22
-rw-r--r--resource/ui/destroy_menu/pipboy/dispenser_inactive.res6
-rw-r--r--resource/ui/destroy_menu/pipboy/hudmenuengydestroy.res2
-rw-r--r--resource/ui/destroy_menu/pipboy/sentry_inactive.res6
-rw-r--r--resource/ui/destroy_menu/pipboy/tele_entrance_inactive.res6
-rw-r--r--resource/ui/destroy_menu/pipboy/tele_exit_inactive.res6
-rw-r--r--resource/ui/disguise_menu/heavy_red.res8
-rw-r--r--resource/ui/disguise_menu/hudmenuspydisguise.res92
-rw-r--r--resource/ui/disguisestatuspanel.res28
-rw-r--r--resource/ui/econ/backpackpanel.res57
-rw-r--r--resource/ui/econ/comboboxbackpackoverlaydialog.res2
-rw-r--r--resource/ui/econ/confirmapplycardupgradeapplicationdialog.res276
-rw-r--r--resource/ui/econ/confirmapplydecodedialog.res293
-rw-r--r--resource/ui/econ/confirmapplygiftwrapdialog.res6
-rw-r--r--resource/ui/econ/confirmapplypaintcandialog.res8
-rw-r--r--resource/ui/econ/confirmapplystrangepartapplicationdialog.res31
-rw-r--r--resource/ui/econ/confirmapplystrangerestrictionapplicationdialog.res243
-rw-r--r--resource/ui/econ/confirmapplystrangifierdialog.res32
-rw-r--r--resource/ui/econ/confirmapplyteamcolorpaintcandialog.res30
-rw-r--r--resource/ui/econ/confirmcustomizetexturedialog.res892
-rw-r--r--resource/ui/econ/confirmdialog.res2
-rw-r--r--resource/ui/econ/confirmdialogabandonnopenalty.res6
-rw-r--r--resource/ui/econ/confirmdialogabandonpenalty.res16
-rw-r--r--resource/ui/econ/confirmdialogabandonsafe.res12
-rw-r--r--resource/ui/econ/confirmdialogoptout.res145
-rw-r--r--resource/ui/econ/confirmitempreviewdialog.res226
-rw-r--r--resource/ui/econ/genericwaitingdialog.res104
-rw-r--r--resource/ui/econ/inspectionpanel.res24
-rw-r--r--resource/ui/econ/inspectionpanel_cosmetic.res30
-rw-r--r--resource/ui/econ/itemmodelpanel.res6
-rw-r--r--resource/ui/econ/itempickuppanel.res4
-rw-r--r--resource/ui/econ/notificationtoastcontainer.res4
-rw-r--r--resource/ui/econ/notificationtoastcontrol.res193
-rw-r--r--resource/ui/econ/paintkitconsumedialog.res295
-rw-r--r--resource/ui/econ/store/v2/storehome_base.res34
-rw-r--r--resource/ui/econ/store/v2/storepage.res44
-rw-r--r--resource/ui/econ/store/v2/storepanel.res25
-rw-r--r--resource/ui/econ/store/v2/storepreviewitempanel.res52
-rw-r--r--resource/ui/econ/store/v2/storepreviewitempanel_maps.res10
-rw-r--r--resource/ui/econ/store/v2/storeviewcartpanel.res47
-rw-r--r--resource/ui/econ/strangecounttransferdialog.res2
-rw-r--r--resource/ui/econ/tradingstartdialog.res34
-rw-r--r--resource/ui/flagstatus.res15
-rw-r--r--resource/ui/freezepanel_basic.res18
-rw-r--r--resource/ui/freezepanelkillerhealth.res12
-rw-r--r--resource/ui/hud_obj_dispenser.res10
-rw-r--r--resource/ui/hud_obj_sentrygun.res105
-rw-r--r--resource/ui/hud_obj_sentrygun_disp.res2
-rw-r--r--resource/ui/hud_obj_tele.res12
-rw-r--r--resource/ui/hud_obj_tele_entrance.res14
-rw-r--r--resource/ui/hud_obj_tele_exit.res14
-rw-r--r--resource/ui/hudaccountpanel.res67
-rw-r--r--resource/ui/hudachievementtrackeritem.res4
-rw-r--r--resource/ui/hudammoweapons-white.res153
-rw-r--r--resource/ui/hudammoweapons.res38
-rw-r--r--resource/ui/hudarenaclasslayout.res13
-rw-r--r--resource/ui/hudarenanotification.res41
-rw-r--r--resource/ui/hudarenaplayercount.res8
-rw-r--r--resource/ui/hudarenateammenu.res100
-rw-r--r--resource/ui/hudarenawinpanel.res34
-rw-r--r--resource/ui/hudcurrencyaccount.res6
-rw-r--r--resource/ui/huddamageaccount.res12
-rw-r--r--resource/ui/huddemomancharge.res3
-rw-r--r--resource/ui/huddemomanpipes.res10
-rw-r--r--resource/ui/hudhealthaccount.res4
-rw-r--r--resource/ui/hudinspectpanel.res59
-rw-r--r--resource/ui/huditemattributetracker.res10
-rw-r--r--resource/ui/huditemeffectmeter.res10
-rw-r--r--resource/ui/huditemeffectmeter_cleaver.res2
-rw-r--r--resource/ui/huditemeffectmeter_demoman.res12
-rw-r--r--resource/ui/huditemeffectmeter_heavy.res2
-rw-r--r--resource/ui/huditemeffectmeter_kartcharge.res32
-rw-r--r--resource/ui/huditemeffectmeter_particlecannon.res2
-rw-r--r--resource/ui/huditemeffectmeter_pomson.res2
-rw-r--r--resource/ui/huditemeffectmeter_powerupbottle.res10
-rw-r--r--resource/ui/huditemeffectmeter_pyro.res1
-rw-r--r--resource/ui/huditemeffectmeter_sapper.res2
-rw-r--r--resource/ui/huditemeffectmeter_scout.res2
-rw-r--r--resource/ui/huditemeffectmeter_sniperfocus.res2
-rw-r--r--resource/ui/huditemeffectmeter_sodapopper.res2
-rw-r--r--resource/ui/huditemeffectmeter_spyknife.res2
-rw-r--r--resource/ui/hudkillstreaknotice.res6
-rw-r--r--resource/ui/hudmannvsmachinestatus.res5
-rw-r--r--resource/ui/hudmatchstatus.res11
-rw-r--r--resource/ui/hudmatchsummary.res79
-rw-r--r--resource/ui/hudmediccharge.res121
-rw-r--r--resource/ui/hudmenutauntselection.res102
-rw-r--r--resource/ui/hudminigame_base.res6
-rw-r--r--resource/ui/hudobjectiveflagpanel.res23
-rw-r--r--resource/ui/hudobjectivekothtimepanel.res17
-rw-r--r--resource/ui/hudobjectivetimepanel.res33
-rw-r--r--resource/ui/hudrocketpack.res15
-rw-r--r--resource/ui/hudroundcounter.res2
-rw-r--r--resource/ui/hudspellselection.res15
-rw-r--r--resource/ui/hudstopwatch.res12
-rw-r--r--resource/ui/hudteamgoaltournament.res10
-rw-r--r--resource/ui/hudteamswitch.res83
-rw-r--r--resource/ui/hudtournament.res457
-rw-r--r--resource/ui/hudtournamentsetup.res90
-rw-r--r--resource/ui/hudupgradepanel.res12
-rw-r--r--resource/ui/itemoptionspanel.res2
-rw-r--r--resource/ui/itemquickswitch.res20
-rw-r--r--resource/ui/itemrenameconfirmationdialog.res22
-rw-r--r--resource/ui/itemrenamedialog.res8
-rw-r--r--resource/ui/itemrenameinvaliddialog.res8
-rw-r--r--resource/ui/itemselectionpanel.res39
-rw-r--r--resource/ui/loadoutpresetpanel.res2
-rw-r--r--resource/ui/mainmenuplaylistentry.res2
-rw-r--r--resource/ui/mapinfomenu.res26
-rw-r--r--resource/ui/matchmakingcasualcriteria.res33
-rw-r--r--resource/ui/matchmakingdashboard.res37
-rw-r--r--resource/ui/matchmakingdashboardcasualcriteria.res23
-rw-r--r--resource/ui/matchmakingdashboardcomp.res7
-rw-r--r--resource/ui/matchmakingdashboardmvmmodeselect.res8
-rw-r--r--resource/ui/matchmakingdashboardplaylist.res2
-rw-r--r--resource/ui/matchmakingdashboardpopup_newmatch.res14
-rw-r--r--resource/ui/matchmakingdashboardsidepanel.res4
-rw-r--r--resource/ui/mvmcreditspendpanel.res20
-rw-r--r--resource/ui/mvmcreditsubpanel.res18
-rw-r--r--resource/ui/mvminworldcurrency.res8
-rw-r--r--resource/ui/mvmscoreboard.res30
-rw-r--r--resource/ui/objectivestatusescort.res50
-rw-r--r--resource/ui/publishfiledialog.res48
-rw-r--r--resource/ui/pvprankpanel.res65
-rw-r--r--resource/ui/replaybrowser/basepage.res2
-rw-r--r--resource/ui/replaybrowser/mainpanel.res8
-rw-r--r--resource/ui/replaybrowser/thumbnailcollection.res14
-rw-r--r--resource/ui/spectator.res8
-rw-r--r--resource/ui/spectatorguihealth.res30
-rw-r--r--resource/ui/spectatortournament.res550
-rw-r--r--resource/ui/spectatortournamentguihealth.res22
-rw-r--r--resource/ui/stampdonationadd.res4
-rw-r--r--resource/ui/statsummary.res234
-rw-r--r--resource/ui/statsummary_embedded.res286
-rw-r--r--resource/ui/steamworkshopdialog.res63
-rw-r--r--resource/ui/streamlistpanel.res10
-rw-r--r--resource/ui/streampanel.res2
-rw-r--r--resource/ui/tankprogressbar.res2
-rw-r--r--resource/ui/targetid.res103
-rw-r--r--resource/ui/testitemroot.res62
-rw-r--r--resource/ui/textwindow.res26
-rw-r--r--resource/ui/tfadvancedoptionsdialog.res2
-rw-r--r--resource/ui/votehud.res12
-rw-r--r--resource/ui/wavestatuspanel.res17
-rw-r--r--resource/ui/winpanel.res61
195 files changed, 5007 insertions, 5900 deletions
diff --git a/resource/chatscheme.res b/resource/chatscheme.res
index 4cce613..1173f43 100644
--- a/resource/chatscheme.res
+++ b/resource/chatscheme.res
@@ -1,24 +1,27 @@
Scheme
{
+ //////////////////////// COLORS ///////////////////////////
+ // color details
+ // this is a list of all the colors used by the scheme
Colors
{
"TFDarkBrown" "60 56 53 255"
- "TFDarkBrownTransparent" "60 56 53 190"
- "TFTanBright" "236 227 203 150"
- "TFTanLight" "201 188 162 150"
- "TFTanMedium" "131 121 104 150"
- "TFTanLightBright" "229 223 211 90"
- "TFTanLightDark" "96 90 78 90"
- "TFOrangeBright" "156 82 33 255"
- "TFTextBright" "251 236 203 150"
- "TFTextLight" "201 188 162 255"
- "TFTextMedium" "131 121 104 255"
- "TFTextMediumDark" "104 96 83 255"
- "TFTextBlack" "42 39 37 255"
- "TFTextDull" "131 121 104 255"
- "TFMediumBrown" "69 64 58 255"
- "QuickListBGDeselected" "69 64 58 255"
- "QuickListBGSelected" "131 121 104 150"
+ "TFDarkBrownTransparent" "60 56 53 190"
+ "TFTanBright" "236 227 203 150"
+ "TFTanLight" "201 188 162 150"
+ "TFTanMedium" "131 121 104 150"
+ "TFTanLightBright" "229 223 211 90"
+ "TFTanLightDark" "96 90 78 90"
+ "TFOrangeBright" "156 82 33 255"
+ "TFTextBright" "251 236 203 150"
+ "TFTextLight" "201 188 162 255"
+ "TFTextMedium" "131 121 104 255"
+ "TFTextMediumDark" "104 96 83 255"
+ "TFTextBlack" "42 39 37 255"
+ "TFTextDull" "131 121 104 255"
+ "TFMediumBrown" "69 64 58 255"
+ "QuickListBGDeselected" "69 64 58 255"
+ "QuickListBGSelected" "131 121 104 150"
"Blank" "0 0 0 0"
"White" "255 255 255 255"
"ControlBG" "76 88 68 255"
@@ -30,8 +33,13 @@ Scheme
"Green" "63 185 73 255"
}
+ ///////////////////// BASE SETTINGS ////////////////////////
+ //
+ // default settings for all panels
+ // controls use these to determine their settings
BaseSettings
{
+ // vgui_controls color specifications
Border.Bright "TFTanLightDark"
Border.Dark "TFTanLightDark"
Border.Selection "BorderSelection"
@@ -128,8 +136,8 @@ Scheme
ScrollBarButton.ArmedBgColor "Blank"
ScrollBarButton.DepressedFgColor "Blank"
ScrollBarButton.DepressedBgColor "Blank"
- ScrollBarSlider.BgColor "Blank"
ScrollBarSlider.FgColor "Blank"
+ ScrollBarSlider.BgColor "Blank"
SectionedListPanel.HeaderTextColor "White"
SectionedListPanel.HeaderBgColor "Blank"
@@ -167,6 +175,7 @@ Scheme
WizardSubPanel.BgColor "Blank"
+ // scheme-specific colors
MainMenu.TextColor "White"
MainMenu.ArmedTextColor "200 200 200 255"
MainMenu.DepressedTextColor "192 186 80 255"
@@ -187,11 +196,18 @@ Scheme
TFColors.ChatTextTeamRed "255 63 53 255"
}
+ //////////////////////// BITMAP FONT FILES /////////////////////////////
+ //
+ // Bitmap Fonts are ****VERY*** expensive static memory resources so they are purposely sparse
BitmapFontFiles
{
+ // UI buttons, custom font, (256x64)
"Buttons" "materials/vgui/fonts/buttons_32.vbf"
}
+ //////////////////////// FONTS /////////////////////////////
+ //
+ // describes all the fonts
Fonts
{
"Default"
@@ -241,6 +257,7 @@ Scheme
}
}
+ // this is the symbol font
"Marlett"
{
"1"
@@ -421,6 +438,10 @@ Scheme
}
}
+ //
+ //////////////////// BORDERS //////////////////////////////
+ //
+ // describes all the border types
Borders
{
BaseBorder DepressedBorder
@@ -693,6 +714,7 @@ Scheme
}
}
+ // this is the border used for default buttons (the button that gets pressed when you hit enter)
ButtonKeyFocusBorder
{
"inset" "0 0 1 1"
@@ -788,6 +810,10 @@ Scheme
}
}
+ //////////////////////// CUSTOM FONT FILES /////////////////////////////
+ //
+ // specifies all the custom (non-system) font files that need to be loaded to service the above described fonts
+
CustomFontFiles
{
"1" "resource/HALFLIFE2.ttf"
diff --git a/resource/clientscheme.res b/resource/clientscheme.res
index 992e072..6ec0ba1 100644
--- a/resource/clientscheme.res
+++ b/resource/clientscheme.res
@@ -3,4 +3,7 @@
#base "scheme/clientscheme_fonts.res"
#base "scheme/clientscheme_icons.res"
#base "scheme/clientscheme_settings.res"
-#base "scheme/clientscheme_xhairs.res" \ No newline at end of file
+#base "scheme/clientscheme_xhairs.res"
+#base "scheme/clientscheme_xhairs_blur.res"
+#base "scheme/clientscheme_xhairs_outline.res"
+#base "scheme/clientscheme_xhairs_shadow.res" \ No newline at end of file
diff --git a/resource/fonts/Cerbetica.otf b/resource/fonts/Cerbetica.otf
new file mode 100644
index 0000000..67349e4
--- /dev/null
+++ b/resource/fonts/Cerbetica.otf
Binary files differ
diff --git a/resource/fonts/Cerbetica_bold.otf b/resource/fonts/Cerbetica_bold.otf
new file mode 100644
index 0000000..f6f0b39
--- /dev/null
+++ b/resource/fonts/Cerbetica_bold.otf
Binary files differ
diff --git a/resource/fonts/Cerbetica_bold.ttf b/resource/fonts/Cerbetica_bold.ttf
deleted file mode 100644
index 90072c6..0000000
--- a/resource/fonts/Cerbetica_bold.ttf
+++ /dev/null
Binary files differ
diff --git a/resource/fonts/Cerbetica_edited.ttf b/resource/fonts/Cerbetica_edited.ttf
deleted file mode 100644
index 0e58154..0000000
--- a/resource/fonts/Cerbetica_edited.ttf
+++ /dev/null
Binary files differ
diff --git a/resource/fonts/FlawHUDIcons.otf b/resource/fonts/FlawHUDIcons.otf
deleted file mode 100644
index 3c5dde3..0000000
--- a/resource/fonts/FlawHUDIcons.otf
+++ /dev/null
Binary files differ
diff --git a/resource/fonts/Garm3nFont.ttf b/resource/fonts/Garm3nFont.ttf
deleted file mode 100644
index 54af19a..0000000
--- a/resource/fonts/Garm3nFont.ttf
+++ /dev/null
Binary files differ
diff --git a/resource/fonts/Icons.otf b/resource/fonts/Icons.otf
new file mode 100644
index 0000000..857e32b
--- /dev/null
+++ b/resource/fonts/Icons.otf
Binary files differ
diff --git a/resource/fonts/KnucklesCrosses.ttf b/resource/fonts/KnucklesCrosses.ttf
deleted file mode 100644
index a7f7792..0000000
--- a/resource/fonts/KnucklesCrosses.ttf
+++ /dev/null
Binary files differ
diff --git a/resource/fonts/TF2Crosshairs.otf b/resource/fonts/TF2Crosshairs.otf
new file mode 100644
index 0000000..a4faad9
--- /dev/null
+++ b/resource/fonts/TF2Crosshairs.otf
Binary files differ
diff --git a/resource/fonts/crosshairs.ttf b/resource/fonts/crosshairs.ttf
deleted file mode 100644
index 7a582ad..0000000
--- a/resource/fonts/crosshairs.ttf
+++ /dev/null
Binary files differ
diff --git a/resource/gamemenu.res b/resource/gamemenu.res
index 657b57a..2ccd3d9 100644
--- a/resource/gamemenu.res
+++ b/resource/gamemenu.res
@@ -1,12 +1,5 @@
"GameMenu"
{
- "SteamWorkshopButton"
- {
- "label" ""
- "command" "engine OpenSteamWorkshopDialog"
- "subimage" "glyph_steamworkshop"
- "tooltip" "#MMenu_Tooltip_Workshop"
- }
"AchievementsButton"
{
"label" ""
@@ -14,6 +7,13 @@
"subimage" "glyph_achievements"
"tooltip" "#Achievements"
}
+ "ReplayButton"
+ {
+ "label" ""
+ "command" "engine replay_reloadbrowser"
+ "subimage" "glyph_tv"
+ "tooltip" "#MMenu_Tooltip_Replay"
+ }
"ConsoleButton"
{
"label" ""
@@ -28,6 +28,13 @@
"subimage" "glyph_bug"
"tooltip" "#MMenu_Tooltip_ReportBug"
}
+ "CoachPlayersButton"
+ {
+ "label" ""
+ "command" "engine cl_coach_toggle"
+ "subimage" "glyph_commentary"
+ "tooltip" "#MMenu_Tooltip_Coach"
+ }
"CallVoteButton"
{
"label" ""
@@ -39,7 +46,7 @@
"MutePlayersButton"
{
"label" ""
- "command" "OpenPlayerListDialog"
+ "command" "OpenMutePlayerDialog"
"OnlyInGame" "1"
"subimage" "glyph_muted"
"tooltip" "#MMenu_MutePlayers"
diff --git a/resource/preload.res b/resource/preload.res
index d2a8c8b..3c795f4 100644
--- a/resource/preload.res
+++ b/resource/preload.res
@@ -119,34 +119,4 @@
"enabled" "1"
"image" "../sprites/obj_icons/icon_obj_e"
}
-
- "cpiconcapblu"
- {
- "ControlName" "ImagePanel"
- "fieldName" "cpiconcapblu"
- "xpos" "9999"
- "visible" "1"
- "enabled" "1"
- "image" "../sprites/obj_icons/icon_obj_cap_blu"
- }
-
- "cpiconcapred"
- {
- "ControlName" "ImagePanel"
- "fieldName" "cpiconcapred"
- "xpos" "9999"
- "visible" "1"
- "enabled" "1"
- "image" "../sprites/obj_icons/icon_obj_cap_red"
- }
-
- "cpiconcapmask"
- {
- "ControlName" "ImagePanel"
- "fieldName" "cpiconcapmask"
- "xpos" "9999"
- "visible" "1"
- "enabled" "1"
- "image" "../sprites/obj_icons/icon_obj_cap_mask"
- }
} \ No newline at end of file
diff --git a/resource/scheme/clientscheme_borders.res b/resource/scheme/clientscheme_borders.res
index f15b6b4..5cf288a 100644
--- a/resource/scheme/clientscheme_borders.res
+++ b/resource/scheme/clientscheme_borders.res
@@ -2289,7 +2289,7 @@ Scheme
{
"bordertype" "scalable_image"
"backgroundtype" "2"
- "image" "button_holder_central"
+ "image" "replay/thumbnails/mmbg"
"src_corner_height" "32" // pixels inside the image
"src_corner_width" "32"
"draw_corner_width" "0" // screen size of the corners ( and sides ), proportional
diff --git a/resource/scheme/clientscheme_colors.res b/resource/scheme/clientscheme_colors.res
index c5bebfa..d3904ba 100644
--- a/resource/scheme/clientscheme_colors.res
+++ b/resource/scheme/clientscheme_colors.res
@@ -22,11 +22,11 @@ Scheme
"ColorGreyMid" "128 128 128 255"
"ColorGreyLight" "192 192 192 255"
"ColorWhite" "255 255 255 255"
+ "DullWhite" "132 132 132 255"
"Grey" "51 47 46 255"
"DarkGrey" "27 27 27 255"
"DarkerGrey" "22 22 22 255"
"TextColor" "117 107 94 255"
- "DullWhite" "132 132 132 255"
//---------------------------------------------
// Gameplay
"Ammo In Clip" "48 255 48 255"
@@ -38,7 +38,6 @@ Scheme
"Health Hurt" "255 153 0 255"
"Heal Numbers" "48 255 48 255"
"Last DamageHeal Info" "72 255 255 255"
- "TransparentPanelBG" "25 25 25 148"
"ItemPanelBG" "50 50 50 255"
"Button Color" "72 255 255 255"
//---------------------------------------------
@@ -91,9 +90,10 @@ Scheme
"PartyMember6" "255 133 255 255"
"White" "242 242 242 255"
- "Red" "192 28 0 140"
- "RedSolid" "192 28 0 255"
- "Blue" "0 28 162 140"
+ "Red" "158 64 61 140"
+ "RedSolid" "158 64 61 255"
+ "Blue" "72 112 125 140"
+ "BlueSolid" "72 112 125 255"
"Yellow" "251 235 202 255"
"TransparentYellow" "251 235 202 140"
"BrightYellow" "251 235 0 255"
diff --git a/resource/scheme/clientscheme_fonts.res b/resource/scheme/clientscheme_fonts.res
index dbf13dd..d069ee3 100644
--- a/resource/scheme/clientscheme_fonts.res
+++ b/resource/scheme/clientscheme_fonts.res
@@ -3,377 +3,12 @@ Scheme
Fonts
{
// CUSTOM
- "CerbeticaBold72"
- {
- "1"
- {
- "name" "Cerbetica Bold"
- "tall" "72"
- "additive" "0"
- "antialias" "1"
- }
- }
- "CerbeticaBold64"
- {
- "1"
- {
- "name" "Cerbetica Bold"
- "tall" "64"
- "additive" "0"
- "antialias" "1"
- }
- }
- "CerbeticaBold56"
- {
- "1"
- {
- "name" "Cerbetica Bold"
- "tall" "56"
- "additive" "0"
- "antialias" "1"
- }
- }
- "CerbeticaBoldOutline56"
- {
- "1"
- {
- "name" "Cerbetica Bold"
- "tall" "56"
- "additive" "0"
- "antialias" "1"
- "outline" "1"
- }
- }
- "CerbeticaBold50"
- {
- "1"
- {
- "name" "Cerbetica Bold"
- "tall" "50"
- "additive" "0"
- "antialias" "1"
- }
- }
- "CerbeticaBold48"
- {
- "1"
- {
- "name" "Cerbetica Bold"
- "tall" "48"
- "additive" "0"
- "antialias" "1"
- }
- }
- "CerbeticaBold46"
- {
- "1"
- {
- "name" "Cerbetica Bold"
- "tall" "46"
- "additive" "0"
- "antialias" "1"
- }
- }
- "CerbeticaBold44"
- {
- "1"
- {
- "name" "Cerbetica Bold"
- "tall" "44"
- "additive" "0"
- "antialias" "1"
- }
- }
- "CerbeticaBold42"
- {
- "1"
- {
- "name" "Cerbetica Bold"
- "tall" "42"
- "additive" "0"
- "antialias" "1"
- }
- }
- "CerbeticaBold37"
- {
- "1"
- {
- "name" "Cerbetica Bold"
- "tall" "37"
- "additive" "0"
- "antialias" "1"
- }
- }
- "CerbeticaBold36"
- {
- "1"
- {
- "name" "Cerbetica Bold"
- "tall" "36"
- "additive" "0"
- "antialias" "1"
- }
- }
- "CerbeticaBold32"
- {
- "1"
- {
- "name" "Cerbetica Bold"
- "tall" "32"
- "additive" "0"
- "antialias" "1"
- }
- }
- "CerbeticaBoldOutline32"
- {
- "1"
- {
- "name" "Cerbetica Bold"
- "tall" "32"
- "additive" "0"
- "antialias" "1"
- "outline" "1"
- }
- }
- "CerbeticaBold28"
- {
- "1"
- {
- "name" "Cerbetica Bold"
- "tall" "28"
- "additive" "0"
- "antialias" "1"
- }
- }
- "CerbeticaBold27"
- {
- "1"
- {
- "name" "Cerbetica Bold"
- "tall" "27"
- "additive" "0"
- "antialias" "1"
- }
- }
- "CerbeticaBold24"
- {
- "1"
- {
- "name" "Cerbetica Bold"
- "tall" "24"
- "additive" "0"
- "antialias" "1"
- }
- }
- "CerbeticaBoldOutline24"
- {
- "1"
- {
- "name" "Cerbetica Bold"
- "tall" "24"
- "additive" "0"
- "antialias" "1"
- "outline" "1"
- }
- }
- "CerbeticaBold22"
- {
- "1"
- {
- "name" "Cerbetica Bold"
- "tall" "22"
- "additive" "0"
- "antialias" "1"
- }
- }
- "CerbeticaBold20"
- {
- "1"
- {
- "name" "Cerbetica Bold"
- "tall" "20"
- "additive" "0"
- "antialias" "1"
- }
- }
- "CerbeticaBold18"
- {
- "1"
- {
- "name" "Cerbetica Bold"
- "tall" "18"
- "additive" "0"
- "antialias" "1"
- }
- }
- "CerbeticaBold17"
- {
- "1"
- {
- "name" "Cerbetica Bold"
- "tall" "17"
- "additive" "0"
- "antialias" "1"
- }
- }
- "CerbeticaBold16"
- {
- "1"
- {
- "name" "Cerbetica Bold"
- "tall" "16"
- "additive" "0"
- "antialias" "1"
- }
- }
- "CerbeticaBoldOutline16"
- {
- "1"
- {
- "name" "Cerbetica Bold"
- "tall" "16"
- "additive" "0"
- "antialias" "1"
- "outline" "1"
- }
- }
- "CerbeticaBold15"
- {
- "1"
- {
- "name" "Cerbetica Bold"
- "tall" "15"
- "additive" "0"
- "antialias" "1"
- }
- }
- "CerbeticaBold14"
- {
- "1"
- {
- "name" "Cerbetica Bold"
- "tall" "14"
- "additive" "0"
- "antialias" "1"
- }
- }
- "CerbeticaBold13"
- {
- "1"
- {
- "name" "Cerbetica Bold"
- "tall" "13"
- "additive" "0"
- "antialias" "1"
- }
- }
- "CerbeticaBold12"
- {
- "1"
- {
- "name" "Cerbetica Bold"
- "tall" "12"
- "additive" "0"
- "antialias" "1"
- }
- }
- "CerbeticaBold10"
- {
- "1"
- {
- "name" "Cerbetica Bold"
- "tall" "10"
- "additive" "0"
- "antialias" "1"
- }
- }
- "CerbeticaBold8"
- {
- "1"
- {
- "name" "Cerbetica Bold"
- "tall" "8"
- "additive" "0"
- "antialias" "1"
- }
- }
- "Cerbetica72"
- {
- "1"
- {
- "name" "Cerbetica_edited"
- "tall" "72"
- "additive" "0"
- "antialias" "1"
- }
- }
- "Cerbetica60"
- {
- "1"
- {
- "name" "Cerbetica_edited"
- "tall" "60"
- "additive" "0"
- "antialias" "1"
- }
- }
"Cerbetica56"
{
"1"
{
- "name" "Cerbetica_edited"
- "tall" "56"
- "additive" "0"
- "antialias" "1"
- }
- }
- "Cerbetica55"
- {
- "1"
- {
- "name" "Cerbetica_edited"
- "tall" "55"
- "additive" "0"
- "antialias" "1"
- }
- }
-
- "Cerbetica54"
- {
- "1"
- {
- "name" "Cerbetica_edited"
- "tall" "54"
- "additive" "0"
- "antialias" "1"
- }
- }
- "Cerbetica52"
- {
- "1"
- {
- "name" "Cerbetica_edited"
- "tall" "52"
- "additive" "0"
- "antialias" "1"
- }
- }
- "Cerbetica48"
- {
- "1"
- {
- "name" "Cerbetica_edited"
- "tall" "48"
- "additive" "0"
- "antialias" "1"
- }
- }
- "Cerbetica44"
- {
- "1"
- {
- "name" "Cerbetica_edited"
- "tall" "44"
+ "name" "Cerbetica_bold"
+ "tall" "56"
"additive" "0"
"antialias" "1"
}
@@ -382,27 +17,17 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica_bold"
"tall" "40"
"additive" "0"
"antialias" "1"
}
}
- "Cerbetica36"
- {
- "1"
- {
- "name" "Cerbetica_edited"
- "tall" "36"
- "additive" "0"
- "antialias" "1"
- }
- }
"Cerbetica32"
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica_bold"
"tall" "32"
"additive" "0"
"antialias" "1"
@@ -412,18 +37,8 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
- "tall" "26"
- "additive" "0"
- "antialias" "1"
- }
- }
- "Cerbetica26"
- {
- "1"
- {
- "name" "Cerbetica_edited"
- "tall" "26"
+ "name" "Cerbetica_bold"
+ "tall" "28"
"additive" "0"
"antialias" "1"
}
@@ -432,38 +47,28 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica_bold"
"tall" "24"
"additive" "0"
"antialias" "1"
}
}
- "CerbeticaOutline24"
+ "Cerbetica24Outline"
{
"1"
{
- "name" "Cerbetica_edited"
- "tall" "24"
+ "name" "Cerbetica_bold"
+ "tall" "24"
"additive" "0"
"antialias" "1"
"outline" "1"
}
}
- "Cerbetica22"
- {
- "1"
- {
- "name" "Cerbetica_edited"
- "tall" "22"
- "additive" "0"
- "antialias" "1"
- }
- }
"Cerbetica20"
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica_bold"
"tall" "20"
"additive" "0"
"antialias" "1"
@@ -473,7 +78,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica_bold"
"tall" "18"
"additive" "0"
"antialias" "1"
@@ -483,27 +88,17 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica_bold"
"tall" "16"
"additive" "0"
"antialias" "1"
}
}
- "Cerbetica15"
- {
- "1"
- {
- "name" "Cerbetica_edited"
- "tall" "15"
- "additive" "0"
- "antialias" "1"
- }
- }
"Cerbetica14"
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica_bold"
"tall" "14"
"additive" "0"
"antialias" "1"
@@ -513,76 +108,36 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica_bold"
"tall" "12"
"additive" "0"
"antialias" "1"
}
}
- "Cerbetica11"
- {
- "1"
- {
- "name" "Cerbetica_edited"
- "tall" "11"
- "additive" "0"
- "antialias" "1"
- }
- }
"Cerbetica10"
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica_bold"
"tall" "10"
"additive" "0"
"antialias" "1"
}
}
- "Cerbetica9"
- {
- "1"
- {
- "name" "Cerbetica_edited"
- "tall" "9"
- "additive" "0"
- "antialias" "1"
- }
- }
- "Cerbetica8"
- {
- "1"
- {
- "name" "Cerbetica_edited"
- "tall" "8"
- "additive" "0"
- "antialias" "1"
- }
- }
- "Cerbetica7"
- {
- "1"
- {
- "name" "Cerbetica_edited"
- "tall" "7"
- "additive" "0"
- "antialias" "1"
- }
- }
// DEFAULT
"Default"
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "10"
"additive" "0"
"antialias" "1"
}
"2"
{
- "name" "Cerbetica_bold"
+ "name" "Cerbetica"
"tall" "12"
"range" "0x0000 0x00FF"
"weight" "800"
@@ -592,7 +147,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "10"
"weight" "900"
"range" "0x0000 0x017F"
@@ -603,7 +158,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "12"
"weight" "500"
"underline" "1"
@@ -611,7 +166,7 @@ Scheme
}
"2"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "11"
"range" "0x0000 0x00FF"
"weight" "800"
@@ -621,7 +176,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "12"
"weight" "0"
"range" "0x0000 0x017F"
@@ -629,7 +184,7 @@ Scheme
}
"2"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "13"
"weight" "0"
"range" "0x0000 0x017F"
@@ -637,7 +192,7 @@ Scheme
}
"3"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "14"
"weight" "0"
"range" "0x0000 0x017F"
@@ -646,7 +201,7 @@ Scheme
}
"4"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "20"
"weight" "0"
"range" "0x0000 0x017F"
@@ -655,7 +210,7 @@ Scheme
}
"5"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "22"
"weight" "0"
"range" "0x0000 0x017F"
@@ -664,7 +219,7 @@ Scheme
}
"6"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "12"
"range" "0x0000 0x00FF"
"weight" "0"
@@ -674,7 +229,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "12"
"weight" "0"
"range" "0x0000 0x017F"
@@ -682,7 +237,7 @@ Scheme
}
"2"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "12"
"weight" "0"
"range" "0x0000 0x017F"
@@ -690,7 +245,7 @@ Scheme
}
"3"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "12"
"weight" "0"
"range" "0x0000 0x017F"
@@ -699,7 +254,7 @@ Scheme
}
"4"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "14"
"weight" "0"
"range" "0x0000 0x017F"
@@ -708,7 +263,7 @@ Scheme
}
"5"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "16"
"weight" "0"
"range" "0x0000 0x017F"
@@ -720,7 +275,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "18"
"weight" "900"
"range" "0x0000 0x017F"
@@ -728,7 +283,7 @@ Scheme
}
"2"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "21"
"weight" "900"
"range" "0x0000 0x017F"
@@ -736,7 +291,7 @@ Scheme
}
"3"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "22"
"weight" "900"
"range" "0x0000 0x017F"
@@ -745,7 +300,7 @@ Scheme
}
"4"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "28"
"weight" "900"
"range" "0x0000 0x017F"
@@ -754,7 +309,7 @@ Scheme
}
"5"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "30"
"weight" "900"
"range" "0x0000 0x017F"
@@ -763,14 +318,14 @@ Scheme
}
"6"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "20"
"range" "0x0000 0x00FF"
"weight" "900"
}
"7"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "20"
"range" "0x0000 0x00FF"
"weight" "800"
@@ -781,7 +336,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"name" "Helvetica" [$OSX]
"tall" "18"
"weight" "900"
@@ -794,7 +349,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "6"
"weight" "500"
"additive" "0"
@@ -806,11 +361,10 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
- "tall" "10"
- "weight" "0"
- "additive" "0"
- "antialias" "1"
+ "name" "Cerbetica"
+ "tall" "12"
+ "weight" "700"
+ "yres" "480 599"
}
"2"
{
@@ -846,16 +400,16 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "24"
"weight" "500"
"additive" "0"
- "antialias" "1"
+ "antialias" "1"
"yres" "480 599"
}
"2"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "32"
"weight" "500"
"additive" "0"
@@ -864,7 +418,7 @@ Scheme
}
"3"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "44"
"weight" "500"
"additive" "0"
@@ -873,7 +427,7 @@ Scheme
}
"4"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "48"
"weight" "500"
"additive" "0"
@@ -882,7 +436,7 @@ Scheme
}
"5"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "52"
"weight" "500"
"additive" "0"
@@ -894,7 +448,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "44"
"weight" "500"
"additive" "0"
@@ -905,7 +459,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "35"
"weight" "500"
"additive" "0"
@@ -916,7 +470,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "36"
"weight" "500"
"additive" "0"
@@ -927,7 +481,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "30"
"weight" "500"
"additive" "0"
@@ -938,7 +492,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "30"
"weight" "500"
"additive" "0"
@@ -949,7 +503,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "24"
"weight" "500"
"additive" "0"
@@ -960,8 +514,8 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
- "tall" "24"
+ "name" "Cerbetica"
+ "tall" "20"
"weight" "500"
"additive" "0"
"antialias" "1"
@@ -971,7 +525,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "24"
"weight" "500"
"additive" "0"
@@ -982,7 +536,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "18"
"weight" "500"
"additive" "0"
@@ -993,7 +547,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "18"
"weight" "500"
"additive" "0"
@@ -1004,7 +558,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "18"
"weight" "500"
"additive" "0"
@@ -1015,7 +569,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "14"
"weight" "500"
"additive" "0"
@@ -1026,7 +580,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "16"
"weight" "500"
"additive" "0"
@@ -1037,7 +591,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "14"
"weight" "500"
"additive" "0"
@@ -1048,7 +602,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "14"
"weight" "500"
"additive" "0"
@@ -1060,8 +614,8 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
- "tall" "11"
+ "name" "Cerbetica"
+ "tall" "12"
"weight" "500"
"additive" "0"
"antialias" "1"
@@ -1071,8 +625,8 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
- "tall" "11"
+ "name" "Cerbetica"
+ "tall" "12"
"weight" "500"
"additive" "0"
"antialias" "1"
@@ -1083,8 +637,8 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
- "tall" "11"
+ "name" "Cerbetica"
+ "tall" "12"
"weight" "500"
"additive" "0"
"antialias" "1"
@@ -1095,8 +649,8 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
- "tall" "4"
+ "name" "Cerbetica"
+ "tall" "6"
"weight" "500"
"additive" "0"
"antialias" "1"
@@ -1107,7 +661,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "10"
"additive" "0"
"antialias" "1"
@@ -1118,7 +672,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "16"
//"weight" "500"
"additive" "0"
@@ -1129,8 +683,8 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
- "tall" "9"
+ "name" "Cerbetica"
+ "tall" "10"
"weight" "0"
"additive" "0"
"antialias" "1"
@@ -1140,8 +694,8 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
- "tall" "9"
+ "name" "Cerbetica"
+ "tall" "10"
"weight" "0"
"additive" "0"
"antialias" "1"
@@ -1151,7 +705,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "6"
"weight" "0"
"additive" "0"
@@ -1162,7 +716,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "12"
"weight" "400"
"additive" "0"
@@ -1174,8 +728,8 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
- "tall" "11"
+ "name" "Cerbetica"
+ "tall" "12"
"weight" "500"
"additive" "0"
"antialias" "1"
@@ -1246,7 +800,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "18"
"weight" "500"
"additive" "0"
@@ -1258,7 +812,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "16"
"weight" "500"
"additive" "0"
@@ -1316,7 +870,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "15"
"weight" "700"
"antialias" "1"
@@ -1326,7 +880,7 @@ Scheme
}
"2"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "15"
"weight" "700"
"antialias" "1"
@@ -1336,7 +890,7 @@ Scheme
}
"3"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "18"
"weight" "900"
"antialias" "1"
@@ -1345,7 +899,7 @@ Scheme
}
"4"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "21"
"weight" "900"
"antialias" "1"
@@ -1354,7 +908,7 @@ Scheme
}
"5"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "24"
"weight" "1000"
"antialias" "1"
@@ -1436,7 +990,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica Bold"
+ "name" "Cerbetica"
"tall" "24"
"antialias" "1"
"weight" "500"
@@ -1447,7 +1001,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica Bold"
+ "name" "Cerbetica"
"tall" "24"
"antialias" "1"
"weight" "500"
@@ -1459,7 +1013,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica Bold"
+ "name" "Cerbetica"
"tall" "24"
"antialias" "1"
"weight" "900"
@@ -1470,7 +1024,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica Bold"
+ "name" "Cerbetica"
"tall" "24"
"antialias" "1"
"weight" "900"
@@ -1482,7 +1036,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica Bold"
+ "name" "Cerbetica"
"tall" "16"
"antialias" "1"
"weight" "900"
@@ -1517,7 +1071,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "24"
"antialias" "1"
"weight" "500"
@@ -1527,8 +1081,8 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
- "tall" "11"
+ "name" "Cerbetica"
+ "tall" "12"
"antialias" "1"
"weight" "500"
}
@@ -1537,7 +1091,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "12"
"antialias" "1"
"weight" "500"
@@ -1560,7 +1114,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "28"
"antialias" "1"
"custom" "1" [$OSX]
@@ -1571,7 +1125,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "40"
"antialias" "1"
"custom" "1" [$OSX]
@@ -1582,7 +1136,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "24"
"antialias" "1"
"custom" "1" [$OSX]
@@ -1593,7 +1147,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "14" [!$OSX]
"tall" "15" [$OSX]
"antialias" "1"
@@ -1617,8 +1171,8 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
- "tall" "8"
+ "name" "Cerbetica"
+ "tall" "10"
"weight" "400"
"additive" "0"
"antialias" "1"
@@ -1628,7 +1182,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "10"
"weight" "400"
"additive" "0"
@@ -1639,7 +1193,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "10"
"weight" "500"
"range" "0x0000 0x007F"
@@ -1651,7 +1205,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "20"
"weight" "500"
"range" "0x0000 0x007F"
@@ -1663,7 +1217,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "20"
"weight" "500"
"range" "0x0000 0x007F"
@@ -1675,7 +1229,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "14"
"weight" "500"
"range" "0x0000 0x007F"
@@ -1687,7 +1241,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "14"
"weight" "500"
"range" "0x0000 0x007F"
@@ -1699,7 +1253,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "34"
"weight" "500"
"range" "0x0000 0x007F"
@@ -1722,7 +1276,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "52"
"range" "0x0000 0x00FF"
"weight" "400"
@@ -1731,7 +1285,7 @@ Scheme
}
"2"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "72"
"range" "0x0000 0x00FF"
"weight" "400"
@@ -1740,7 +1294,7 @@ Scheme
}
"3"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "100"
"range" "0x0000 0x00FF"
"weight" "400"
@@ -1749,7 +1303,7 @@ Scheme
}
"4"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "140"
"range" "0x0000 0x00FF"
"weight" "400"
@@ -1758,7 +1312,7 @@ Scheme
}
"5"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "180"
"range" "0x0000 0x00FF"
"weight" "400"
@@ -1771,7 +1325,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica Bold"
+ "name" "Cerbetica"
"tall" "36"
"weight" "500"
"range" "0x0000 0x007F"
@@ -1783,7 +1337,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "14"
"weight" "400"
"additive" "0"
@@ -1794,7 +1348,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "20"
"weight" "400"
"additive" "0"
@@ -1806,7 +1360,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "14"
"weight" "400"
"additive" "0"
@@ -1818,7 +1372,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "10"
"weight" "400"
"additive" "0"
@@ -1829,7 +1383,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "7"
"weight" "400"
"additive" "0"
@@ -1841,7 +1395,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "10"
"weight" "400"
"additive" "0"
@@ -1995,7 +1549,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "14"
"range" "0x0000 0x00FF"
"weight" "300"
@@ -2007,7 +1561,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "12"
"weight" "500"
"range" "0x0000 0x017F"
@@ -2019,8 +1573,8 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
- "tall" "8"
+ "name" "Cerbetica"
+ "tall" "10"
"weight" "500"
"range" "0x0000 0x017F"
"TextColor" "Black"
@@ -2056,8 +1610,8 @@ Scheme
"1"
{
"name" "Verdana"
- "tall" "11" [!$OSX]
- "tall" "9" [$OSX]
+ "tall" "12" [!$OSX]
+ "tall" "9" [$OSX]
"weight" "800"
"additive" "0"
"antialias" "1"
@@ -2068,7 +1622,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "36"
"weight" "500"
}
@@ -2077,7 +1631,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "30"
"weight" "500"
}
@@ -2086,7 +1640,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "28"
"weight" "500"
}
@@ -2095,7 +1649,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica Bold"
+ "name" "Cerbetica"
"tall" "22"
"weight" "900"
}
@@ -2104,7 +1658,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica Bold"
+ "name" "Cerbetica"
"tall" "18"
"weight" "900"
}
@@ -2113,7 +1667,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "22"
"weight" "500"
}
@@ -2122,7 +1676,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "18"
"weight" "500"
}
@@ -2160,7 +1714,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "36"
"weight" "500"
"additive" "0"
@@ -2171,8 +1725,8 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
- "tall" "11"
+ "name" "Cerbetica"
+ "tall" "12"
"weight" "600"
"additive" "0"
"antialias" "1"
@@ -2183,7 +1737,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "18"
"weight" "400"
"additive" "0"
@@ -2195,7 +1749,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica Bold"
+ "name" "Cerbetica"
"tall" "14"
"weight" "900"
"antialias" "1"
@@ -2229,8 +1783,8 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
- "tall" "8"
+ "name" "Cerbetica"
+ "tall" "10"
"weight" "400"
"additive" "0"
"antialias" "1"
@@ -2273,8 +1827,8 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
- "tall" "8"
+ "name" "Cerbetica"
+ "tall" "10"
"weight" "500"
"additive" "0"
"antialias" "1"
@@ -2284,8 +1838,8 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
- "tall" "10"
+ "name" "Cerbetica"
+ "tall" "12"
"weight" "500"
"additive" "0"
"antialias" "1"
@@ -2295,8 +1849,8 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
- "tall" "12"
+ "name" "Cerbetica"
+ "tall" "14"
"weight" "500"
"additive" "0"
"antialias" "1"
@@ -2306,7 +1860,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "18"
"weight" "500"
"additive" "0"
@@ -2317,8 +1871,8 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
- "tall" "8"
+ "name" "Cerbetica"
+ "tall" "10"
"weight" "500"
"additive" "0"
"antialias" "1"
@@ -2328,8 +1882,8 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
- "tall" "8"
+ "name" "Cerbetica"
+ "tall" "10"
"antialias" "1"
"weight" "500"
}
@@ -2338,8 +1892,8 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
- "tall" "8"
+ "name" "Cerbetica"
+ "tall" "10"
"weight" "500"
"additive" "0"
"antialias" "1"
@@ -2349,8 +1903,8 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
- "tall" "11"
+ "name" "Cerbetica"
+ "tall" "12"
"weight" "500"
"additive" "0"
"antialias" "1"
@@ -2360,31 +1914,20 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "14"
"weight" "500"
"additive" "0"
"antialias" "1"
}
}
- "ItemMeterFontSmall"
- {
- "1"
- {
- "name" "Cerbetica_edited"
- "tall" "6"
- "weight" "500"
- "additive" "0"
- "antialias" "1"
- }
- }
"AchievementTracker_Name"
{
"1"
{
- "name" "Cerbetica_edited"
- "tall" "9"
+ "name" "Cerbetica"
+ "tall" "10"
"weight" "500"
"additive" "0"
"antialias" "1"
@@ -2394,8 +1937,8 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
- "tall" "9"
+ "name" "Cerbetica"
+ "tall" "10"
"weight" "500"
"blur" "3"
"additive" "1"
@@ -2406,8 +1949,8 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
- "tall" "7"
+ "name" "Cerbetica"
+ "tall" "10"
"weight" "0"
"additive" "1"
"antialias" "1"
@@ -2527,7 +2070,7 @@ Scheme
"tall" "16"
"weight" "400"
"additive" "0"
- "antialias" "1"
+ "antialias" "1"
}
}
"QuestStickyText"
@@ -2642,7 +2185,7 @@ Scheme
"tall" "13"
"weight" "400"
"additive" "0"
- "antialias" "1"
+ "antialias" "1"
}
}
"QuestLargeText_Merasmus"
@@ -2653,7 +2196,7 @@ Scheme
"tall" "16"
"weight" "400"
"additive" "0"
- "antialias" "1"
+ "antialias" "1"
}
}
@@ -2676,7 +2219,7 @@ Scheme
"tall" "8"
"weight" "400"
"additive" "0"
- "antialias" "1"
+ "antialias" "1"
}
}
"AdFont_PurchaseButton"
@@ -2765,8 +2308,8 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
- "tall" "11"
+ "name" "Cerbetica"
+ "tall" "12"
"weight" "500"
"additive" "0"
"antialias" "1"
@@ -2829,8 +2372,8 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
- "tall" "11"
+ "name" "Cerbetica"
+ "tall" "12"
"weight" "500"
"additive" "0"
"antialias" "1"
@@ -2840,7 +2383,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "14"
"weight" "500"
"additive" "0"
@@ -2851,7 +2394,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "18"
"weight" "500"
"additive" "0"
@@ -2862,18 +2405,18 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "24"
"weight" "500"
"additive" "0"
- "antialias" "1"
+ "antialias" "1"
}
}
"ReplayLarger"
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "18"
"weight" "500"
"additive" "0"
@@ -2886,7 +2429,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica Bold"
+ "name" "Cerbetica"
"tall" "14"
"weight" "500"
"additive" "0"
@@ -2897,7 +2440,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica Bold"
+ "name" "Cerbetica"
"tall" "24"
"weight" "500"
"additive" "0"
@@ -2909,7 +2452,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "15"
"weight" "500"
"range" "0x0000 0x007F"
@@ -2922,8 +2465,8 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
- "tall" "9"
+ "name" "Cerbetica"
+ "tall" "10"
"weight" "400"
"additive" "0"
"antialias" "1"
@@ -2934,8 +2477,8 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
- "tall" "11"
+ "name" "Cerbetica"
+ "tall" "12"
"weight" "500"
"antialias" "1"
"custom" "1"
@@ -2945,8 +2488,8 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
- "tall" "11"
+ "name" "Cerbetica"
+ "tall" "12"
"weight" "500"
"blur" "3"
"additive" "1"
@@ -2958,7 +2501,7 @@ Scheme
{
"1"
{
- "name" "Cerbetica_edited"
+ "name" "Cerbetica"
"tall" "12"
"weight" "500"
"additive" "0"
@@ -2967,18 +2510,6 @@ Scheme
}
}
- "TF2ComboBox"
- {
- "1"
- {
- "name" "TF2 Secondary"
- "tall" "11"
- "weight" "500"
- "additive" "0"
- "antialias" "1"
- }
- }
-
"QuestMap_Small_Blur"
{
"1"
@@ -3043,6 +2574,12 @@ Scheme
"Buttons" "materials/vgui/fonts/buttons_32.vbf"
}
+ //////////////////////// CUSTOM FONT FILES /////////////////////////////
+ //
+ // specifies all the custom (non-system) font files that need to be loaded to service the above described fonts
+ // Range specificies the characters to be used from the custom font before falling back to a default font
+ // characters in the range not specificed in the font will appear empty
+ // For TF2: Any special character will need to be added to our font file
CustomFontFiles
{
"1" "resource/tf.ttf"
@@ -3105,13 +2642,74 @@ Scheme
}
"7"
{
- "font" "resource/fonts/Cerbetica_bold.ttf"
- "name" "Cerbetica Bold"
+ "font" "resource/ocra.ttf"
+ "name" "ocra"
+ "turkish"
+ {
+ "range" "0x0000 0x007E"
+ }
+ "swedish"
+ {
+ "range" "0x0000 0x007E"
+ }
+ "spanish"
+ {
+ "range" "0x0000 0x007E"
+ }
+ "romanian"
+ {
+ "range" "0x0000 0x007E"
+ }
+ "polish"
+ {
+ "range" "0x0000 0x007E"
+ }
+ "norwegian"
+ {
+ "range" "0x0000 0x007E"
+ }
+ "danish"
+ {
+ "range" "0x0000 0x007E"
+ }
+ "hungarian"
+ {
+ "range" "0x0000 0x007E"
+ }
+ "german"
+ {
+ "range" "0x0000 0x007E"
+ }
+ "french"
+ {
+ "range" "0x0000 0x007E"
+ }
+ "finnish"
+ {
+ "range" "0x0000 0x007E"
+ }
+ "czech"
+ {
+ "range" "0x0000 0x007E"
+ }
+ "bulgarian"
+ {
+ "range" "0x0000 0x007E"
+ }
+ "russian"
+ {
+ "range" "0x0000 0x007E"
+ }
}
"8"
{
- "font" "resource/fonts/Cerbetica_edited.ttf"
- "name" "Cerbetica_edited"
+ "font" "resource/fonts/Cerbetica.otf"
+ "name" "Cerbetica"
+ }
+ "9"
+ {
+ "font" "resource/fonts/Cerbetica_bold.otf"
+ "name" "Cerbetica_bold"
}
}
} \ No newline at end of file
diff --git a/resource/scheme/clientscheme_icons.res b/resource/scheme/clientscheme_icons.res
index 614a1a3..2dccc84 100644
--- a/resource/scheme/clientscheme_icons.res
+++ b/resource/scheme/clientscheme_icons.res
@@ -26,52 +26,7 @@ Scheme
}
}
- "ClassIconsSmall"
- {
- "1"
- {
- "name" "FlawHUDIcons"
- "tall" "42"
- "weight" "0"
- "additive" "0"
- "antialias" "1"
- }
- }
-
- "CustomIcons10"
- {
- "1"
- {
- "name" "FlawHUDIcons"
- "tall" "10"
- "additive" "0"
- "antialias" "1"
- }
- }
-
- "CustomIcons12"
- {
- "1"
- {
- "name" "FlawHUDIcons"
- "tall" "12"
- "additive" "0"
- "antialias" "1"
- }
- }
-
- "CustomIcons14"
- {
- "1"
- {
- "name" "FlawHUDIcons"
- "tall" "14"
- "additive" "0"
- "antialias" "1"
- }
- }
-
- "CustomIcons18"
+ "CustomIcons"
{
"1"
{
@@ -81,24 +36,13 @@ Scheme
"antialias" "1"
}
}
-
- "CustomIcons20"
- {
- "1"
- {
- "name" "FlawHUDIcons"
- "tall" "20"
- "additive" "0"
- "antialias" "1"
- }
- }
}
CustomFontFiles
{
"121"
{
- "font" "resource/fonts/FlawHUDIcons.otf"
+ "font" "resource/fonts/Icons.otf"
"name" "FlawHUDIcons"
}
}
diff --git a/resource/scheme/clientscheme_settings.res b/resource/scheme/clientscheme_settings.res
index 1f310a5..66421f8 100644
--- a/resource/scheme/clientscheme_settings.res
+++ b/resource/scheme/clientscheme_settings.res
@@ -1,7 +1,11 @@
Scheme
{
+ ///////////////////// BASE SETTINGS ////////////////////////
+ // default settings for all panels
+ // controls use these to determine their settings
BaseSettings
{
+ // vgui_controls color specifications
ReplayBrowser.BgColor "DarkBrown"
ReplayBrowser.Details.TitleEdit.Carat.FgColor "200 128 255 255"
ReplayBrowser.Button.ArmedBgColor "TFOrange"
@@ -11,22 +15,22 @@ Scheme
ReplayBrowser.ScrollBar.SliderButton.FgColor "TransparentYellow"
ReplayBrowser.Search.BgColor "TanDark"
ReplayBrowser.Search.FgColor "White"
- Replay.RenderDialog.BgColor "30 30 30 255"
+ Replay.RenderDialog.BgColor "TanDark"
Econ.Dialog.BgColor "Blank"
- Econ.Button.BgColor "25 25 25 255"
+ Econ.Button.BgColor "TanDarker"
Econ.Button.FgColor "TanDark"
- Econ.Button.ArmedBgColor "35 35 35 255"
+ Econ.Button.ArmedBgColor "TanDark"
Econ.Button.ArmedFgColor "TanLight"
- Econ.Button.DepressedBgColor "25 25 25 255"
+ Econ.Button.DepressedBgColor "TanDarker"
Econ.Button.DepressedFgColor "TanDark"
Econ.Button.PresetDefaultColorFg "15 255 255 255"
Econ.Button.PresetArmedColorFg "15 255 255 255"
Econ.Button.PresetDepressedColorFg "15 255 255 255"
- Econ.Button.PresetDefaultColorBg "25 25 25 255"
+ Econ.Button.PresetDefaultColorBg "TanDarker"
Econ.Button.PresetArmedColorBg "50 50 50 255"
- Econ.Button.PresetDepressedColorBg "25 25 25 255"
- Econ.Button.Border.Default "25 25 25 255"
+ Econ.Button.PresetDepressedColorBg "TanDarker"
+ Econ.Button.Border.Default "TanDarker"
Econ.Button.Border.Armed "50 50 50 255"
Border.Bright "NoBorder"
@@ -34,13 +38,13 @@ Scheme
Border.Selection "NoBorder"
Button.TextColor "TanLight"
- Button.BgColor "25 25 25 255"
+ Button.BgColor "TanDarker"
Button.ArmedTextColor "TanLight"
- Button.ArmedBgColor "35 35 35 255"
+ Button.ArmedBgColor "TanDark"
Button.SelectedTextColor "TanLight"
- Button.SelectedBgColor "25 25 25 255"
+ Button.SelectedBgColor "TanDarker"
Button.DepressedTextColor "TanLight"
- Button.DepressedBgColor "35 35 35 255"
+ Button.DepressedBgColor "TanDark"
CheckButton.TextColor "Yellow"
CheckButton.SelectedTextColor "Yellow"
diff --git a/resource/scheme/clientscheme_xhairs.res b/resource/scheme/clientscheme_xhairs.res
index ca91a97..6b8e3f1 100644
--- a/resource/scheme/clientscheme_xhairs.res
+++ b/resource/scheme/clientscheme_xhairs.res
@@ -2,1085 +2,224 @@ Scheme
{
Fonts
{
- "KnucklesCrosses10"
+ "Size:10 | Outline:OFF"
{
"1"
{
- "name" "KnucklesCrosses"
+ "name" "TF2Crosshairs"
"tall" "10"
- "additive" "0"
+ "weight" "0"
"antialias" "1"
- "outline" "0"
}
}
- "KnucklesCrosses12"
+ "Size:11 | Outline:OFF"
{
"1"
{
- "name" "KnucklesCrosses"
- "tall" "12"
- "additive" "0"
- "antialias" "1"
- "outline" "0"
- }
- }
- "KnucklesCrosses14"
- {
- "1"
- {
- "name" "KnucklesCrosses"
- "tall" "14"
- "additive" "0"
- "antialias" "1"
- "outline" "0"
- }
- }
- "KnucklesCrosses16"
- {
- "1"
- {
- "name" "KnucklesCrosses"
- "tall" "16"
- "additive" "0"
- "antialias" "1"
- "outline" "0"
- }
- }
- "KnucklesCrosses18"
- {
- "1"
- {
- "name" "KnucklesCrosses"
- "tall" "18"
- "additive" "0"
- "antialias" "1"
- "outline" "0"
- }
- }
- "KnucklesCrosses20"
- {
- "1"
- {
- "name" "KnucklesCrosses"
- "tall" "20"
- "additive" "0"
- "antialias" "1"
- "outline" "0"
- }
- }
- "KnucklesCrosses22"
- {
- "1"
- {
- "name" "KnucklesCrosses"
- "tall" "22"
- "additive" "0"
- "antialias" "1"
- "outline" "0"
- }
- }
- "KnucklesCrosses24"
- {
- "1"
- {
- "name" "KnucklesCrosses"
- "tall" "24"
- "additive" "0"
- "antialias" "1"
- "outline" "0"
- }
- }
- "KnucklesCrosses26"
- {
- "1"
- {
- "name" "KnucklesCrosses"
- "tall" "26"
- "additive" "0"
- "antialias" "1"
- "outline" "0"
- }
- }
- "KnucklesCrosses28"
- {
- "1"
- {
- "name" "KnucklesCrosses"
- "tall" "28"
- "additive" "0"
- "antialias" "1"
- "outline" "0"
- }
- }
- "KnucklesCrosses30"
- {
- "1"
- {
- "name" "KnucklesCrosses"
- "tall" "30"
- "additive" "0"
+ "name" "TF2Crosshairs"
+ "tall" "11"
+ "weight" "0"
"antialias" "1"
- "outline" "0"
}
}
- "KnucklesCrosses32"
+ "Size:12 | Outline:OFF"
{
"1"
{
- "name" "KnucklesCrosses"
- "tall" "32"
- "additive" "0"
- "antialias" "1"
- "outline" "0"
- }
- }
- "KnucklesCrosses34"
- {
- "1"
- {
- "name" "KnucklesCrosses"
- "tall" "34"
- "additive" "0"
- "antialias" "1"
- "outline" "0"
- }
- }
- "KnucklesCrosses36"
- {
- "1"
- {
- "name" "KnucklesCrosses"
- "tall" "36"
- "additive" "0"
- "antialias" "1"
- "outline" "0"
- }
- }
- "KnucklesCrosses38"
- {
- "1"
- {
- "name" "KnucklesCrosses"
- "tall" "38"
- "additive" "0"
- "antialias" "1"
- "outline" "0"
- }
- }
- "KnucklesCrosses40"
- {
- "1"
- {
- "name" "KnucklesCrosses"
- "tall" "40"
- "additive" "0"
- "antialias" "1"
- "outline" "0"
- }
- }
-
- "KnucklesCrosses10Outline"
- {
- "1"
- {
- "name" "KnucklesCrosses"
- "tall" "10"
- "additive" "0"
- "antialias" "1"
- "outline" "1"
- }
- }
- "KnucklesCrosses12Outline"
- {
- "1"
- {
- "name" "KnucklesCrosses"
+ "name" "TF2Crosshairs"
"tall" "12"
- "additive" "0"
- "antialias" "1"
- "outline" "1"
- }
- }
- "KnucklesCrosses14Outline"
- {
- "1"
- {
- "name" "KnucklesCrosses"
- "tall" "14"
- "additive" "0"
- "antialias" "1"
- "outline" "1"
- }
- }
- "KnucklesCrosses16Outline"
- {
- "1"
- {
- "name" "KnucklesCrosses"
- "tall" "16"
- "additive" "0"
- "antialias" "1"
- "outline" "1"
- }
- }
- "KnucklesCrosses18Outline"
- {
- "1"
- {
- "name" "KnucklesCrosses"
- "tall" "18"
- "additive" "0"
- "antialias" "1"
- "outline" "1"
- }
- }
- "KnucklesCrosses20Outline"
- {
- "1"
- {
- "name" "KnucklesCrosses"
- "tall" "20"
- "additive" "0"
- "antialias" "1"
- "outline" "1"
- }
- }
- "KnucklesCrosses22Outline"
- {
- "1"
- {
- "name" "KnucklesCrosses"
- "tall" "22"
- "additive" "0"
- "antialias" "1"
- "outline" "1"
- }
- }
- "KnucklesCrosses24Outline"
- {
- "1"
- {
- "name" "KnucklesCrosses"
- "tall" "24"
- "additive" "0"
- "antialias" "1"
- "outline" "1"
- }
- }
- "KnucklesCrosses26Outline"
- {
- "1"
- {
- "name" "KnucklesCrosses"
- "tall" "26"
- "additive" "0"
- "antialias" "1"
- "outline" "1"
- }
- }
- "KnucklesCrosses28Outline"
- {
- "1"
- {
- "name" "KnucklesCrosses"
- "tall" "28"
- "additive" "0"
- "antialias" "1"
- "outline" "1"
- }
- }
- "KnucklesCrosses30Outline"
- {
- "1"
- {
- "name" "KnucklesCrosses"
- "tall" "30"
- "additive" "0"
- "antialias" "1"
- "outline" "1"
- }
- }
- "KnucklesCrosses32Outline"
- {
- "1"
- {
- "name" "KnucklesCrosses"
- "tall" "32"
- "additive" "0"
- "antialias" "1"
- "outline" "1"
- }
- }
- "KnucklesCrosses34Outline"
- {
- "1"
- {
- "name" "KnucklesCrosses"
- "tall" "34"
- "additive" "0"
- "antialias" "1"
- "outline" "1"
- }
- }
- "KnucklesCrosses36Outline"
- {
- "1"
- {
- "name" "KnucklesCrosses"
- "tall" "36"
- "additive" "0"
- "antialias" "1"
- "outline" "1"
- }
- }
- "KnucklesCrosses38Outline"
- {
- "1"
- {
- "name" "KnucklesCrosses"
- "tall" "38"
- "additive" "0"
- "antialias" "1"
- "outline" "1"
- }
- }
- "KnucklesCrosses40Outline"
- {
- "1"
- {
- "name" "KnucklesCrosses"
- "tall" "40"
- "additive" "0"
- "antialias" "1"
- "outline" "1"
- }
- }
-
- "Crosshairs10"
- {
- "1"
- {
- "name" "Crosshairs"
- "tall" "10"
- "additive" "0"
+ "weight" "0"
"antialias" "1"
- "outline" "0"
}
}
- "Crosshairs12"
+ "Size:13 | Outline:OFF"
{
"1"
{
- "name" "Crosshairs"
- "tall" "12"
- "additive" "0"
+ "name" "TF2Crosshairs"
+ "tall" "13"
+ "weight" "0"
"antialias" "1"
- "outline" "0"
}
}
- "Crosshairs14"
+ "Size:14 | Outline:OFF"
{
"1"
{
- "name" "Crosshairs"
+ "name" "TF2Crosshairs"
"tall" "14"
- "additive" "0"
- "antialias" "1"
- "outline" "0"
- }
- }
- "Crosshairs16"
- {
- "1"
- {
- "name" "Crosshairs"
- "tall" "16"
- "additive" "0"
- "antialias" "1"
- "outline" "0"
- }
- }
- "Crosshairs18"
- {
- "1"
- {
- "name" "Crosshairs"
- "tall" "18"
- "additive" "0"
- "antialias" "1"
- "outline" "0"
- }
- }
- "Crosshairs20"
- {
- "1"
- {
- "name" "Crosshairs"
- "tall" "20"
- "additive" "0"
- "antialias" "1"
- "outline" "0"
- }
- }
- "Crosshairs22"
- {
- "1"
- {
- "name" "Crosshairs"
- "tall" "22"
- "additive" "0"
- "antialias" "1"
- "outline" "0"
- }
- }
- "Crosshairs24"
- {
- "1"
- {
- "name" "Crosshairs"
- "tall" "24"
- "additive" "0"
- "antialias" "1"
- "outline" "0"
- }
- }
- "Crosshairs26"
- {
- "1"
- {
- "name" "Crosshairs"
- "tall" "26"
- "additive" "0"
- "antialias" "1"
- "outline" "0"
- }
- }
- "Crosshairs28"
- {
- "1"
- {
- "name" "Crosshairs"
- "tall" "28"
- "additive" "0"
- "antialias" "1"
- "outline" "0"
- }
- }
- "Crosshairs30"
- {
- "1"
- {
- "name" "Crosshairs"
- "tall" "30"
- "additive" "0"
- "antialias" "1"
- "outline" "0"
- }
- }
- "Crosshairs32"
- {
- "1"
- {
- "name" "Crosshairs"
- "tall" "32"
- "additive" "0"
- "antialias" "1"
- "outline" "0"
- }
- }
- "Crosshairs34"
- {
- "1"
- {
- "name" "Crosshairs"
- "tall" "34"
- "additive" "0"
- "antialias" "1"
- "outline" "0"
- }
- }
- "Crosshairs36"
- {
- "1"
- {
- "name" "Crosshairs"
- "tall" "36"
- "additive" "0"
- "antialias" "1"
- "outline" "0"
- }
- }
- "Crosshairs38"
- {
- "1"
- {
- "name" "Crosshairs"
- "tall" "38"
- "additive" "0"
- "antialias" "1"
- "outline" "0"
- }
- }
- "Crosshairs40"
- {
- "1"
- {
- "name" "Crosshairs"
- "tall" "40"
- "additive" "0"
- "antialias" "1"
- "outline" "0"
- }
- }
-
- "Crosshairs10Outline"
- {
- "1"
- {
- "name" "Crosshairs"
- "tall" "10"
- "additive" "0"
- "antialias" "1"
- "outline" "1"
- }
- }
- "Crosshairs12Outline"
- {
- "1"
- {
- "name" "Crosshairs"
- "tall" "12"
- "additive" "0"
- "antialias" "1"
- "outline" "1"
- }
- }
- "Crosshairs14Outline"
- {
- "1"
- {
- "name" "Crosshairs"
- "tall" "14"
- "additive" "0"
- "antialias" "1"
- "outline" "1"
- }
- }
- "Crosshairs16Outline"
- {
- "1"
- {
- "name" "Crosshairs"
- "tall" "16"
- "additive" "0"
- "antialias" "1"
- "outline" "1"
- }
- }
- "Crosshairs18Outline"
- {
- "1"
- {
- "name" "Crosshairs"
- "tall" "18"
- "additive" "0"
- "antialias" "1"
- "outline" "1"
- }
- }
- "Crosshairs20Outline"
- {
- "1"
- {
- "name" "Crosshairs"
- "tall" "20"
- "additive" "0"
- "antialias" "1"
- "outline" "1"
- }
- }
- "Crosshairs22Outline"
- {
- "1"
- {
- "name" "Crosshairs"
- "tall" "22"
- "additive" "0"
- "antialias" "1"
- "outline" "1"
- }
- }
- "Crosshairs24Outline"
- {
- "1"
- {
- "name" "Crosshairs"
- "tall" "24"
- "additive" "0"
- "antialias" "1"
- "outline" "1"
- }
- }
- "Crosshairs26Outline"
- {
- "1"
- {
- "name" "Crosshairs"
- "tall" "26"
- "additive" "0"
- "antialias" "1"
- "outline" "1"
- }
- }
- "Crosshairs28Outline"
- {
- "1"
- {
- "name" "Crosshairs"
- "tall" "28"
- "additive" "0"
- "antialias" "1"
- "outline" "1"
- }
- }
- "Crosshairs30Outline"
- {
- "1"
- {
- "name" "Crosshairs"
- "tall" "30"
- "additive" "0"
- "antialias" "1"
- "outline" "1"
- }
- }
- "Crosshairs32Outline"
- {
- "1"
- {
- "name" "Crosshairs"
- "tall" "32"
- "additive" "0"
- "antialias" "1"
- "outline" "1"
- }
- }
- "Crosshairs34Outline"
- {
- "1"
- {
- "name" "Crosshairs"
- "tall" "34"
- "additive" "0"
- "antialias" "1"
- "outline" "1"
- }
- }
- "Crosshairs36Outline"
- {
- "1"
- {
- "name" "Crosshairs"
- "tall" "36"
- "additive" "0"
- "antialias" "1"
- "outline" "1"
- }
- }
- "Crosshairs38Outline"
- {
- "1"
- {
- "name" "Crosshairs"
- "tall" "38"
- "additive" "0"
- "antialias" "1"
- "outline" "1"
- }
- }
- "Crosshairs40Outline"
- {
- "1"
- {
- "name" "Crosshairs"
- "tall" "40"
- "additive" "0"
+ "weight" "0"
"antialias" "1"
- "outline" "1"
}
}
-
- "KonrWings10"
- {
- "1"
- {
- "name" "Garm3nFont"
- "tall" "10"
- "additive" "0"
- "antialias" "1"
- "outline" "0"
- }
- }
- "KonrWings12"
+ "Size:15 | Outline:OFF"
{
"1"
{
- "name" "Garm3nFont"
- "tall" "12"
- "additive" "0"
- "antialias" "1"
- "outline" "0"
- }
- }
- "KonrWings14"
- {
- "1"
- {
- "name" "Garm3nFont"
- "tall" "14"
- "additive" "0"
+ "name" "TF2Crosshairs"
+ "tall" "15"
+ "weight" "0"
"antialias" "1"
- "outline" "0"
}
}
- "KonrWings16"
+ "Size:16 | Outline:OFF"
{
"1"
{
- "name" "Garm3nFont"
+ "name" "TF2Crosshairs"
"tall" "16"
- "additive" "0"
- "antialias" "1"
- "outline" "0"
- }
- }
- "KonrWings18"
- {
- "1"
- {
- "name" "Garm3nFont"
- "tall" "18"
- "additive" "0"
- "antialias" "1"
- "outline" "0"
- }
- }
- "KonrWings20"
- {
- "1"
- {
- "name" "Garm3nFont"
- "tall" "20"
- "additive" "0"
- "antialias" "1"
- "outline" "0"
- }
- }
- "KonrWings22"
- {
- "1"
- {
- "name" "Garm3nFont"
- "tall" "22"
- "additive" "0"
- "antialias" "1"
- "outline" "0"
- }
- }
- "KonrWings24"
- {
- "1"
- {
- "name" "Garm3nFont"
- "tall" "24"
- "additive" "0"
- "antialias" "1"
- "outline" "0"
- }
- }
- "KonrWings26"
- {
- "1"
- {
- "name" "Garm3nFont"
- "tall" "26"
- "additive" "0"
- "antialias" "1"
- "outline" "0"
- }
- }
- "KonrWings28"
- {
- "1"
- {
- "name" "Garm3nFont"
- "tall" "28"
- "additive" "0"
- "antialias" "1"
- "outline" "0"
- }
- }
- "KonrWings30"
- {
- "1"
- {
- "name" "Garm3nFont"
- "tall" "30"
- "additive" "0"
- "antialias" "1"
- "outline" "0"
- }
- }
- "KonrWings32"
- {
- "1"
- {
- "name" "Garm3nFont"
- "tall" "32"
- "additive" "0"
- "antialias" "1"
- "outline" "0"
- }
- }
- "KonrWings34"
- {
- "1"
- {
- "name" "Garm3nFont"
- "tall" "34"
- "additive" "0"
- "antialias" "1"
- "outline" "0"
- }
- }
- "KonrWings36"
- {
- "1"
- {
- "name" "Garm3nFont"
- "tall" "36"
- "additive" "0"
- "antialias" "1"
- "outline" "0"
- }
- }
- "KonrWings38"
- {
- "1"
- {
- "name" "Garm3nFont"
- "tall" "38"
- "additive" "0"
- "antialias" "1"
- "outline" "0"
- }
- }
- "KonrWings40"
- {
- "1"
- {
- "name" "Garm3nFont"
- "tall" "40"
- "additive" "0"
- "antialias" "1"
- "outline" "0"
- }
- }
-
- "KonrWings10Outline"
- {
- "1"
- {
- "name" "Garm3nFont"
- "tall" "10"
- "additive" "0"
- "antialias" "1"
- "outline" "1"
- }
- }
- "KonrWings12Outline"
- {
- "1"
- {
- "name" "Garm3nFont"
- "tall" "12"
- "additive" "0"
+ "weight" "0"
"antialias" "1"
- "outline" "1"
}
}
- "KonrWings14Outline"
+ "Size:17 | Outline:OFF"
{
"1"
{
- "name" "Garm3nFont"
- "tall" "14"
- "additive" "0"
+ "name" "TF2Crosshairs"
+ "tall" "17"
+ "weight" "0"
"antialias" "1"
- "outline" "1"
}
}
- "KonrWings16Outline"
+ "Size:18 | Outline:OFF"
{
"1"
{
- "name" "Garm3nFont"
- "tall" "16"
- "additive" "0"
+ "name" "TF2Crosshairs"
+ "tall" "18"
+ "weight" "0"
"antialias" "1"
- "outline" "1"
}
}
- "KonrWings18Outline"
+ "Size:19 | Outline:OFF"
{
"1"
{
- "name" "Garm3nFont"
- "tall" "18"
- "additive" "0"
+ "name" "TF2Crosshairs"
+ "tall" "19"
+ "weight" "0"
"antialias" "1"
- "outline" "1"
}
}
- "KonrWings20Outline"
+ "Size:20 | Outline:OFF"
{
"1"
{
- "name" "Garm3nFont"
+ "name" "TF2Crosshairs"
"tall" "20"
- "additive" "0"
+ "weight" "0"
"antialias" "1"
- "outline" "1"
}
}
- "KonrWings22Outline"
+ "Size:21 | Outline:OFF"
{
"1"
{
- "name" "Garm3nFont"
- "tall" "22"
- "additive" "0"
+ "name" "TF2Crosshairs"
+ "tall" "21"
+ "weight" "0"
"antialias" "1"
- "outline" "1"
}
}
- "KonrWings24Outline"
+ "Size:22 | Outline:OFF"
{
"1"
{
- "name" "Garm3nFont"
- "tall" "24"
- "additive" "0"
+ "name" "TF2Crosshairs"
+ "tall" "22"
+ "weight" "0"
"antialias" "1"
- "outline" "1"
}
}
- "KonrWings26Outline"
+ "Size:23 | Outline:OFF"
{
"1"
{
- "name" "Garm3nFont"
- "tall" "26"
- "additive" "0"
+ "name" "TF2Crosshairs"
+ "tall" "23"
+ "weight" "0"
"antialias" "1"
- "outline" "1"
}
}
- "KonrWings28Outline"
+ "Size:24 | Outline:OFF"
{
"1"
{
- "name" "Garm3nFont"
- "tall" "28"
- "additive" "0"
+ "name" "TF2Crosshairs"
+ "tall" "24"
+ "weight" "0"
"antialias" "1"
- "outline" "1"
}
}
- "KonrWings30Outline"
+ "Size:25 | Outline:OFF"
{
"1"
{
- "name" "Garm3nFont"
- "tall" "30"
- "additive" "0"
+ "name" "TF2Crosshairs"
+ "tall" "25"
+ "weight" "0"
"antialias" "1"
- "outline" "1"
}
}
- "KonrWings32Outline"
+ "Size:26 | Outline:OFF"
{
"1"
{
- "name" "Garm3nFont"
- "tall" "32"
- "additive" "0"
+ "name" "TF2Crosshairs"
+ "tall" "26"
+ "weight" "0"
"antialias" "1"
- "outline" "1"
}
}
- "KonrWings34Outline"
+ "Size:27 | Outline:OFF"
{
"1"
{
- "name" "Garm3nFont"
- "tall" "34"
- "additive" "0"
+ "name" "TF2Crosshairs"
+ "tall" "27"
+ "weight" "0"
"antialias" "1"
- "outline" "1"
}
}
- "KonrWings36Outline"
+ "Size:28 | Outline:OFF"
{
"1"
{
- "name" "Garm3nFont"
- "tall" "36"
- "additive" "0"
+ "name" "TF2Crosshairs"
+ "tall" "28"
+ "weight" "0"
"antialias" "1"
- "outline" "1"
}
}
- "KonrWings38Outline"
+ "Size:29 | Outline:OFF"
{
"1"
{
- "name" "Garm3nFont"
- "tall" "38"
- "additive" "0"
+ "name" "TF2Crosshairs"
+ "tall" "29"
+ "weight" "0"
"antialias" "1"
- "outline" "1"
}
}
- "KonrWings40Outline"
+ "Size:30 | Outline:OFF"
{
"1"
{
- "name" "Garm3nFont"
- "tall" "40"
- "additive" "0"
+ "name" "TF2Crosshairs"
+ "tall" "30"
+ "weight" "0"
"antialias" "1"
- "outline" "1"
}
}
}
CustomFontFiles
{
- "110" // Knuckles Crosses
- {
- "font" "resource/fonts/KnucklesCrosses.ttf"
- "name" "KnucklesCrosses"
- }
- "111" // Fog's xHairs
- {
- "font" "resource/fonts/crosshairs.ttf"
- "name" "Crosshairs"
- }
- "112" // Konr Wings
+ "200"
{
- "font" "resource/fonts/Garm3nFont.ttf"
- "name" "Garm3nFont"
+ "font" "resource/fonts/TF2Crosshairs.otf"
+ "name" "TF2Crosshairs"
}
}
} \ No newline at end of file
diff --git a/resource/scheme/clientscheme_xhairs_blur.res b/resource/scheme/clientscheme_xhairs_blur.res
new file mode 100644
index 0000000..6f9d584
--- /dev/null
+++ b/resource/scheme/clientscheme_xhairs_blur.res
@@ -0,0 +1,237 @@
+Scheme
+{
+ Fonts
+ {
+ "Size:10 | Blur:ON"
+ {
+ "1"
+ {
+ "name" "TF2Crosshairs"
+ "tall" "10"
+ "weight" "0"
+ "antialias" "1"
+ "blur" "2"
+ }
+ }
+ "Size:11 | Blur:ON"
+ {
+ "1"
+ {
+ "name" "TF2Crosshairs"
+ "tall" "11"
+ "weight" "0"
+ "antialias" "1"
+ "blur" "2"
+ }
+ }
+ "Size:12 | Blur:ON"
+ {
+ "1"
+ {
+ "name" "TF2Crosshairs"
+ "tall" "12"
+ "weight" "0"
+ "antialias" "1"
+ "blur" "2"
+ }
+ }
+ "Size:13 | Blur:ON"
+ {
+ "1"
+ {
+ "name" "TF2Crosshairs"
+ "tall" "13"
+ "weight" "0"
+ "antialias" "1"
+ "blur" "2"
+ }
+ }
+ "Size:14 | Blur:ON"
+ {
+ "1"
+ {
+ "name" "TF2Crosshairs"
+ "tall" "14"
+ "weight" "0"
+ "antialias" "1"
+ "blur" "2"
+ }
+ }
+ "Size:15 | Blur:ON"
+ {
+ "1"
+ {
+ "name" "TF2Crosshairs"
+ "tall" "15"
+ "weight" "0"
+ "antialias" "1"
+ "blur" "2"
+ }
+ }
+ "Size:16 | Blur:ON"
+ {
+ "1"
+ {
+ "name" "TF2Crosshairs"
+ "tall" "16"
+ "weight" "0"
+ "antialias" "1"
+ "blur" "2"
+ }
+ }
+ "Size:17 | Blur:ON"
+ {
+ "1"
+ {
+ "name" "TF2Crosshairs"
+ "tall" "17"
+ "weight" "0"
+ "antialias" "1"
+ "blur" "2"
+ }
+ }
+ "Size:18 | Blur:ON"
+ {
+ "1"
+ {
+ "name" "TF2Crosshairs"
+ "tall" "18"
+ "weight" "0"
+ "antialias" "1"
+ "blur" "2"
+ }
+ }
+ "Size:19 | Blur:ON"
+ {
+ "1"
+ {
+ "name" "TF2Crosshairs"
+ "tall" "19"
+ "weight" "0"
+ "antialias" "1"
+ "blur" "2"
+ }
+ }
+ "Size:20 | Blur:ON"
+ {
+ "1"
+ {
+ "name" "TF2Crosshairs"
+ "tall" "20"
+ "weight" "0"
+ "antialias" "1"
+ "blur" "2"
+ }
+ }
+ "Size:21 | Blur:ON"
+ {
+ "1"
+ {
+ "name" "TF2Crosshairs"
+ "tall" "21"
+ "weight" "0"
+ "antialias" "1"
+ "blur" "2"
+ }
+ }
+ "Size:22 | Blur:ON"
+ {
+ "1"
+ {
+ "name" "TF2Crosshairs"
+ "tall" "22"
+ "weight" "0"
+ "antialias" "1"
+ "blur" "2"
+ }
+ }
+ "Size:23 | Blur:ON"
+ {
+ "1"
+ {
+ "name" "TF2Crosshairs"
+ "tall" "23"
+ "weight" "0"
+ "antialias" "1"
+ "blur" "2"
+ }
+ }
+ "Size:24 | Blur:ON"
+ {
+ "1"
+ {
+ "name" "TF2Crosshairs"
+ "tall" "24"
+ "weight" "0"
+ "antialias" "1"
+ "blur" "2"
+ }
+ }
+ "Size:25 | Blur:ON"
+ {
+ "1"
+ {
+ "name" "TF2Crosshairs"
+ "tall" "25"
+ "weight" "0"
+ "antialias" "1"
+ "blur" "2"
+ }
+ }
+ "Size:26 | Blur:ON"
+ {
+ "1"
+ {
+ "name" "TF2Crosshairs"
+ "tall" "26"
+ "weight" "0"
+ "antialias" "1"
+ "blur" "2"
+ }
+ }
+ "Size:27 | Blur:ON"
+ {
+ "1"
+ {
+ "name" "TF2Crosshairs"
+ "tall" "27"
+ "weight" "0"
+ "antialias" "1"
+ "blur" "2"
+ }
+ }
+ "Size:28 | Blur:ON"
+ {
+ "1"
+ {
+ "name" "TF2Crosshairs"
+ "tall" "28"
+ "weight" "0"
+ "antialias" "1"
+ "blur" "2"
+ }
+ }
+ "Size:29 | Blur:ON"
+ {
+ "1"
+ {
+ "name" "TF2Crosshairs"
+ "tall" "29"
+ "weight" "0"
+ "antialias" "1"
+ "blur" "2"
+ }
+ }
+ "Size:30 | Blur:ON"
+ {
+ "1"
+ {
+ "name" "TF2Crosshairs"
+ "tall" "30"
+ "weight" "0"
+ "antialias" "1"
+ "blur" "2"
+ }
+ }
+ }
+} \ No newline at end of file
diff --git a/resource/scheme/clientscheme_xhairs_outline.res b/resource/scheme/clientscheme_xhairs_outline.res
new file mode 100644
index 0000000..388a550
--- /dev/null
+++ b/resource/scheme/clientscheme_xhairs_outline.res
@@ -0,0 +1,237 @@
+Scheme
+{
+ Fonts
+ {
+ "Size:10 | Outline:ON"
+ {
+ "1"
+ {
+ "name" "TF2Crosshairs"
+ "tall" "10"
+ "weight" "0"
+ "antialias" "1"
+ "outline" "1"
+ }
+ }
+ "Size:11 | Outline:ON"
+ {
+ "1"
+ {
+ "name" "TF2Crosshairs"
+ "tall" "11"
+ "weight" "0"
+ "antialias" "1"
+ "outline" "1"
+ }
+ }
+ "Size:12 | Outline:ON"
+ {
+ "1"
+ {
+ "name" "TF2Crosshairs"
+ "tall" "12"
+ "weight" "0"
+ "antialias" "1"
+ "outline" "1"
+ }
+ }
+ "Size:13 | Outline:ON"
+ {
+ "1"
+ {
+ "name" "TF2Crosshairs"
+ "tall" "13"
+ "weight" "0"
+ "antialias" "1"
+ "outline" "1"
+ }
+ }
+ "Size:14 | Outline:ON"
+ {
+ "1"
+ {
+ "name" "TF2Crosshairs"
+ "tall" "14"
+ "weight" "0"
+ "antialias" "1"
+ "outline" "1"
+ }
+ }
+ "Size:15 | Outline:ON"
+ {
+ "1"
+ {
+ "name" "TF2Crosshairs"
+ "tall" "15"
+ "weight" "0"
+ "antialias" "1"
+ "outline" "1"
+ }
+ }
+ "Size:16 | Outline:ON"
+ {
+ "1"
+ {
+ "name" "TF2Crosshairs"
+ "tall" "16"
+ "weight" "0"
+ "antialias" "1"
+ "outline" "1"
+ }
+ }
+ "Size:17 | Outline:ON"
+ {
+ "1"
+ {
+ "name" "TF2Crosshairs"
+ "tall" "17"
+ "weight" "0"
+ "antialias" "1"
+ "outline" "1"
+ }
+ }
+ "Size:18 | Outline:ON"
+ {
+ "1"
+ {
+ "name" "TF2Crosshairs"
+ "tall" "18"
+ "weight" "0"
+ "antialias" "1"
+ "outline" "1"
+ }
+ }
+ "Size:19 | Outline:ON"
+ {
+ "1"
+ {
+ "name" "TF2Crosshairs"
+ "tall" "19"
+ "weight" "0"
+ "antialias" "1"
+ "outline" "1"
+ }
+ }
+ "Size:20 | Outline:ON"
+ {
+ "1"
+ {
+ "name" "TF2Crosshairs"
+ "tall" "20"
+ "weight" "0"
+ "antialias" "1"
+ "outline" "1"
+ }
+ }
+ "Size:21 | Outline:ON"
+ {
+ "1"
+ {
+ "name" "TF2Crosshairs"
+ "tall" "21"
+ "weight" "0"
+ "antialias" "1"
+ "outline" "1"
+ }
+ }
+ "Size:22 | Outline:ON"
+ {
+ "1"
+ {
+ "name" "TF2Crosshairs"
+ "tall" "22"
+ "weight" "0"
+ "antialias" "1"
+ "outline" "1"
+ }
+ }
+ "Size:23 | Outline:ON"
+ {
+ "1"
+ {
+ "name" "TF2Crosshairs"
+ "tall" "23"
+ "weight" "0"
+ "antialias" "1"
+ "outline" "1"
+ }
+ }
+ "Size:24 | Outline:ON"
+ {
+ "1"
+ {
+ "name" "TF2Crosshairs"
+ "tall" "24"
+ "weight" "0"
+ "antialias" "1"
+ "outline" "1"
+ }
+ }
+ "Size:25 | Outline:ON"
+ {
+ "1"
+ {
+ "name" "TF2Crosshairs"
+ "tall" "25"
+ "weight" "0"
+ "antialias" "1"
+ "outline" "1"
+ }
+ }
+ "Size:26 | Outline:ON"
+ {
+ "1"
+ {
+ "name" "TF2Crosshairs"
+ "tall" "26"
+ "weight" "0"
+ "antialias" "1"
+ "outline" "1"
+ }
+ }
+ "Size:27 | Outline:ON"
+ {
+ "1"
+ {
+ "name" "TF2Crosshairs"
+ "tall" "27"
+ "weight" "0"
+ "antialias" "1"
+ "outline" "1"
+ }
+ }
+ "Size:28 | Outline:ON"
+ {
+ "1"
+ {
+ "name" "TF2Crosshairs"
+ "tall" "28"
+ "weight" "0"
+ "antialias" "1"
+ "outline" "1"
+ }
+ }
+ "Size:29 | Outline:ON"
+ {
+ "1"
+ {
+ "name" "TF2Crosshairs"
+ "tall" "29"
+ "weight" "0"
+ "antialias" "1"
+ "outline" "1"
+ }
+ }
+ "Size:30 | Outline:ON"
+ {
+ "1"
+ {
+ "name" "TF2Crosshairs"
+ "tall" "30"
+ "weight" "0"
+ "antialias" "1"
+ "outline" "1"
+ }
+ }
+ }
+} \ No newline at end of file
diff --git a/resource/scheme/clientscheme_xhairs_shadow.res b/resource/scheme/clientscheme_xhairs_shadow.res
new file mode 100644
index 0000000..ac5f8f2
--- /dev/null
+++ b/resource/scheme/clientscheme_xhairs_shadow.res
@@ -0,0 +1,237 @@
+Scheme
+{
+ Fonts
+ {
+ "Size:10 | Shadow:ON"
+ {
+ "1"
+ {
+ "name" "TF2Crosshairs"
+ "tall" "10"
+ "weight" "0"
+ "antialias" "1"
+ "dropshadow" "1"
+ }
+ }
+ "Size:11 | Shadow:ON"
+ {
+ "1"
+ {
+ "name" "TF2Crosshairs"
+ "tall" "11"
+ "weight" "0"
+ "antialias" "1"
+ "dropshadow" "1"
+ }
+ }
+ "Size:12 | Shadow:ON"
+ {
+ "1"
+ {
+ "name" "TF2Crosshairs"
+ "tall" "12"
+ "weight" "0"
+ "antialias" "1"
+ "dropshadow" "1"
+ }
+ }
+ "Size:13 | Shadow:ON"
+ {
+ "1"
+ {
+ "name" "TF2Crosshairs"
+ "tall" "13"
+ "weight" "0"
+ "antialias" "1"
+ "dropshadow" "1"
+ }
+ }
+ "Size:14 | Shadow:ON"
+ {
+ "1"
+ {
+ "name" "TF2Crosshairs"
+ "tall" "14"
+ "weight" "0"
+ "antialias" "1"
+ "dropshadow" "1"
+ }
+ }
+ "Size:15 | Shadow:ON"
+ {
+ "1"
+ {
+ "name" "TF2Crosshairs"
+ "tall" "15"
+ "weight" "0"
+ "antialias" "1"
+ "dropshadow" "1"
+ }
+ }
+ "Size:16 | Shadow:ON"
+ {
+ "1"
+ {
+ "name" "TF2Crosshairs"
+ "tall" "16"
+ "weight" "0"
+ "antialias" "1"
+ "dropshadow" "1"
+ }
+ }
+ "Size:17 | Shadow:ON"
+ {
+ "1"
+ {
+ "name" "TF2Crosshairs"
+ "tall" "17"
+ "weight" "0"
+ "antialias" "1"
+ "dropshadow" "1"
+ }
+ }
+ "Size:18 | Shadow:ON"
+ {
+ "1"
+ {
+ "name" "TF2Crosshairs"
+ "tall" "18"
+ "weight" "0"
+ "antialias" "1"
+ "dropshadow" "1"
+ }
+ }
+ "Size:19 | Shadow:ON"
+ {
+ "1"
+ {
+ "name" "TF2Crosshairs"
+ "tall" "19"
+ "weight" "0"
+ "antialias" "1"
+ "dropshadow" "1"
+ }
+ }
+ "Size:20 | Shadow:ON"
+ {
+ "1"
+ {
+ "name" "TF2Crosshairs"
+ "tall" "20"
+ "weight" "0"
+ "antialias" "1"
+ "dropshadow" "1"
+ }
+ }
+ "Size:21 | Shadow:ON"
+ {
+ "1"
+ {
+ "name" "TF2Crosshairs"
+ "tall" "21"
+ "weight" "0"
+ "antialias" "1"
+ "dropshadow" "1"
+ }
+ }
+ "Size:22 | Shadow:ON"
+ {
+ "1"
+ {
+ "name" "TF2Crosshairs"
+ "tall" "22"
+ "weight" "0"
+ "antialias" "1"
+ "dropshadow" "1"
+ }
+ }
+ "Size:23 | Shadow:ON"
+ {
+ "1"
+ {
+ "name" "TF2Crosshairs"
+ "tall" "23"
+ "weight" "0"
+ "antialias" "1"
+ "dropshadow" "1"
+ }
+ }
+ "Size:24 | Shadow:ON"
+ {
+ "1"
+ {
+ "name" "TF2Crosshairs"
+ "tall" "24"
+ "weight" "0"
+ "antialias" "1"
+ "dropshadow" "1"
+ }
+ }
+ "Size:25 | Shadow:ON"
+ {
+ "1"
+ {
+ "name" "TF2Crosshairs"
+ "tall" "25"
+ "weight" "0"
+ "antialias" "1"
+ "dropshadow" "1"
+ }
+ }
+ "Size:26 | Shadow:ON"
+ {
+ "1"
+ {
+ "name" "TF2Crosshairs"
+ "tall" "26"
+ "weight" "0"
+ "antialias" "1"
+ "dropshadow" "1"
+ }
+ }
+ "Size:27 | Shadow:ON"
+ {
+ "1"
+ {
+ "name" "TF2Crosshairs"
+ "tall" "27"
+ "weight" "0"
+ "antialias" "1"
+ "dropshadow" "1"
+ }
+ }
+ "Size:28 | Shadow:ON"
+ {
+ "1"
+ {
+ "name" "TF2Crosshairs"
+ "tall" "28"
+ "weight" "0"
+ "antialias" "1"
+ "dropshadow" "1"
+ }
+ }
+ "Size:29 | Shadow:ON"
+ {
+ "1"
+ {
+ "name" "TF2Crosshairs"
+ "tall" "29"
+ "weight" "0"
+ "antialias" "1"
+ "dropshadow" "1"
+ }
+ }
+ "Size:30 | Shadow:ON"
+ {
+ "1"
+ {
+ "name" "TF2Crosshairs"
+ "tall" "30"
+ "weight" "0"
+ "antialias" "1"
+ "dropshadow" "1"
+ }
+ }
+ }
+} \ No newline at end of file
diff --git a/resource/sourcescheme.res b/resource/sourcescheme.res
index 027f646..4e471b9 100644
--- a/resource/sourcescheme.res
+++ b/resource/sourcescheme.res
@@ -2,17 +2,28 @@
Scheme
{
+ //////////////////////// COLORS ///////////////////////////
+ // color details
+ // this is a list of all the colors used by the scheme
Colors
{
// HUD COLORS
//---------------------------------------------
"HudBlack" "0 0 0 200"
- "Cyan" "15 255 255 255"
+ "Blue" "72 112 125 255"
+ "DarkBlue" "46 73 82 255"
+ "Red" "158 64 61 255"
+ "DarkRed" "102 48 46 255"
+ "Green" "92 122 90 255"
+ "DarkGreen" "38 53 36 255"
"Yellow" "169 123 53 255"
+ "BrightYellow" "218 165 32 255"
"White" "242 242 242 255"
- "DullWhite" "142 142 142 255"
+ "DullWhite" "132 132 132 255"
+ "Grey" "51 47 46 255"
"DarkGrey" "27 27 27 255"
- "Black" "15 15 15 255"
+ "DarkerGrey" "22 22 22 255"
+ "Black" "17 17 17 255"
// BASE COLORS
//---------------------------------------------
@@ -109,14 +120,14 @@ Scheme
ListPanel.SelectedOutOfFocusBgColor "DullWhite"
MainMenu.TextColor "DullWhite"
- MainMenu.ArmedTextColor "Cyan"
+ MainMenu.ArmedTextColor "White"
MainMenu.Inset "32"
Menu.TextInset "6"
Menu.FgColor "White"
Menu.BgColor "HudBlack"
- Menu.ArmedFgColor "Cyan"
- Menu.ArmedBgColor "Cyan"
+ Menu.ArmedFgColor "Black"
+ Menu.ArmedBgColor "White"
Menu.DividerColor "Border.Dark"
ScrollBarButton.FgColor "White"
@@ -137,7 +148,7 @@ Scheme
TextEntry.TextColor "White"
TextEntry.DisabledTextColor "DullWhite"
- TextEntry.SelectedBgColor "Cyan"
+ TextEntry.SelectedBgColor "White"
}
Fonts
diff --git a/resource/ui/basechat.res b/resource/ui/basechat.res
index 012d8ca..092fffb 100644
--- a/resource/ui/basechat.res
+++ b/resource/ui/basechat.res
@@ -6,7 +6,7 @@
"fieldName" "HudChat"
"visible" "1"
"enabled" "1"
- "xpos" "1"
+ "xpos" "5"
"ypos" "25"
"wide" "210"
"tall" "100"
@@ -21,7 +21,7 @@
"enabled" "1"
"xpos" "10"
"ypos" "395"
- "wide" "190"
+ "wide" "160"
"tall" "0"
"PaintBackgroundType" "0"
}
@@ -30,13 +30,13 @@
{
"ControlName" "Button"
"fieldName" "ChatFiltersButton"
- "xpos" "202"
- "ypos" "0"
+ "xpos" "173"
+ "ypos" "87"
"wide" "33"
"tall" "8"
"autoResize" "1"
"pinCorner" "0"
- "visible" "0"
+ "visible" "1"
"enabled" "1"
"tabPosition" "0"
"labelText" "#chat_filterbutton"
diff --git a/resource/ui/build_menu/base_active.res b/resource/ui/build_menu/base_active.res
index 205411a..ee30937 100644
--- a/resource/ui/build_menu/base_active.res
+++ b/resource/ui/build_menu/base_active.res
@@ -4,9 +4,9 @@
{
"ControlName" "CExLabel"
"fieldName" "ItemNameLabel"
- "font" "CerbeticaBold12"
+ "font" "HudFontSmall"
"xpos" "0"
- "ypos" "10"
+ "ypos" "4"
"zpos" "1"
"wide" "100"
"tall" "15"
@@ -41,7 +41,7 @@
"ControlName" "CIconPanel"
"fieldName" "BuildingIcon"
"xpos" "22"
- "ypos" "43"
+ "ypos" "35"
"zpos" "2"
"wide" "56"
"tall" "56"
@@ -57,7 +57,7 @@
"ControlName" "CIconPanel"
"fieldName" "MetalIcon"
"xpos" "34"
- "ypos" "26"
+ "ypos" "22"
"zpos" "1"
"wide" "10"
"tall" "10"
@@ -72,13 +72,13 @@
{
"ControlName" "CExLabel"
"fieldName" "CostLabel"
- "font" "CerbeticaBold16"
+ "font" "HudFontSmall"
"fgcolor" "TanLight"
"xpos" "50"
- "ypos" "25"
- "zpos" "1"
+ "ypos" "22"
+ "zpos" "4"
"wide" "50"
- "tall" "13"
+ "tall" "10"
"autoResize" "0"
"pinCorner" "0"
"visible" "1"
@@ -91,17 +91,17 @@
{
"ControlName" "CExLabel"
"fieldName" "CostLabelShadow"
- "font" "CerbeticaBold16"
+ "font" "HudFontSmall"
"fgcolor" "TransparentBlack"
"xpos" "-2"
"ypos" "-2"
- "zpos" "0"
+ "zpos" "3"
"wide" "50"
- "tall" "13"
+ "tall" "10"
"autoResize" "0"
"pinCorner" "0"
- "visible" "1"
- "enabled" "1"
+ "visible" "0"
+ "enabled" "0"
"labelText" "%metal%"
"textAlignment" "Left"
@@ -134,10 +134,10 @@
"ControlName" "CIconPanel"
"fieldName" "NumberBg"
"xpos" "41"
- "ypos" "106"
+ "ypos" "99"
"zpos" "0"
- "wide" "18"
- "tall" "18"
+ "wide" "0"
+ "tall" "0"
"visible" "0"
"enabled" "0"
"scaleImage" "1"
@@ -149,10 +149,10 @@
{
"ControlName" "CExLabel"
"fieldName" "NumberLabel"
- "font" "CerbeticaBold20"
+ "font" "HudFontMediumSecondary"
"fgcolor" "TanLight"
"xpos" "0"
- "ypos" "105"
+ "ypos" "95"
"zpos" "1"
"wide" "100"
"tall" "20"
diff --git a/resource/ui/build_menu/base_active_teleport_target.res b/resource/ui/build_menu/base_active_teleport_target.res
index 2c3f17b..89fe1b8 100644
--- a/resource/ui/build_menu/base_active_teleport_target.res
+++ b/resource/ui/build_menu/base_active_teleport_target.res
@@ -4,9 +4,9 @@
{
"ControlName" "CExLabel"
"fieldName" "ItemNameLabel"
- "font" "CerbeticaBold16"
+ "font" "HudFontSmall"
"xpos" "0"
- "ypos" "10"
+ "ypos" "4"
"zpos" "1"
"wide" "100"
"tall" "15"
@@ -41,7 +41,7 @@
"ControlName" "CIconPanel"
"fieldName" "BuildingIcon"
"xpos" "22"
- "ypos" "43"
+ "ypos" "35"
"zpos" "2"
"wide" "56"
"tall" "56"
@@ -76,10 +76,10 @@
"ControlName" "CIconPanel"
"fieldName" "NumberBg"
"xpos" "41"
- "ypos" "106"
+ "ypos" "99"
"zpos" "0"
- "wide" "18"
- "tall" "18"
+ "wide" "0"
+ "tall" "0"
"visible" "0"
"enabled" "0"
"scaleImage" "1"
@@ -91,10 +91,10 @@
{
"ControlName" "CExLabel"
"fieldName" "NumberLabel"
- "font" "CerbeticaBold20"
+ "font" "HudFontMediumSecondary"
"fgcolor" "TanLight"
"xpos" "0"
- "ypos" "105"
+ "ypos" "95"
"zpos" "1"
"wide" "100"
"tall" "20"
diff --git a/resource/ui/build_menu/base_already_built.res b/resource/ui/build_menu/base_already_built.res
index 940f5c2..b614adb 100644
--- a/resource/ui/build_menu/base_already_built.res
+++ b/resource/ui/build_menu/base_already_built.res
@@ -4,9 +4,9 @@
{
"ControlName" "CExLabel"
"fieldName" "ItemNameLabel"
- "font" "CerbeticaBold12"
+ "font" "HudFontSmall"
"xpos" "0"
- "ypos" "10"
+ "ypos" "4"
"zpos" "1"
"wide" "100"
"tall" "15"
@@ -18,6 +18,7 @@
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
+ "fgcolor" "ColorRed"
}
"ItemBackground"
@@ -32,15 +33,15 @@
"visible" "0"
"enabled" "0"
"scaleImage" "1"
- "icon" "hud_menu_item_bg"
- "iconColor" "Black"
+ "icon" "hud_menu_item_bg_outline"
+ "iconColor" "ProgressOffWhiteTransparent"
}
"CantBuildReason"
{
"ControlName" "CExLabel"
"fieldName" "CantBuildReason"
- "font" "CerbeticaBold16"
+ "font" "HudFontSmall"
"xpos" "0"
"ypos" "60"
"zpos" "2"
@@ -54,6 +55,7 @@
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
+ "fgcolor" "ColorRed"
}
"MetalIcon"
@@ -61,7 +63,7 @@
"ControlName" "CIconPanel"
"fieldName" "MetalIcon"
"xpos" "34"
- "ypos" "26"
+ "ypos" "20"
"zpos" "1"
"wide" "10"
"tall" "10"
@@ -69,49 +71,26 @@
"enabled" "1"
"scaleImage" "1"
"icon" "ico_metal"
- "iconColor" "TanLight"
+ "iconColor" "ColorRed"
}
"CostLabel"
{
"ControlName" "CExLabel"
"fieldName" "CostLabel"
- "font" "CerbeticaBold16"
- "fgcolor" "TanLight"
+ "font" "HudFontSmall"
+ "fgcolor" "ColorRed"
"xpos" "50"
- "ypos" "25"
- "zpos" "1"
- "wide" "50"
- "tall" "13"
- "autoResize" "0"
- "pinCorner" "0"
- "visible" "1"
- "enabled" "1"
- "labelText" "%metal%"
- "textAlignment" "Left"
- }
-
- "CostLabelShadow"
- {
- "ControlName" "CExLabel"
- "fieldName" "CostLabelShadow"
- "font" "CerbeticaBold16"
- "fgcolor" "TransparentBlack"
- "xpos" "-2"
- "ypos" "-2"
- "zpos" "0"
+ "ypos" "20"
+ "zpos" "4"
"wide" "50"
- "tall" "13"
+ "tall" "10"
"autoResize" "0"
"pinCorner" "0"
"visible" "1"
"enabled" "1"
"labelText" "%metal%"
"textAlignment" "Left"
-
- "pin_to_sibling" "CostLabel"
- "pin_corner_to_sibling" "PIN_TOPLEFT"
- "pin_to_sibling_corner" "PIN_TOPLEFT"
}
"NumberBg"
@@ -119,10 +98,10 @@
"ControlName" "CIconPanel"
"fieldName" "NumberBg"
"xpos" "41"
- "ypos" "106"
+ "ypos" "99"
"zpos" "0"
- "wide" "18"
- "tall" "18"
+ "wide" "0"
+ "tall" "0"
"visible" "0"
"enabled" "0"
"scaleImage" "1"
@@ -134,10 +113,10 @@
{
"ControlName" "CExLabel"
"fieldName" "NumberLabel"
- "font" "CerbeticaBold20"
- "fgcolor" "TanLight"
+ "font" "HudFontMediumSecondary"
+ "fgcolor" "ColorRed"
"xpos" "0"
- "ypos" "105"
+ "ypos" "95"
"zpos" "1"
"wide" "100"
"tall" "20"
diff --git a/resource/ui/build_menu/base_cant_afford.res b/resource/ui/build_menu/base_cant_afford.res
index 53f3b10..c8a3bb0 100644
--- a/resource/ui/build_menu/base_cant_afford.res
+++ b/resource/ui/build_menu/base_cant_afford.res
@@ -4,9 +4,9 @@
{
"ControlName" "CExLabel"
"fieldName" "ItemNameLabel"
- "font" "CerbeticaBold12"
+ "font" "HudFontSmall"
"xpos" "0"
- "ypos" "10"
+ "ypos" "4"
"zpos" "1"
"wide" "100"
"tall" "15"
@@ -33,43 +33,43 @@
"visible" "0"
"enabled" "0"
"scaleImage" "1"
- "icon" "hud_menu_item_bg"
- "iconColor" "Black"
+ "icon" "hud_menu_item_bg_outline"
+ "iconColor" "TransparentBlack"
}
"BuildingIcon"
{
"ControlName" "CIconPanel"
"fieldName" "BuildingIcon"
- "xpos" "9999"
- "ypos" "9999"
+ "xpos" "22"
+ "ypos" "35"
"zpos" "2"
"wide" "56"
"tall" "56"
- "visible" "1"
- "enabled" "1"
+ "visible" "0"
+ "enabled" "0"
"scaleImage" "1"
"icon" "hud_menu_sentry_build"
- "iconColor" "White"
+ "iconColor" "ColorRed"
}
"CantBuildReason"
{
"ControlName" "CExLabel"
"fieldName" "CantBuildReason"
- "font" "CerbeticaBold16"
+ "font" "HudFontSmall"
+ "fgcolor" "ColorRed"
"xpos" "0"
"ypos" "60"
"zpos" "2"
"wide" "100"
- "tall" "18"
+ "tall" "25"
"autoResize" "0"
"pinCorner" "0"
"visible" "1"
"enabled" "1"
- "labelText" "Metal Required"
+ "labelText" "#Hud_Menu_Build_Cant_Afford"
"textAlignment" "center"
- "fgcolor" "ColorRed"
}
"MetalIcon"
@@ -77,7 +77,7 @@
"ControlName" "CIconPanel"
"fieldName" "MetalIcon"
"xpos" "34"
- "ypos" "26"
+ "ypos" "20"
"zpos" "1"
"wide" "10"
"tall" "10"
@@ -92,33 +92,32 @@
{
"ControlName" "CExLabel"
"fieldName" "CostLabel"
- "font" "CerbeticaBold16"
- "fgcolor" "TanLight"
+ "font" "HudFontSmall"
+ "fgcolor" "ColorRed"
"xpos" "50"
- "ypos" "25"
- "zpos" "1"
+ "ypos" "20"
+ "zpos" "4"
"wide" "50"
- "tall" "13"
+ "tall" "10"
"autoResize" "0"
"pinCorner" "0"
"visible" "1"
"enabled" "1"
"labelText" "%metal%"
"textAlignment" "Left"
- "fgcolor_override" "ColorRed"
}
"CostLabelShadow"
{
"ControlName" "CExLabel"
"fieldName" "CostLabelShadow"
- "font" "CerbeticaBold16"
+ "font" "HudFontSmall"
"fgcolor" "TransparentBlack"
- "xpos" "-2"
- "ypos" "-2"
+ "xpos" "-1"
+ "ypos" "-1"
"zpos" "0"
"wide" "50"
- "tall" "13"
+ "tall" "10"
"autoResize" "0"
"pinCorner" "0"
"visible" "1"
@@ -136,7 +135,7 @@
"ControlName" "CExLabel"
"fieldName" "ModeLabel"
"font" "DefaultSmall"
- "fgcolor" "TanDarker"
+ "fgcolor" "TanDark"
"xpos" "33"
"ypos" "17"
"zpos" "1"
@@ -155,10 +154,10 @@
"ControlName" "CIconPanel"
"fieldName" "NumberBg"
"xpos" "41"
- "ypos" "106"
+ "ypos" "99"
"zpos" "0"
- "wide" "18"
- "tall" "18"
+ "wide" "0"
+ "tall" "0"
"visible" "0"
"enabled" "0"
"scaleImage" "1"
@@ -170,10 +169,10 @@
{
"ControlName" "CExLabel"
"fieldName" "NumberLabel"
- "font" "CerbeticaBold20"
+ "font" "HudFontMediumSecondary"
"fgcolor" "ColorRed"
"xpos" "0"
- "ypos" "105"
+ "ypos" "95"
"zpos" "1"
"wide" "100"
"tall" "20"
diff --git a/resource/ui/build_menu/base_unavailable.res b/resource/ui/build_menu/base_unavailable.res
new file mode 100644
index 0000000..fee2503
--- /dev/null
+++ b/resource/ui/build_menu/base_unavailable.res
@@ -0,0 +1,188 @@
+"Resource/UI/build_menu/base_unavailable.res"
+{
+ "ItemNameLabel"
+ {
+ "ControlName" "CExLabel"
+ "fieldName" "ItemNameLabel"
+ "font" "HudFontSmall"
+ "xpos" "0"
+ "ypos" "4"
+ "zpos" "1"
+ "wide" "100"
+ "tall" "15"
+ "autoResize" "0"
+ "pinCorner" "0"
+ "visible" "1"
+ "enabled" "1"
+ "labelText" "#TF_Object_Sentry"
+ "textAlignment" "center"
+ "dulltext" "0"
+ "brighttext" "0"
+ "fgcolor" "ColorRed"
+ }
+
+ "ItemBackground"
+ {
+ "ControlName" "CIconPanel"
+ "fieldName" "ItemBackground"
+ "xpos" "4"
+ "ypos" "14"
+ "zpos" "0"
+ "wide" "98"
+ "tall" "105"
+ "visible" "0"
+ "enabled" "0"
+ "scaleImage" "1"
+ "icon" "hud_menu_item_bg_outline"
+ "iconColor" "TransparentBlack"
+ }
+
+ "BuildingIcon"
+ {
+ "ControlName" "CIconPanel"
+ "fieldName" "BuildingIcon"
+ "xpos" "22"
+ "ypos" "35"
+ "zpos" "2"
+ "wide" "56"
+ "tall" "56"
+ "visible" "0"
+ "enabled" "0"
+ "scaleImage" "1"
+ "icon" "hud_menu_sentry_build"
+ "iconColor" "ColorRed"
+ }
+
+ "CantBuildReason"
+ {
+ "ControlName" "CExLabel"
+ "fieldName" "CantBuildReason"
+ "font" "HudFontSmall"
+ "fgcolor" "ColorRed"
+ "xpos" "0"
+ "ypos" "60"
+ "zpos" "2"
+ "wide" "100"
+ "tall" "18"
+ "autoResize" "0"
+ "pinCorner" "0"
+ "visible" "1"
+ "enabled" "1"
+ "labelText" "#Hud_Menu_Build_Unavailable"
+ "textAlignment" "center"
+ }
+
+ "MetalIcon"
+ {
+ "ControlName" "CIconPanel"
+ "fieldName" "MetalIcon"
+ "xpos" "34"
+ "ypos" "20"
+ "zpos" "1"
+ "wide" "10"
+ "tall" "10"
+ "visible" "1"
+ "enabled" "1"
+ "scaleImage" "1"
+ "icon" "ico_metal"
+ "iconColor" "ColorRed"
+ }
+
+ "CostLabel"
+ {
+ "ControlName" "CExLabel"
+ "fieldName" "CostLabel"
+ "font" "HudFontSmall"
+ "fgcolor" "ColorRed"
+ "xpos" "50"
+ "ypos" "20"
+ "zpos" "4"
+ "wide" "50"
+ "tall" "10"
+ "autoResize" "0"
+ "pinCorner" "0"
+ "visible" "1"
+ "enabled" "1"
+ "labelText" "%metal%"
+ "textAlignment" "Left"
+ }
+
+ "CostLabelShadow"
+ {
+ "ControlName" "CExLabel"
+ "fieldName" "CostLabelShadow"
+ "font" "HudFontSmall"
+ "fgcolor" "TransparentBlack"
+ "xpos" "-1"
+ "ypos" "-1"
+ "zpos" "0"
+ "wide" "50"
+ "tall" "10"
+ "autoResize" "0"
+ "pinCorner" "0"
+ "visible" "1"
+ "enabled" "1"
+ "labelText" "%metal%"
+ "textAlignment" "Left"
+
+ "pin_to_sibling" "CostLabel"
+ "pin_corner_to_sibling" "PIN_TOPLEFT"
+ "pin_to_sibling_corner" "PIN_TOPLEFT"
+ }
+
+ "ModeLabel"
+ {
+ "ControlName" "CExLabel"
+ "fieldName" "ModeLabel"
+ "font" "DefaultSmall"
+ "fgcolor" "TanDark"
+ "xpos" "33"
+ "ypos" "17"
+ "zpos" "1"
+ "wide" "44"
+ "tall" "13"
+ "autoResize" "0"
+ "pinCorner" "0"
+ "visible" "1"
+ "enabled" "1"
+ "labelText" ""
+ "textAlignment" "East"
+ }
+
+ "NumberBg"
+ {
+ "ControlName" "CIconPanel"
+ "fieldName" "NumberBg"
+ "xpos" "41"
+ "ypos" "99"
+ "zpos" "0"
+ "wide" "0"
+ "tall" "0"
+ "visible" "0"
+ "enabled" "0"
+ "scaleImage" "1"
+ "icon" "ico_key_blank"
+ "iconColor" "White"
+ }
+
+ "NumberLabel"
+ {
+ "ControlName" "CExLabel"
+ "fieldName" "NumberLabel"
+ "font" "HudFontMediumSecondary"
+ "fgcolor" "ColorRed"
+ "xpos" "0"
+ "ypos" "95"
+ "zpos" "1"
+ "wide" "100"
+ "tall" "20"
+ "autoResize" "0"
+ "pinCorner" "0"
+ "visible" "1"
+ "enabled" "1"
+ "labelText" "1"
+ "textAlignment" "center"
+ "dulltext" "1"
+ "brighttext" "0"
+ }
+} \ No newline at end of file
diff --git a/resource/ui/build_menu/base_unavailable_teleport_target.res b/resource/ui/build_menu/base_unavailable_teleport_target.res
index 25e2561..e4f521c 100644
--- a/resource/ui/build_menu/base_unavailable_teleport_target.res
+++ b/resource/ui/build_menu/base_unavailable_teleport_target.res
@@ -4,9 +4,9 @@
{
"ControlName" "CExLabel"
"fieldName" "ItemNameLabel"
- "font" "CerbeticaBold16"
+ "font" "HudFontSmall"
"xpos" "0"
- "ypos" "10"
+ "ypos" "4"
"zpos" "1"
"wide" "100"
"tall" "15"
@@ -34,14 +34,14 @@
"enabled" "0"
"scaleImage" "1"
"icon" "hud_menu_item_bg"
- "iconColor" "Black"
+ "iconColor" "ProgressOffWhite"
}
"CantBuildReason"
{
"ControlName" "CExLabel"
"fieldName" "CantBuildReason"
- "font" "CerbeticaBold16"
+ "font" "HudFontSmall"
"xpos" "0"
"ypos" "60"
"zpos" "2"
@@ -63,7 +63,7 @@
"ControlName" "CExLabel"
"fieldName" "ModeLabel"
"font" "DefaultSmall"
- "fgcolor" "TanDarker"
+ "fgcolor" "TanDark"
"xpos" "33"
"ypos" "17"
"zpos" "1"
@@ -82,7 +82,7 @@
"ControlName" "CIconPanel"
"fieldName" "NumberBg"
"xpos" "41"
- "ypos" "106"
+ "ypos" "99"
"zpos" "0"
"wide" "18"
"tall" "18"
@@ -97,10 +97,10 @@
{
"ControlName" "CExLabel"
"fieldName" "NumberLabel"
- "font" "CerbeticaBold20"
+ "font" "HudFontMediumSecondary"
"fgcolor" "ColorRed"
"xpos" "0"
- "ypos" "105"
+ "ypos" "95"
"zpos" "1"
"wide" "100"
"tall" "20"
diff --git a/resource/ui/build_menu/hudmenuengybuild.res b/resource/ui/build_menu/hudmenuengybuild.res
index 38dbce9..92f1bae 100644
--- a/resource/ui/build_menu/hudmenuengybuild.res
+++ b/resource/ui/build_menu/hudmenuengybuild.res
@@ -8,7 +8,7 @@
"ypos" "20"
"zpos" "0"
"wide" "400"
- "tall" "130"
+ "tall" "120"
"visible" "1"
"enabled" "1"
"paintbackground" "0"
@@ -33,7 +33,7 @@
{
"ControlName" "CExLabel"
"fieldName" "TitleLabel"
- "font" "CerbeticaBold32"
+ "font" "Cerbetica28"
"xpos" "20"
"ypos" "0"
"zpos" "2"
@@ -44,7 +44,7 @@
"visible" "1"
"enabled" "1"
"labelText" "#Hud_menu_build_title"
- "textAlignment" "Left"
+ "textAlignment" "west"
"dulltext" "0"
"brighttext" "0"
}
@@ -53,7 +53,7 @@
{
"ControlName" "CExLabel"
"fieldName" "TitleLabelDropshadow"
- "font" "CerbeticaBold32"
+ "font" "Cerbetica28"
"fgcolor" "TransparentBlack"
"xpos" "-2"
"ypos" "-2"
@@ -65,7 +65,7 @@
"visible" "1"
"enabled" "1"
"labelText" "#Hud_menu_build_title"
- "textAlignment" "Left"
+ "textAlignment" "west"
"dulltext" "1"
"brighttext" "0"
@@ -294,7 +294,7 @@
"ypos" "20"
"zpos" "1"
"wide" "400"
- "tall" "130"
+ "tall" "120"
"visible" "1"
"enabled" "1"
"bgcolor_override" "TransparentBlack"
diff --git a/resource/ui/build_menu/hudmenueurekaeffect.res b/resource/ui/build_menu/hudmenueurekaeffect.res
index 75672c2..6b4bd86 100644
--- a/resource/ui/build_menu/hudmenueurekaeffect.res
+++ b/resource/ui/build_menu/hudmenueurekaeffect.res
@@ -2,16 +2,17 @@
{
"MainBackground"
{
- "ControlName" "EditablePanel"
+ "ControlName" "CIconPanel"
"fieldName" "MainBackground"
"xpos" "0"
- "ypos" "20"
+ "ypos" "10"
"zpos" "0"
- "wide" "200"
- "tall" "130"
- "visible" "1"
- "enabled" "1"
- "paintbackground" "0"
+ "wide" "250"
+ "tall" "170"
+ "visible" "0"
+ "enabled" "0"
+ "scaleImage" "1"
+ "paintbackground" "0"
}
"BuildIcon"
@@ -27,13 +28,14 @@
"enabled" "0"
"scaleImage" "1"
"icon" "ico_build"
+ "iconColor" "White"
}
"TitleLabel"
{
"ControlName" "CExLabel"
"fieldName" "TitleLabel"
- "font" "CerbeticaBold32"
+ "font" "Cerbetica28"
"xpos" "10"
"ypos" "0"
"zpos" "2"
@@ -44,7 +46,7 @@
"visible" "1"
"enabled" "1"
"labelText" "#Hud_Menu_Teleport_Title"
- "textAlignment" "Left"
+ "textAlignment" "west"
"dulltext" "0"
"brighttext" "0"
}
@@ -53,7 +55,7 @@
{
"ControlName" "CExLabel"
"fieldName" "TitleLabelDropshadow"
- "font" "CerbeticaBold32"
+ "font" "Cerbetica28"
"fgcolor" "TransparentBlack"
"xpos" "-2"
"ypos" "-2"
@@ -65,7 +67,7 @@
"visible" "1"
"enabled" "1"
"labelText" "#Hud_Menu_Teleport_Title"
- "textAlignment" "Left"
+ "textAlignment" "west"
"dulltext" "1"
"brighttext" "0"
@@ -150,7 +152,7 @@
"ypos" "20"
"zpos" "1"
"wide" "200"
- "tall" "130"
+ "tall" "120"
"visible" "1"
"enabled" "1"
"bgcolor_override" "TransparentBlack"
diff --git a/resource/ui/build_menu/pipboy/base_already_built.res b/resource/ui/build_menu/pipboy/base_already_built.res
index de3b921..be1a9ac 100644
--- a/resource/ui/build_menu/pipboy/base_already_built.res
+++ b/resource/ui/build_menu/pipboy/base_already_built.res
@@ -2,28 +2,5 @@
"Resource/UI/build_menu/base_already_built.res"
{
- "ItemNameLabel"
- {
- "fgcolor" "ColorGreen"
- }
- "MetalIcon"
- {
- "iconColor" "ColorGreen"
- }
-
- "CostLabel"
- {
- "fgcolor_override" "ColorGreen"
- }
-
- "CantBuildReason"
- {
- "fgcolor" "ColorGreen"
- }
-
- "NumberLabel"
- {
- "fgcolor" "ColorGreen"
- }
} \ No newline at end of file
diff --git a/resource/ui/build_menu/pipboy/base_cant_afford.res b/resource/ui/build_menu/pipboy/base_cant_afford.res
index 94da73b..4ada1f3 100644
--- a/resource/ui/build_menu/pipboy/base_cant_afford.res
+++ b/resource/ui/build_menu/pipboy/base_cant_afford.res
@@ -2,4 +2,5 @@
"Resource/UI/build_menu/base_cant_afford.res"
{
+
} \ No newline at end of file
diff --git a/resource/ui/build_menu/pipboy/base_unavailable.res b/resource/ui/build_menu/pipboy/base_unavailable.res
index 3dfce46..c057534 100644
--- a/resource/ui/build_menu/pipboy/base_unavailable.res
+++ b/resource/ui/build_menu/pipboy/base_unavailable.res
@@ -2,5 +2,4 @@
"Resource/UI/build_menu/base_unavailable.res"
{
-
} \ No newline at end of file
diff --git a/resource/ui/build_menu/pipboy/hudmenuengybuild.res b/resource/ui/build_menu/pipboy/hudmenuengybuild.res
index 0f900f9..b7bef78 100644
--- a/resource/ui/build_menu/pipboy/hudmenuengybuild.res
+++ b/resource/ui/build_menu/pipboy/hudmenuengybuild.res
@@ -10,7 +10,7 @@
"ypos" "20"
"zpos" "0"
"wide" "400"
- "tall" "130"
+ "tall" "120"
"visible" "1"
"enabled" "1"
"scaleImage" "1"
diff --git a/resource/ui/build_menu/pipboy/hudmenueurekaeffect.res b/resource/ui/build_menu/pipboy/hudmenueurekaeffect.res
index 97384ef..f8e9d1e 100644
--- a/resource/ui/build_menu/pipboy/hudmenueurekaeffect.res
+++ b/resource/ui/build_menu/pipboy/hudmenueurekaeffect.res
@@ -8,9 +8,9 @@
"fieldName" "ItemBackground"
"xpos" "0"
"ypos" "20"
- "zpos" "0"
+ "zpos" "-2"
"wide" "200"
- "tall" "130"
+ "tall" "120"
"visible" "1"
"enabled" "1"
"scaleImage" "1"
diff --git a/resource/ui/charinfoarmorysubpanel.res b/resource/ui/charinfoarmorysubpanel.res
index d3e5a30..14021bf 100644
--- a/resource/ui/charinfoarmorysubpanel.res
+++ b/resource/ui/charinfoarmorysubpanel.res
@@ -66,7 +66,7 @@
{
"ControlName" "Label"
"fieldName" "ArmoryLabel"
- "font" "HudFontMediumSmallBold"
+ "font" "HudFontMedium"
"labelText" "#Armory"
"textAlignment" "west"
"xpos" "c-300"
@@ -84,7 +84,7 @@
{
"ControlName" "CExLabel"
"fieldName" "FiltersLabel"
- "font" "HudFontSmallestBold"
+ "font" "HudFontSmall"
"labelText" "#Store_FilterLabel"
"textAlignment" "west"
"xpos" "c-300"
@@ -94,16 +94,16 @@
"tall" "20"
"autoResize" "1"
"pinCorner" "0"
- "visible" "0"
- "enabled" "0"
+ "visible" "1"
+ "enabled" "1"
}
"FilterComboBox"
{
"ControlName" "ComboBox"
"fieldName" "FilterComboBox"
- "font" "HudFontSmallestBold"
- "xpos" "c-300"
+ "font" "HudFontSmall"
+ "xpos" "c-260"
"ypos" "32"
"zpos" "1"
"wide" "150"
@@ -146,7 +146,7 @@
{
"ControlName" "CEconItemDetailsRichText"
"fieldName" "Data_TextRichText"
- "font" "Cerbetica12"
+ "font" "HudFontSmallest"
"labelText" "%datatext%"
"textAlignment" "north-west"
"xpos" "10"
@@ -186,7 +186,7 @@
"paintborder" "0"
"model_hide" "1"
"text_center" "1"
- "resize_to_text" "1"
+ "resize_to_text" "0"
"itemmodelpanel"
{
@@ -266,7 +266,7 @@
{
"ControlName" "CExButton"
"fieldName" "PrevPageButton"
- "xpos" "c-106"
+ "xpos" "c-300"
"ypos" "290"
"zpos" "5"
"wide" "20"
@@ -290,13 +290,13 @@
{
"ControlName" "CExLabel"
"fieldName" "CurPageLabel"
- "font" "HudFontSmallBold"
+ "font" "HudFontSmall"
"labelText" "%thumbnailpage%"
"textAlignment" "center"
- "xpos" "c-80"
+ "xpos" "c-278"
"ypos" "290"
"zpos" "5"
- "wide" "60"
+ "wide" "45"
"tall" "20"
"autoResize" "1"
"pinCorner" "0"
@@ -309,7 +309,7 @@
{
"ControlName" "CExButton"
"fieldName" "NextPageButton"
- "xpos" "c-15"
+ "xpos" "c-233"
"ypos" "290"
"zpos" "5"
"wide" "20"
@@ -344,7 +344,7 @@
"enabled" "1"
"tabPosition" "0"
"labelText" "#ArmoryButton_Wiki"
- "font" "HudFontSmallestBold"
+ "font" "HudFontSmall"
"textAlignment" "center"
"textinsetx" "50"
"dulltext" "0"
@@ -369,7 +369,7 @@
"enabled" "1"
"tabPosition" "0"
"labelText" "#ArmoryButton_SetDetails"
- "font" "HudFontSmallestBold"
+ "font" "HudFontSmall"
"textAlignment" "center"
"textinsetx" "50"
"dulltext" "0"
@@ -383,10 +383,10 @@
{
"ControlName" "CExButton"
"fieldName" "StoreButton"
- "xpos" "c-298"
+ "xpos" "c-197"
"ypos" "290"
"zpos" "20"
- "wide" "100"
+ "wide" "200"
"tall" "20"
"autoResize" "0"
"pinCorner" "0"
@@ -394,7 +394,7 @@
"enabled" "1"
"tabPosition" "0"
"labelText" "#ArmoryButton_Store"
- "font" "HudFontSmallestBold"
+ "font" "HudFontSmall"
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
diff --git a/resource/ui/charinfoloadoutsubpanel.res b/resource/ui/charinfoloadoutsubpanel.res
index 72c28f4..77fd6f2 100644
--- a/resource/ui/charinfoloadoutsubpanel.res
+++ b/resource/ui/charinfoloadoutsubpanel.res
@@ -42,7 +42,7 @@
"wide" "60"
"tall" "120"
"autoResize" "0"
- "pinCorner" "2"
+ "pinCorner" "0"
"visible" "1"
"enabled" "1"
"tabPosition" "0"
@@ -70,7 +70,7 @@
"wide" "60"
"tall" "120"
"autoResize" "0"
- "pinCorner" "2"
+ "pinCorner" "0"
"visible" "1"
"enabled" "1"
"tabPosition" "0"
@@ -98,7 +98,7 @@
"wide" "60"
"tall" "120"
"autoResize" "0"
- "pinCorner" "2"
+ "pinCorner" "0"
"visible" "1"
"enabled" "1"
"tabPosition" "0"
@@ -126,7 +126,7 @@
"wide" "60"
"tall" "120"
"autoResize" "0"
- "pinCorner" "2"
+ "pinCorner" "0"
"visible" "1"
"enabled" "1"
"tabPosition" "0"
@@ -154,7 +154,7 @@
"wide" "60"
"tall" "120"
"autoResize" "0"
- "pinCorner" "2"
+ "pinCorner" "0"
"visible" "1"
"enabled" "1"
"tabPosition" "0"
@@ -182,7 +182,7 @@
"wide" "60"
"tall" "120"
"autoResize" "0"
- "pinCorner" "2"
+ "pinCorner" "0"
"visible" "1"
"enabled" "1"
"tabPosition" "0"
@@ -210,7 +210,7 @@
"wide" "60"
"tall" "120"
"autoResize" "0"
- "pinCorner" "2"
+ "pinCorner" "0"
"visible" "1"
"enabled" "1"
"tabPosition" "0"
@@ -238,7 +238,7 @@
"wide" "60"
"tall" "120"
"autoResize" "0"
- "pinCorner" "2"
+ "pinCorner" "0"
"visible" "1"
"enabled" "1"
"tabPosition" "0"
@@ -266,7 +266,7 @@
"wide" "60"
"tall" "120"
"autoResize" "0"
- "pinCorner" "2"
+ "pinCorner" "0"
"visible" "1"
"enabled" "1"
"tabPosition" "0"
@@ -313,7 +313,7 @@
{
"ControlName" "CExLabel"
"fieldName" "ShowBackpackLabel"
- "font" "CerbeticaBold16"
+ "font" "HudFontSmall"
"labelText" "#BackpackTitle"
"textAlignment" "north"
"xpos" "0"
@@ -361,7 +361,7 @@
{
"ControlName" "CExLabel"
"fieldName" "ShowCraftingLabel"
- "font" "CerbeticaBold16"
+ "font" "HudFontSmall"
"labelText" "#CraftingExplanation_Title"
"textAlignment" "north"
"xpos" "0"
@@ -410,7 +410,7 @@
{
"ControlName" "CExLabel"
"fieldName" "ShowArmoryLabel"
- "font" "CerbeticaBold16"
+ "font" "HudFontSmall"
"labelText" "#Armory"
"textAlignment" "north"
"xpos" "0"
@@ -458,7 +458,7 @@
{
"ControlName" "CExLabel"
"fieldName" "ShowTradeLabel"
- "font" "CerbeticaBold16"
+ "font" "HudFontSmall"
"labelText" "#TradingExplanation_Title"
"textAlignment" "north"
"xpos" "0"
@@ -508,7 +508,7 @@
{
"ControlName" "CExLabel"
"fieldName" "ShowPaintkitsLabel"
- "font" "CerbeticaBold16"
+ "font" "HudFontSmall"
"labelText" "#PaintkitTitle"
"textAlignment" "north"
"xpos" "0"
@@ -549,11 +549,11 @@
{
"ControlName" "CExLabel"
"fieldName" "ItemsLabel"
- "font" "HudFontSmall"
+ "font" "HudFontSmallest"
"labelText" "classname"
"textAlignment" "north"
"xpos" "0"
- "ypos" "220"
+ "ypos" "215"
"zpos" "1"
"wide" "300"
"tall" "30"
diff --git a/resource/ui/charinfopanel.res b/resource/ui/charinfopanel.res
index a7df46b..804fc26 100644
--- a/resource/ui/charinfopanel.res
+++ b/resource/ui/charinfopanel.res
@@ -20,7 +20,7 @@
"outoffocus_bgcolor_override" "27 27 27 0"
"title" "#CharInfoAndSetup"
- "title_font" "HudFontSmallBold"
+ "title_font" "HudFontMediumBold"
"titletextinsetX" "40"
"titletextinsetY" "0"
"titlebarfgcolor_override" "HudOffWhite"
@@ -133,8 +133,9 @@
"tabskv"
{
"textinsetx" "25"
- "textAlignment" "center"
- "font" "Cerbetica18"
+ "textinsety" "5"
+ "textAlignment" "north"
+ "font" "HudFontSmall"
"selectedcolor" "TanLight"
"unselectedcolor" "TanDark"
"defaultBgColor_override" "DarkGrey"
@@ -154,14 +155,14 @@
"ypos" "437"
"zpos" "2"
"wide" "100"
- "tall" "25"
+ "tall" "20"
"autoResize" "0"
"pinCorner" "3"
"visible" "1"
"enabled" "1"
"tabPosition" "0"
"labelText" "Back (&Q)"
- "font" "HudFontSmallBold"
+ "font" "HudFontSmall"
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
diff --git a/resource/ui/classloadoutpanel.res b/resource/ui/classloadoutpanel.res
index 72f80f7..88aaf8d 100644
--- a/resource/ui/classloadoutpanel.res
+++ b/resource/ui/classloadoutpanel.res
@@ -84,7 +84,7 @@
"enabled" "1"
"tabPosition" "0"
"labelText" "M"
- "font" "CustomIcons18"
+ "font" "CustomIcons"
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
@@ -92,11 +92,8 @@
"sound_depressed" "UI/buttonclick.wav"
"sound_released" "UI/buttonclickrelease.wav"
"paintbackground" "0"
- "fgcolor" "TanLight"
- "defaultFgColor_override" "TanLight"
- "armedFgColor_override" "TanDark"
- "depressedFgColor_override" "TanDark"
- "selectedFgColor_override" "TanDark"
+ "image_drawcolor" "TanLight"
+ "image_armedcolor" "ColorCyan"
}
}
@@ -104,7 +101,7 @@
{
"ControlName" "CExLabel"
"fieldName" "CaratLabel"
- "font" "Cerbetica16"
+ "font" "HudFontSmallishBold"
"labelText" ">>"
"textAlignment" "west"
"xpos" "c-290"
@@ -222,7 +219,7 @@
"noitem_textcolor" "TextColor"
"PaintBackgroundType" "2"
"paintborder" "1"
- "text_ypos" "0"
+ "text_ypos" "15"
"text_center" "1"
"model_hide" "1"
"resize_to_text" "1"
@@ -232,8 +229,8 @@
{
"font" "ItemFontAttribLarge"
"xpos" "0"
- "ypos" "30"
- "zpos" "101"
+ "ypos" "0"
+ "zpos" "2"
"wide" "140"
"tall" "60"
"autoResize" "0"
@@ -253,7 +250,7 @@
"fieldName" "PassiveAttribsLabel"
"font" "ItemFontAttribLarge"
"xpos" "c-135"
- "ypos" "128"
+ "ypos" "125"
"zpos" "0"
"wide" "270"
"tall" "240"
@@ -299,7 +296,7 @@
"xpos" "0"
"ypos" "0"
"zpos" "100"
- "wide" "140"
+ "wide" "100"
"tall" "75"
"autoResize" "1"
"visible" "0"
@@ -330,7 +327,7 @@
"tabPosition" "0"
"labelText" "R"
"textAlignment" "center"
- "font" "CerbeticaBold28"
+ "font" "Cerbetica28"
"scaleImage" "1"
"command" "sv_cheats 1;r_skin 0"
@@ -339,7 +336,6 @@
"sound_depressed" "UI/buttonclick.wav"
"sound_released" "UI/buttonclickrelease.wav"
-
"keyboardinputenabled" "0"
"paintbackground" "1"
}
@@ -360,7 +356,7 @@
"tabPosition" "0"
"labelText" "B"
"textAlignment" "center"
- "font" "CerbeticaBold28"
+ "font" "Cerbetica28"
"scaleImage" "1"
"command" "sv_cheats 1;r_skin 1"
diff --git a/resource/ui/compstats.res b/resource/ui/compstats.res
index 59b933a..1b18085 100644
--- a/resource/ui/compstats.res
+++ b/resource/ui/compstats.res
@@ -8,7 +8,7 @@
"ypos" "0"
"zpos" "100"
"wide" "260"
- "tall" "330"
+ "tall" "335"
"visible" "1"
"proportionaltoparent" "1"
@@ -16,11 +16,11 @@
{
"ControlName" "CTFLocalPlayerBadgePanel"
"fieldName" "RankImage"
- "xpos" "-8"
- "ypos" "-15"
+ "xpos" "4"
+ "ypos" "-8"
"zpos" "110"
"wide" "o1"
- "tall" "70"
+ "tall" "60"
"visible" "0"
"enabled" "1"
"proportionaltoparent" "1"
@@ -32,17 +32,18 @@
{
"ControlName" "CPvPRankPanel"
"fieldName" "RankPanel"
- "xpos" "35"
- "ypos" "-15"
+ "xpos" "0"
+ "ypos" "-68"
"zpos" "100"
- "wide" "320"
- "tall" "100"
- "visible" "0"
+ "wide" "330"
+ "tall" "102"
+ "visible" "1"
"proportionaltoparent" "1"
"mouseinputenabled" "0"
"matchgroup" "MatchGroup_Ladder_6v6"
"show_model" "0"
"show_name" "0"
+ "show_stats" "1"
"BGBorder"
{
@@ -55,7 +56,7 @@
"ControlName" "CExButton"
"fieldName" "ShowLeaderboardsButton"
"xpos" "rs1-10"
- "ypos" "10"
+ "ypos" "40"
"zpos" "0"
"wide" "p0.45"
"tall" "15"
@@ -64,13 +65,11 @@
"actionsignallevel" "2"
"command" "show_leaderboards"
"labeltext" "#TF_Competitive_ViewLeaderboards"
- "font" "FontBold12"
+ "font" "HudFontSmallest"
"fgcolor_override" "TanLight"
"textAlignment" "center"
"sound_depressed" "UI/buttonclick.wav"
"sound_released" "UI/buttonclickrelease.wav"
- "border_default" "WhiteBorder"
- "border_armed" "WhiteBorder"
}
"ShowMatchHistoryButton"
@@ -78,7 +77,7 @@
"ControlName" "Button"
"fieldName" "ShowMatchHistoryButton"
"xpos" "10"
- "ypos" "10"
+ "ypos" "40"
"zpos" "0"
"wide" "p0.45"
"tall" "15"
@@ -87,13 +86,11 @@
"actionsignallevel" "2"
"command" "show_match_history"
"labeltext" "#TF_Competitive_ViewMatches"
- "font" "FontBold12"
+ "font" "HudFontSmallest"
"fgcolor_override" "TanLight"
"textAlignment" "center"
"sound_depressed" "UI/buttonclick.wav"
"sound_released" "UI/buttonclickrelease.wav"
- "border_default" "WhiteBorder"
- "border_armed" "WhiteBorder"
}
"PlaylistBGPanel"
@@ -101,10 +98,10 @@
"ControlName" "EditablePanel"
"fieldName" "PlaylistBGPanel"
"xpos" "cs-0.5"
- "ypos" "30"
+ "ypos" "60"
"zpos" "-1"
- "wide" "p0.98"
- "tall" "p1-200"
+ "wide" "p0.95"
+ "tall" "p0.98"
"visible" "1"
"PaintBackgroundType" "2"
//"border" "MainMenuBGBorder"
@@ -117,11 +114,11 @@
"ControlName" "EditablePanel"
"fieldName" "PlayListDropShadow"
"xpos" "cs-0.5"
- "ypos" "25"
+ "ypos" "0"
"zpos" "100"
"wide" "p0.95"
- "tall" "p0.89"
- "visible" "0"
+ "tall" "p0.98"
+ "visible" "1"
"PaintBackgroundType" "2"
"border" "InnerShadowBorder"
"proportionaltoparent" "1"
@@ -170,9 +167,9 @@
"font" "MarlettSmall"
"textAlignment" "west"
- "defaultFgColor_override" "TanDark"
+ "defaultFgColor_override" "TanDark"
"armedFgColor_override" "TanDark"
- "selectedFgColor_override" "TanDark"
+ "selectedFgColor_override" "TanDark"
}
"ResultButton"
@@ -195,7 +192,7 @@
"defaultFgColor_override" "TanDark"
"armedFgColor_override" "Orange"
- "selectedFgColor_override" "TanLight"
+ "selectedFgColor_override" "TanLight"
"image_selectedcolor" "White"
"image_armedcolor" "Transparent"
@@ -358,7 +355,7 @@
"xpos" "cs-0.5"
"ypos" "7"
"wide" "p0.95"
- "tall" "p0.89"
+ "tall" "p0.98"
"tall" "f20"
"visible" "0"
"enabled" "1"
diff --git a/resource/ui/controlpointcountdown.res b/resource/ui/controlpointcountdown.res
index 55a1a21..5c01488 100644
--- a/resource/ui/controlpointcountdown.res
+++ b/resource/ui/controlpointcountdown.res
@@ -4,7 +4,7 @@
{
"ControlName" "CExLabel"
"fieldName" "CapCountdownLabel"
- "font" "Cerbetica16"
+ "font" "HudFontSmallishBold"
"xpos" "0"
"ypos" "0"
"zpos" "1"
diff --git a/resource/ui/controlpointicon.res b/resource/ui/controlpointicon.res
index ec16c9e..30bb3d3 100644
--- a/resource/ui/controlpointicon.res
+++ b/resource/ui/controlpointicon.res
@@ -33,7 +33,7 @@
"xpos" "0"
"ypos" "0"
"zpos" "3"
- "wide" "7"
+ "wide" "8"
"tall" "16"
"visible" "0"
"enabled" "1"
@@ -45,9 +45,9 @@
{
"ControlName" "Label"
"fieldName" "CapNumPlayers"
- "font" "Cerbetica14"
+ "font" "HudFontSmallest"
"xpos" "11"
- "ypos" "0"
+ "ypos" "1"
"zpos" "4"
"wide" "16"
"tall" "26"
@@ -92,7 +92,7 @@
"dulltext" "0"
"brighttext" "0"
"wrap" "0"
- "font" "Cerbetica16"
+ "font" "HudFontSmallishBold"
}
"CPTimerBG"
diff --git a/resource/ui/controlpointprogressbar.res b/resource/ui/controlpointprogressbar.res
index e3bba2b..ebe6289 100644
--- a/resource/ui/controlpointprogressbar.res
+++ b/resource/ui/controlpointprogressbar.res
@@ -9,8 +9,6 @@
"zpos" "20"
"wide" "100"
"tall" "65"
- "wide_minmode" "65"
- "tall_minmode" "42"
"visible" "0"
"enabled" "1"
}
diff --git a/resource/ui/craftingpanel.res b/resource/ui/craftingpanel.res
index bf85c6f..05b5207 100644
--- a/resource/ui/craftingpanel.res
+++ b/resource/ui/craftingpanel.res
@@ -46,7 +46,7 @@
"model_tall" "35"
"text_center" "1"
"name_only" "1"
- "text_forcesize" "3"
+ "text_forcesize" "3"
"noitem_use_fullpanel" "1"
"inset_eq_x" "2"
diff --git a/resource/ui/craftingstatusdialog.res b/resource/ui/craftingstatusdialog.res
index d6268af..7cbef76 100644
--- a/resource/ui/craftingstatusdialog.res
+++ b/resource/ui/craftingstatusdialog.res
@@ -9,10 +9,10 @@
"ypos" "200"
"wide" "200"
"tall" "110"
- "bgcolor_override" "DarkerGrey"
+ "bgcolor_override" "DarkGrey"
"paintbackgroundtype" "0"
"settitlebarvisible" "0"
- "border" "CyanBorderThick"
+ "border" "CyanBorder"
}
"CenterPositioner"
@@ -74,7 +74,7 @@
{
"ControlName" "Label"
"fieldName" "EllipsesLabel"
- "font" "HudFontSmallBold"
+ "font" "HudFontSmall"
"xpos" "0"
"ypos" "0"
"zpos" "0"
@@ -109,7 +109,7 @@
"enabled" "1"
"tabPosition" "0"
"labelText" "#GameUI_Ok"
- "font" "HudFontSmallBold"
+ "font" "HudFontSmall"
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
diff --git a/resource/ui/destroy_menu/base_active.res b/resource/ui/destroy_menu/base_active.res
index c76aa1d..2ace4fa 100644
--- a/resource/ui/destroy_menu/base_active.res
+++ b/resource/ui/destroy_menu/base_active.res
@@ -4,9 +4,9 @@
{
"ControlName" "CExLabel"
"fieldName" "ItemNameLabel"
- "font" "CerbeticaBold12"
+ "font" "HudFontSmall"
"xpos" "0"
- "ypos" "10"
+ "ypos" "4"
"zpos" "1"
"wide" "100"
"tall" "15"
@@ -32,8 +32,8 @@
"visible" "0"
"enabled" "0"
"scaleImage" "1"
- "icon" "hud_menu_item_bg"
- "iconColor" "Black"
+ "icon" "hud_menu_item_bg_outline"
+ "iconColor" "ProgressOffWhite"
}
"BuildingIcon"
@@ -41,14 +41,14 @@
"ControlName" "CIconPanel"
"fieldName" "BuildingIcon"
"xpos" "22"
- "ypos" "43"
+ "ypos" "25"
"zpos" "2"
"wide" "56"
"tall" "56"
"visible" "1"
"enabled" "1"
"scaleImage" "1"
- "icon" "obj_status_sentrygun_1"
+ "icon" "hud_menu_sentry_build"
"iconColor" "White"
}
@@ -57,7 +57,7 @@
"ControlName" "CIconPanel"
"fieldName" "DestroyIcon"
"xpos" "22"
- "ypos" "43"
+ "ypos" "33"
"zpos" "2"
"wide" "56"
"tall" "56"
@@ -73,10 +73,10 @@
"ControlName" "CIconPanel"
"fieldName" "NumberBg"
"xpos" "41"
- "ypos" "106"
+ "ypos" "99"
"zpos" "0"
- "wide" "18"
- "tall" "18"
+ "wide" "0"
+ "tall" "0"
"visible" "0"
"enabled" "0"
"scaleImage" "1"
@@ -88,10 +88,10 @@
{
"ControlName" "CExLabel"
"fieldName" "NumberLabel"
- "font" "CerbeticaBold20"
+ "font" "HudFontMediumSecondary"
"fgcolor" "TanLight"
"xpos" "0"
- "ypos" "105"
+ "ypos" "95"
"zpos" "1"
"wide" "100"
"tall" "20"
diff --git a/resource/ui/destroy_menu/base_inactive.res b/resource/ui/destroy_menu/base_inactive.res
index 64f4b89..119d671 100644
--- a/resource/ui/destroy_menu/base_inactive.res
+++ b/resource/ui/destroy_menu/base_inactive.res
@@ -4,9 +4,9 @@
{
"ControlName" "CExLabel"
"fieldName" "ItemNameLabel"
- "font" "CerbeticaBold12"
+ "font" "HudFontSmall"
"xpos" "0"
- "ypos" "10"
+ "ypos" "4"
"zpos" "1"
"wide" "100"
"tall" "15"
@@ -18,7 +18,7 @@
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
- "fgcolor" "ColorRed"
+ "fgcolor_override" "ColorRed"
}
"ItemBackground"
@@ -41,7 +41,7 @@
{
"ControlName" "CExLabel"
"fieldName" "NotBuiltLabel"
- "font" "CerbeticaBold16"
+ "font" "HudFontSmall"
"xpos" "0"
"ypos" "60"
"zpos" "2"
@@ -53,14 +53,14 @@
"enabled" "1"
"labelText" "#TF_NotBuilt"
"textAlignment" "center"
- "fgcolor" "ColorRed"
+ "fgcolor_override" "ColorRed"
}
"UnavailableLabel"
{
"ControlName" "CExLabel"
"fieldName" "UnavailableLabel"
- "font" "CerbeticaBold16"
+ "font" "HudFontSmall"
"xpos" "0"
"ypos" "60"
"zpos" "2"
@@ -72,7 +72,9 @@
"enabled" "1"
"labelText" "#Hud_Menu_Build_Unavailable"
"textAlignment" "center"
- "fgcolor" "ColorRed"
+ "dulltext" "0"
+ "brighttext" "0"
+ "fgcolor_override" "ColorRed"
}
"NumberBg"
@@ -80,10 +82,10 @@
"ControlName" "CIconPanel"
"fieldName" "NumberBg"
"xpos" "41"
- "ypos" "106"
+ "ypos" "99"
"zpos" "0"
- "wide" "18"
- "tall" "18"
+ "wide" "0"
+ "tall" "0"
"visible" "0"
"enabled" "0"
"scaleImage" "1"
@@ -95,10 +97,10 @@
{
"ControlName" "CExLabel"
"fieldName" "NumberLabel"
- "font" "CerbeticaBold20"
+ "font" "HudFontMediumSecondary"
"fgcolor" "ColorRed"
"xpos" "0"
- "ypos" "105"
+ "ypos" "95"
"zpos" "1"
"wide" "100"
"tall" "20"
diff --git a/resource/ui/destroy_menu/hudmenuengydestroy.res b/resource/ui/destroy_menu/hudmenuengydestroy.res
index 443b472..35accc6 100644
--- a/resource/ui/destroy_menu/hudmenuengydestroy.res
+++ b/resource/ui/destroy_menu/hudmenuengydestroy.res
@@ -8,10 +8,10 @@
"ypos" "20"
"zpos" "0"
"wide" "400"
- "tall" "130"
+ "tall" "120"
"visible" "1"
"enabled" "1"
- "paintbackground" "0"
+ "paintbackground" "0"
}
"DestroyIcon"
@@ -33,7 +33,7 @@
{
"ControlName" "CExLabel"
"fieldName" "TitleLabel"
- "font" "CerbeticaBold32"
+ "font" "Cerbetica28"
"xpos" "20"
"ypos" "0"
"zpos" "2"
@@ -44,7 +44,7 @@
"visible" "1"
"enabled" "1"
"labelText" "#Hud_menu_demolish_title"
- "textAlignment" "Left"
+ "textAlignment" "west"
"dulltext" "0"
"brighttext" "0"
}
@@ -53,7 +53,7 @@
{
"ControlName" "CExLabel"
"fieldName" "TitleLabelDropshadow"
- "font" "CerbeticaBold32"
+ "font" "Cerbetica28"
"fgcolor" "TransparentBlack"
"xpos" "-2"
"ypos" "-2"
@@ -65,7 +65,7 @@
"visible" "1"
"enabled" "1"
"labelText" "#Hud_menu_demolish_title"
- "textAlignment" "Left"
+ "textAlignment" "west"
"dulltext" "1"
"brighttext" "0"
@@ -192,7 +192,7 @@
"unavailable_item_1"
{
- "ControlName" "EditablePanel"
+ "ControlName" "CEngyDestroyMenuItem"
"fieldName" "unavailable_item_1"
"xpos" "0"
"ypos" "20"
@@ -204,7 +204,7 @@
"unavailable_item_2"
{
- "ControlName" "EditablePanel"
+ "ControlName" "CEngyDestroyMenuItem"
"fieldName" "unavailable_item_2"
"xpos" "100"
"ypos" "20"
@@ -216,7 +216,7 @@
"unavailable_item_3"
{
- "ControlName" "EditablePanel"
+ "ControlName" "CEngyDestroyMenuItem"
"fieldName" "unavailable_item_3"
"xpos" "200"
"ypos" "20"
@@ -228,7 +228,7 @@
"unavailable_item_4"
{
- "ControlName" "EditablePanel"
+ "ControlName" "CEngyDestroyMenuItem"
"fieldName" "unavailable_item_4"
"xpos" "300"
"ypos" "20"
@@ -246,7 +246,7 @@
"ypos" "20"
"zpos" "1"
"wide" "400"
- "tall" "130"
+ "tall" "120"
"visible" "1"
"enabled" "1"
"bgcolor_override" "TransparentBlack"
diff --git a/resource/ui/destroy_menu/pipboy/dispenser_inactive.res b/resource/ui/destroy_menu/pipboy/dispenser_inactive.res
index 9e31cc8..4a651a8 100644
--- a/resource/ui/destroy_menu/pipboy/dispenser_inactive.res
+++ b/resource/ui/destroy_menu/pipboy/dispenser_inactive.res
@@ -5,11 +5,5 @@
"ItemNameLabel"
{
"labelText" "#TF_Object_Dispenser"
- "fgcolor_override" "ColorRed"
- }
-
- "NumberLabel"
- {
- "fgcolor_override" "ColorRed"
}
} \ No newline at end of file
diff --git a/resource/ui/destroy_menu/pipboy/hudmenuengydestroy.res b/resource/ui/destroy_menu/pipboy/hudmenuengydestroy.res
index ab4b7bc..3cba041 100644
--- a/resource/ui/destroy_menu/pipboy/hudmenuengydestroy.res
+++ b/resource/ui/destroy_menu/pipboy/hudmenuengydestroy.res
@@ -10,7 +10,7 @@
"ypos" "20"
"zpos" "0"
"wide" "400"
- "tall" "130"
+ "tall" "120"
"visible" "1"
"enabled" "1"
"scaleImage" "1"
diff --git a/resource/ui/destroy_menu/pipboy/sentry_inactive.res b/resource/ui/destroy_menu/pipboy/sentry_inactive.res
index 6f1c439..9c98ac0 100644
--- a/resource/ui/destroy_menu/pipboy/sentry_inactive.res
+++ b/resource/ui/destroy_menu/pipboy/sentry_inactive.res
@@ -5,11 +5,5 @@
"ItemNameLabel"
{
"labelText" "#TF_Object_Sentry"
- "fgcolor_override" "ColorRed"
- }
-
- "NumberLabel"
- {
- "fgcolor_override" "ColorRed"
}
} \ No newline at end of file
diff --git a/resource/ui/destroy_menu/pipboy/tele_entrance_inactive.res b/resource/ui/destroy_menu/pipboy/tele_entrance_inactive.res
index 58caa71..be3e807 100644
--- a/resource/ui/destroy_menu/pipboy/tele_entrance_inactive.res
+++ b/resource/ui/destroy_menu/pipboy/tele_entrance_inactive.res
@@ -5,11 +5,5 @@
"ItemNameLabel"
{
"labelText" "#TF_Object_Tele_Entrance_360"
- "fgcolor_override" "ColorRed"
- }
-
- "NumberLabel"
- {
- "fgcolor_override" "ColorRed"
}
} \ No newline at end of file
diff --git a/resource/ui/destroy_menu/pipboy/tele_exit_inactive.res b/resource/ui/destroy_menu/pipboy/tele_exit_inactive.res
index 2f62835..f236327 100644
--- a/resource/ui/destroy_menu/pipboy/tele_exit_inactive.res
+++ b/resource/ui/destroy_menu/pipboy/tele_exit_inactive.res
@@ -5,11 +5,5 @@
"ItemNameLabel"
{
"labelText" "#TF_Object_Tele_Exit_360"
- "fgcolor_override" "ColorRed"
- }
-
- "NumberLabel"
- {
- "fgcolor_override" "ColorRed"
}
} \ No newline at end of file
diff --git a/resource/ui/disguise_menu/heavy_red.res b/resource/ui/disguise_menu/heavy_red.res
index 86c6454..ba6513d 100644
--- a/resource/ui/disguise_menu/heavy_red.res
+++ b/resource/ui/disguise_menu/heavy_red.res
@@ -4,11 +4,11 @@
{
"ControlName" "CExLabel"
"fieldName" "ItemName"
- "font" "CerbeticaBold14"
+ "font" "HudFontSmallest"
"xpos" "20"
"ypos" "0"
"zpos" "1"
- "wide" "45"
+ "wide" "55"
"tall" "20"
"autoResize" "0"
"pinCorner" "0"
@@ -56,7 +56,7 @@
{
"ControlName" "CExLabel"
"fieldName" "NumberLabel"
- "font" "CerbeticaBold14"
+ "font" "HudFontSmallest"
"fgcolor" "HUDRedTeamSolid"
"xpos" "5"
"ypos" "3"
@@ -77,7 +77,7 @@
{
"ControlName" "CExLabel"
"fieldName" "NumberLabel"
- "font" "CerbeticaBold14"
+ "font" "HudFontSmallest"
"fgcolor" "HUDRedTeamSolid"
"xpos" "5"
"ypos" "3"
diff --git a/resource/ui/disguise_menu/hudmenuspydisguise.res b/resource/ui/disguise_menu/hudmenuspydisguise.res
index cb32874..016445b 100644
--- a/resource/ui/disguise_menu/hudmenuspydisguise.res
+++ b/resource/ui/disguise_menu/hudmenuspydisguise.res
@@ -2,26 +2,28 @@
{
"MainBackground"
{
- "ControlName" "EditablePanel"
+ "ControlName" "CIconPanel"
"fieldName" "MainBackground"
- "xpos" "0"
- "ypos" "20"
- "zpos" "1"
- "wide" "100"
- "tall" "150"
+ "xpos" "9999"
+ "ypos" "9999"
+ "zpos" "0"
+ "wide" "470"
+ "tall" "170"
"visible" "1"
"enabled" "1"
- "paintbackground" "0"
+ "scaleImage" "1"
+ "icon" "hud_menu_bg"
+ "iconColor" "White"
}
"TitleLabel"
{
"ControlName" "CExLabel"
"fieldName" "TitleLabel"
- "font" "CerbeticaBold32"
+ "font" "Cerbetica28"
"xpos" "10"
"ypos" "0"
- "zpos" "2"
+ "zpos" "3"
"wide" "380"
"tall" "30"
"autoResize" "0"
@@ -29,7 +31,7 @@
"visible" "1"
"enabled" "1"
"labelText" "#Hud_Menu_Disguise_Title"
- "textAlignment" "Left"
+ "textAlignment" "west"
"dulltext" "0"
"brighttext" "0"
}
@@ -38,11 +40,11 @@
{
"ControlName" "CExLabel"
"fieldName" "TitleLabelDropshadow"
- "font" "CerbeticaBold32"
+ "font" "Cerbetica28"
"fgcolor" "TransparentBlack"
"xpos" "-2"
"ypos" "-2"
- "zpos" "1"
+ "zpos" "3"
"wide" "380"
"tall" "30"
"autoResize" "0"
@@ -50,7 +52,7 @@
"visible" "1"
"enabled" "1"
"labelText" "#Hud_Menu_Disguise_Title"
- "textAlignment" "Left"
+ "textAlignment" "west"
"dulltext" "1"
"brighttext" "0"
@@ -63,18 +65,18 @@
{
"ControlName" "CExLabel"
"fieldName" "ToggleLabel"
- "font" "Cerbetica12"
+ "font" "TextTooltipFont"
"xpos" "0"
- "ypos" "175"
+ "ypos" "165"
"zpos" "2"
- "wide" "200"
+ "wide" "100"
"tall" "15"
"autoResize" "0"
"pinCorner" "0"
"visible" "1"
"enabled" "1"
"labelText" "#Hud_Menu_Spy_Minus_Toggle"
- "textAlignment" "Left"
+ "textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
}
@@ -86,8 +88,8 @@
"font" "SpectatorKeyHints"
"xpos" "9999"
"ypos" "9999"
- "zpos" "1"
- "wide" "200"
+ "zpos" "2"
+ "wide" "300"
"tall" "13"
"autoResize" "0"
"pinCorner" "0"
@@ -104,7 +106,7 @@
"ControlName" "EditablePanel"
"fieldName" "class_item_red_1"
"xpos" "10"
- "ypos" "30"
+ "ypos" "25"
"zpos" "2"
"wide" "80"
"tall" "16"
@@ -116,7 +118,7 @@
"ControlName" "EditablePanel"
"fieldName" "class_item_blue_1"
"xpos" "10"
- "ypos" "30"
+ "ypos" "25"
"zpos" "2"
"wide" "80"
"tall" "16"
@@ -128,7 +130,7 @@
"ControlName" "EditablePanel"
"fieldName" "class_item_red_2"
"xpos" "10"
- "ypos" "45"
+ "ypos" "40"
"zpos" "2"
"wide" "80"
"tall" "16"
@@ -140,7 +142,7 @@
"ControlName" "EditablePanel"
"fieldName" "class_item_blue_2"
"xpos" "10"
- "ypos" "45"
+ "ypos" "40"
"zpos" "2"
"wide" "80"
"tall" "16"
@@ -152,7 +154,7 @@
"ControlName" "EditablePanel"
"fieldName" "class_item_red_3"
"xpos" "10"
- "ypos" "60"
+ "ypos" "55"
"zpos" "2"
"wide" "80"
"tall" "16"
@@ -164,7 +166,7 @@
"ControlName" "EditablePanel"
"fieldName" "class_item_blue_3"
"xpos" "10"
- "ypos" "60"
+ "ypos" "55"
"zpos" "2"
"wide" "80"
"tall" "16"
@@ -176,7 +178,7 @@
"ControlName" "EditablePanel"
"fieldName" "class_item_red_4"
"xpos" "10"
- "ypos" "75"
+ "ypos" "70"
"zpos" "2"
"wide" "80"
"tall" "16"
@@ -188,7 +190,7 @@
"ControlName" "EditablePanel"
"fieldName" "class_item_blue_4"
"xpos" "10"
- "ypos" "75"
+ "ypos" "70"
"zpos" "2"
"wide" "80"
"tall" "16"
@@ -200,7 +202,7 @@
"ControlName" "EditablePanel"
"fieldName" "class_item_red_5"
"xpos" "10"
- "ypos" "90"
+ "ypos" "85"
"zpos" "2"
"wide" "80"
"tall" "16"
@@ -212,7 +214,7 @@
"ControlName" "EditablePanel"
"fieldName" "class_item_blue_5"
"xpos" "10"
- "ypos" "90"
+ "ypos" "85"
"zpos" "2"
"wide" "80"
"tall" "16"
@@ -224,7 +226,7 @@
"ControlName" "EditablePanel"
"fieldName" "class_item_red_6"
"xpos" "10"
- "ypos" "105"
+ "ypos" "100"
"zpos" "2"
"wide" "80"
"tall" "16"
@@ -236,7 +238,7 @@
"ControlName" "EditablePanel"
"fieldName" "class_item_blue_6"
"xpos" "10"
- "ypos" "105"
+ "ypos" "100"
"zpos" "2"
"wide" "80"
"tall" "16"
@@ -248,7 +250,7 @@
"ControlName" "EditablePanel"
"fieldName" "class_item_red_7"
"xpos" "10"
- "ypos" "120"
+ "ypos" "115"
"zpos" "2"
"wide" "80"
"tall" "16"
@@ -260,7 +262,7 @@
"ControlName" "EditablePanel"
"fieldName" "class_item_blue_7"
"xpos" "10"
- "ypos" "120"
+ "ypos" "115"
"zpos" "2"
"wide" "80"
"tall" "16"
@@ -272,7 +274,7 @@
"ControlName" "EditablePanel"
"fieldName" "class_item_red_8"
"xpos" "10"
- "ypos" "135"
+ "ypos" "130"
"zpos" "2"
"wide" "80"
"tall" "16"
@@ -284,7 +286,7 @@
"ControlName" "EditablePanel"
"fieldName" "class_item_blue_8"
"xpos" "10"
- "ypos" "135"
+ "ypos" "130"
"zpos" "2"
"wide" "80"
"tall" "16"
@@ -296,7 +298,7 @@
"ControlName" "EditablePanel"
"fieldName" "class_item_red_9"
"xpos" "10"
- "ypos" "150"
+ "ypos" "145"
"zpos" "2"
"wide" "80"
"tall" "16"
@@ -308,7 +310,7 @@
"ControlName" "EditablePanel"
"fieldName" "class_item_blue_9"
"xpos" "10"
- "ypos" "150"
+ "ypos" "145"
"zpos" "2"
"wide" "80"
"tall" "16"
@@ -335,10 +337,10 @@
{
"ControlName" "CExLabel"
"fieldName" "NumberLabel"
- "font" "CerbeticaBold20"
+ "font" "Cerbetica20"
"fgcolor" "White"
"xpos" "10"
- "ypos" "45"
+ "ypos" "40"
"zpos" "5"
"wide" "15"
"tall" "15"
@@ -372,10 +374,10 @@
{
"ControlName" "CExLabel"
"fieldName" "NumberLabel"
- "font" "CerbeticaBold20"
+ "font" "Cerbetica20"
"fgcolor" "White"
"xpos" "10"
- "ypos" "90"
+ "ypos" "85"
"zpos" "5"
"wide" "15"
"tall" "15"
@@ -409,10 +411,10 @@
{
"ControlName" "CExLabel"
"fieldName" "NumberLabel"
- "font" "CerbeticaBold20"
+ "font" "Cerbetica20"
"fgcolor" "White"
"xpos" "10"
- "ypos" "135"
+ "ypos" "130"
"zpos" "5"
"wide" "15"
"tall" "15"
@@ -431,10 +433,10 @@
"ControlName" "EditablePanel"
"fieldName" "MenuBG"
"xpos" "0"
- "ypos" "20"
+ "ypos" "22"
"zpos" "1"
"wide" "100"
- "tall" "155"
+ "tall" "145"
"visible" "1"
"enabled" "1"
"bgcolor_override" "TransparentBlack"
diff --git a/resource/ui/disguisestatuspanel.res b/resource/ui/disguisestatuspanel.res
index a0ceb2a..dd185c2 100644
--- a/resource/ui/disguisestatuspanel.res
+++ b/resource/ui/disguisestatuspanel.res
@@ -37,7 +37,7 @@
"tall" "30"
"visible" "1"
"enabled" "1"
- "bgcolor_override" "HudBlack"
+ "bgcolor_override" "TransparentBlack"
"PaintBackgroundType" "0"
}
@@ -69,11 +69,11 @@
{
"ControlName" "Label"
"fieldName" "DisguiseNameLabel"
- "font" "Cerbetica14"
+ "font" "HudFontSmall"
"xpos" "35"
"ypos" "0"
"zpos" "1"
- "wide" "120"
+ "wide" "115"
"tall" "15"
"autoResize" "0"
"pinCorner" "0"
@@ -89,16 +89,16 @@
{
"ControlName" "Label"
"fieldName" "DisguiseNameLabelShadow"
- "font" "Cerbetica14"
+ "font" "HudFontSmall"
"xpos" "-1"
"ypos" "-1"
"zpos" "1"
- "wide" "120"
+ "wide" "115"
"tall" "15"
"autoResize" "0"
"pinCorner" "0"
- "visible" "1"
- "enabled" "1"
+ "visible" "0"
+ "enabled" "0"
"labelText" "%disguisename%"
"textAlignment" "west"
"dulltext" "0"
@@ -114,11 +114,11 @@
{
"ControlName" "Label"
"fieldName" "WeaponNameLabel"
- "font" "Cerbetica14"
+ "font" "HudFontSmallest"
"xpos" "35"
"ypos" "15"
"zpos" "1"
- "wide" "120"
+ "wide" "115"
"tall" "15"
"autoResize" "0"
"pinCorner" "0"
@@ -134,16 +134,16 @@
{
"ControlName" "Label"
"fieldName" "WeaponNameLabelShadow"
- "font" "Cerbetica14"
+ "font" "HudFontSmallest"
"xpos" "-1"
"ypos" "-1"
"zpos" "1"
- "wide" "120"
+ "wide" "115"
"tall" "15"
"autoResize" "0"
"pinCorner" "0"
- "visible" "1"
- "enabled" "1"
+ "visible" "0"
+ "enabled" "0"
"labelText" "%weaponname%"
"textAlignment" "west"
"dulltext" "0"
@@ -167,7 +167,7 @@
"visible" "1"
"enabled" "1"
"HealthBonusPosAdj" "10"
- "HealthDeathWarning" "0.49"
+ "HealthDeathWarning" "0.49"
"TFFont" "HudFontSmall"
"HealthDeathWarningColor" "HUDDeathWarning"
"TextColor" "HudOffWhite"
diff --git a/resource/ui/econ/backpackpanel.res b/resource/ui/econ/backpackpanel.res
index 413a411..67398f6 100644
--- a/resource/ui/econ/backpackpanel.res
+++ b/resource/ui/econ/backpackpanel.res
@@ -63,7 +63,7 @@
"paintborder" "1"
"textAlignment" "center"
"labelText" "%page%"
- "font" "HudFontSmallestBold"
+ "font" "HudFontSmallest"
"sound_depressed" "UI/buttonclick.wav"
"sound_released" "UI/buttonclickrelease.wav"
}
@@ -157,18 +157,18 @@
{
"ControlName" "CExLabel"
"fieldName" "CaratLabel"
- "font" "Cerbetica16"
+ "font" "HudFontMediumSmallSecondary"
"labelText" ">>"
"textAlignment" "west"
"xpos" "c-290"
- "ypos" "26"
+ "ypos" "12"
"zpos" "1"
"wide" "20"
"tall" "16"
"autoResize" "1"
"pinCorner" "0"
- "visible" "0"
- "enabled" "0"
+ "visible" "1"
+ "enabled" "1"
"fgcolor_override" "ColorPurple"
}
@@ -179,7 +179,7 @@
"font" "HudFontMediumBold"
"labelText" "#ClassBeingEquipped"
"textAlignment" "west"
- "xpos" "c-280"
+ "xpos" "c-270"
"ypos" "10"
"zpos" "1"
"wide" "370"
@@ -245,8 +245,8 @@
"labelText" "#ShowBaseItemsCheckBox"
"font" "HudFontSmallestBold"
"textAlignment" "east"
- "xpos" "c-165"
- "ypos" "36"
+ "xpos" "c-60"
+ "ypos" "15"
"zpos" "1"
"wide" "120"
"tall" "20"
@@ -283,7 +283,6 @@
{
"ControlName" "TextEntry"
"fieldName" "NameFilterTextEntry"
- "font" "HudFontSmallest"
"xpos" "c117"
"ypos" "15"
"wide" "168"
@@ -297,10 +296,9 @@
"editable" "1"
"unicode" "1"
"fgcolor_override" "TanLight"
- "bgcolor_override" "15 15 15 255"
- "paintbackgroundtype" "0"
- "border_default" "ButtonHover"
- "border_armed" "ButtonHover"
+ "bgcolor_override" "DarkerGrey"
+ "paintbackgroundtype" "2"
+ "font" "HudFontSmallest"
}
"SortByComboBox"
@@ -334,11 +332,11 @@
"mouseoveritempanel"
{
- "ControlName" "CItemModelPanel"
+ "ControlName" "EditablePanel"
"fieldName" "mouseoveritempanel"
"xpos" "c-70"
"ypos" "270"
- "zpos" "100"
+ "zpos" "102"
"wide" "300"
"tall" "300"
"visible" "0"
@@ -346,7 +344,6 @@
"noitem_textcolor" "TextColor"
"PaintBackgroundType" "2"
"paintborder" "1"
- "text_ypos" "10"
"text_center" "1"
"model_hide" "1"
"resize_to_text" "1"
@@ -357,7 +354,7 @@
"font" "ItemFontAttribLarge"
"xpos" "0"
"ypos" "30"
- "zpos" "101"
+ "zpos" "2"
"wide" "140"
"tall" "60"
"autoResize" "0"
@@ -406,7 +403,7 @@
"ypos" "40"
"zpos" "1"
"wide" "25"
- "tall" "13"
+ "tall" "15"
"autoResize" "0"
"pinCorner" "0"
"visible" "1"
@@ -420,21 +417,13 @@
"Command" "prevpage"
"sound_depressed" "UI/buttonclick.wav"
"sound_released" "UI/buttonclickrelease.wav"
-
- "defaultBgColor_override" "25 25 25 255"
- "armedBgColor_override" "35 35 35 255"
- "depressedBgColor_override" "25 25 25 255"
-
- "defaultFgColor_override" "TanLight"
- "armedFgColor_override" "ColorCyan"
- "depressedFgColor_override" "TanDark"
}
"CurPageLabel"
{
"ControlName" "CExLabel"
"fieldName" "CurPageLabel"
- "font" "HudFontSmallestBold"
+ "font" "HudFontSmall"
"labelText" "%backpackpage%"
"textAlignment" "center"
"xpos" "c-260"
@@ -457,7 +446,7 @@
"ypos" "40"
"zpos" "1"
"wide" "25"
- "tall" "13"
+ "tall" "15"
"autoResize" "0"
"pinCorner" "0"
"visible" "1"
@@ -465,21 +454,12 @@
"tabPosition" "0"
"labelText" "&D"
"font" "MenuArrows"
- "fgcolor" "TanLight"
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
"Command" "nextpage"
"sound_depressed" "UI/buttonclick.wav"
"sound_released" "UI/buttonclickrelease.wav"
-
- "defaultBgColor_override" "25 25 25 255"
- "armedBgColor_override" "35 35 35 255"
- "depressedBgColor_override" "25 25 25 255"
-
- "defaultFgColor_override" "TanLight"
- "armedFgColor_override" "ColorCyan"
- "depressedFgColor_override" "TanDark"
}
"DragToNextPageButton"
@@ -545,7 +525,7 @@
"enabled" "1"
"tabPosition" "0"
"labelText" "#Cancel"
- "font" "HudFontSmallBold"
+ "font" "HudFontSmall"
"textAlignment" "center"
"textinsetx" "50"
"dulltext" "0"
@@ -863,6 +843,7 @@
"enabled" "1"
"tabPosition" "0"
"labeltext" ""
+ "font" "HudFontSmall"
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
diff --git a/resource/ui/econ/comboboxbackpackoverlaydialog.res b/resource/ui/econ/comboboxbackpackoverlaydialog.res
index b0932ca..0771a93 100644
--- a/resource/ui/econ/comboboxbackpackoverlaydialog.res
+++ b/resource/ui/econ/comboboxbackpackoverlaydialog.res
@@ -19,7 +19,7 @@
{
"ControlName" "CExLabel"
"fieldName" "TitleLabel"
- "font" "Cerbetica22"
+ "font" "HudFontMediumBold"
"labelText" "#TF_Item_SelectStyle"
"textAlignment" "center"
"xpos" "0"
diff --git a/resource/ui/econ/confirmapplycardupgradeapplicationdialog.res b/resource/ui/econ/confirmapplycardupgradeapplicationdialog.res
deleted file mode 100644
index 6dfa026..0000000
--- a/resource/ui/econ/confirmapplycardupgradeapplicationdialog.res
+++ /dev/null
@@ -1,276 +0,0 @@
-"Resource/UI/ConfirmApplyCardUpgradeApplicationDialog.res"
-{
- "ConfirmApplyCardUpgradeApplicationDialog"
- {
- "fieldName" "ConfirmApplyCardUpgradeApplicationDialog"
- "visible" "1"
- "enabled" "1"
- "xpos" "c-200"
- "ypos" "c-200"
- "wide" "400"
- "tall" "240"
- "settitlebarvisible" "0"
- "paintborder" "2"
- "paintbackground" "1"
- "border" "CyanBorderThick"
- "bgcolor_override" "25 25 25 255"
- }
-
- "mouseoveritempanel"
- {
- "ControlName" "CItemModelPanel"
- "fieldName" "mouseoveritempanel"
- "xpos" "c-70"
- "ypos" "270"
- "zpos" "100"
- "wide" "300"
- "tall" "300"
- "visible" "0"
- "bgcolor_override" "Transparent"
- "noitem_textcolor" "TextColor"
- "PaintBackgroundType" "2"
- "paintborder" "1"
- "text_ypos" "20"
- "text_center" "1"
- "model_hide" "1"
- "resize_to_text" "1"
- "padding_height" "15"
-
- "attriblabel"
- {
- "font" "ItemFontAttribLarge"
- "xpos" "0"
- "ypos" "30"
- "zpos" "101"
- "wide" "140"
- "tall" "60"
- "autoResize" "0"
- "pinCorner" "0"
- "visible" "1"
- "enabled" "1"
- "labelText" "%attriblist%"
- "textAlignment" "center"
- "fgcolor" "TextColor"
- "centerwrap" "1"
- }
- }
-
- "TitleLabel"
- {
- "ControlName" "CExLabel"
- "fieldName" "TitleLabel"
- "font" "Cerbetica22"
- "labelText" "dynamic"
- "textAlignment" "center"
- "xpos" "100"
- "ypos" "10"
- "zpos" "0"
- "wide" "200"
- "tall" "60"
- "autoResize" "1"
- "pinCorner" "0"
- "visible" "1"
- "enabled" "1"
- "centerwrap" "1"
- }
-
- "ToolBG"
- {
- "ControlName" "CExLabel"
- "fieldName" "ToolBG"
- "font" "HudFontSmallBold"
- "labelText" ""
- "textAlignment" "east"
- "xpos" "10"
- "ypos" "10"
- "zpos" "-1"
- "wide" "84"
- "tall" "64"
- "autoResize" "1"
- "pinCorner" "0"
- "visible" "1"
- "enabled" "1"
- "paintbackground" "0"
- "border" "BackpackItemBorder_SelfMade"
- }
- "tool_icon"
- {
- "ControlName" "ScalableImagePanel"
- "fieldName" "tool_icon"
- "xpos" "10"
- "ypos" "10"
- "zpos" "2"
- "wide" "16"
- "tall" "16"
- "visible" "1"
- "enabled" "1"
- "image" "backpack_jewel_modify_target_b_g"
- "tileImage" "0"
- "tileVertically" "0"
- "drawcolor" "112 176 74 255"
- }
- "tool_modelpanel"
- {
- "ControlName" "CItemModelPanel"
- "fieldName" "tool_modelpanel"
- "xpos" "10"
- "ypos" "10"
- "zpos" "1"
- "wide" "84"
- "tall" "64"
- "visible" "1"
- "bgcolor_override" "Transparent"
- "noitem_textcolor" "TextColor"
- "PaintBackgroundType" "2"
- "paintborder" "0"
- "model_xpos" "2"
- "model_ypos" "5"
- "model_wide" "80"
- "model_tall" "54"
- "text_ypos" "100"
- "text_center" "1"
- "name_only" "1"
- "paint_icon_hide" "1"
-
- "itemmodelpanel"
- {
- "use_item_rendertarget" "0"
- "allow_rot" "0"
- "inventory_image_type" "1"
- }
- }
- "SubjectBG"
- {
- "ControlName" "CExLabel"
- "fieldName" "SubjectBG"
- "font" "HudFontSmallBold"
- "labelText" ""
- "textAlignment" "east"
- "xpos" "300"
- "ypos" "10"
- "zpos" "-1"
- "wide" "84"
- "tall" "64"
- "autoResize" "1"
- "pinCorner" "0"
- "visible" "1"
- "enabled" "1"
- "paintbackground" "0"
- "border" "BackpackItemBorder_Vintage"
- }
- "subject_icon"
- {
- "ControlName" "ScalableImagePanel"
- "fieldName" "subject_icon"
- "xpos" "300"
- "ypos" "10"
- "zpos" "2"
- "wide" "16"
- "tall" "16"
- "visible" "1"
- "enabled" "1"
- "image" "backpack_jewel_modify_target_b_g"
- "tileImage" "0"
- "tileVertically" "0"
- "drawcolor" "71 98 145 255"
- }
- "subject_modelpanel"
- {
- "ControlName" "CItemModelPanel"
- "fieldName" "subject_modelpanel"
- "xpos" "300"
- "ypos" "10"
- "zpos" "1"
- "wide" "84"
- "tall" "64"
- "visible" "1"
- "bgcolor_override" "Transparent"
- "noitem_textcolor" "TextColor"
- "PaintBackgroundType" "2"
- "paintborder" "0"
- "model_xpos" "2"
- "model_ypos" "5"
- "model_wide" "80"
- "model_tall" "54"
- "text_ypos" "100"
- "text_center" "1"
- "name_only" "1"
-
- "itemmodelpanel"
- {
- "use_item_rendertarget" "0"
- "allow_rot" "0"
- "inventory_image_type" "1"
- }
- }
- "ConfirmLabel"
- {
- "ControlName" "CExLabel"
- "fieldName" "ConfirmLabel"
- "font" "HudFontSmall"
- "labelText" "#ToolCardUpgradeApplyConfirm"
- "textAlignment" "center"
- "xpos" "20"
- "ypos" "80"
- "zpos" "0"
- "wide" "360"
- "tall" "120"
- "autoResize" "1"
- "pinCorner" "0"
- "visible" "1"
- "enabled" "1"
- "fgcolor_override" "Yellow"
- }
- "CancelButton"
- {
- "ControlName" "CExButton"
- "fieldName" "CancelButton"
- "xpos" "50"
- "ypos" "200"
- "zpos" "1"
- "wide" "130"
- "tall" "25"
- "autoResize" "0"
- "pinCorner" "3"
- "visible" "1"
- "enabled" "1"
- "tabPosition" "0"
- "labelText" "#Cancel"
- "font" "HudFontSmall"
- "textAlignment" "center"
- "dulltext" "0"
- "brighttext" "0"
- "default" "0"
- "Command" "cancel"
- "sound_depressed" "UI/buttonclick.wav"
- "sound_released" "UI/buttonclickrelease.wav"
- "border_default" "ButtonHover"
- "border_armed" "ButtonHover"
- }
- "OkButton"
- {
- "ControlName" "CExButton"
- "fieldName" "OkButton"
- "xpos" "220"
- "ypos" "200"
- "zpos" "1"
- "wide" "130"
- "tall" "25"
- "autoResize" "0"
- "pinCorner" "3"
- "visible" "1"
- "enabled" "1"
- "tabPosition" "0"
- "labelText" "#CraftNameConfirm"
- "font" "HudFontSmall"
- "textAlignment" "center"
- "dulltext" "0"
- "brighttext" "0"
- "default" "1"
- "Command" "apply"
- "sound_depressed" "UI/buttonclick.wav"
- "sound_released" "UI/buttonclickrelease.wav"
- "border_default" "ButtonHover"
- "border_armed" "ButtonHover"
- }
-} \ No newline at end of file
diff --git a/resource/ui/econ/confirmapplydecodedialog.res b/resource/ui/econ/confirmapplydecodedialog.res
deleted file mode 100644
index 606c27a..0000000
--- a/resource/ui/econ/confirmapplydecodedialog.res
+++ /dev/null
@@ -1,293 +0,0 @@
-"Resource/UI/ConfirmApplyDecodeDialog.res"
-{
- "ConfirmApplyDecodeDialog"
- {
- "fieldName" "ConfirmApplyDecodeDialog"
- "visible" "1"
- "enabled" "1"
- "xpos" "c-200"
- "ypos" "c-200"
- "wide" "400"
- "tall" "240"
- "bgcolor_override" "DarkGrey"
- "paintbackgroundtype" "0"
- "settitlebarvisible" "0"
- "border" "CyanBorderThick"
- }
-
- "mouseoveritempanel"
- {
- "ControlName" "CItemModelPanel"
- "fieldName" "mouseoveritempanel"
- "xpos" "c-70"
- "ypos" "270"
- "zpos" "100"
- "wide" "300"
- "tall" "300"
- "visible" "0"
- "bgcolor_override" "Transparent"
- "noitem_textcolor" "TextColor"
- "PaintBackgroundType" "2"
- "paintborder" "1"
- "text_ypos" "20"
- "text_center" "1"
- "model_hide" "1"
- "resize_to_text" "1"
- "padding_height" "15"
-
- "attriblabel"
- {
- "font" "ItemFontAttribLarge"
- "xpos" "0"
- "ypos" "30"
- "zpos" "101"
- "wide" "140"
- "tall" "60"
- "autoResize" "0"
- "pinCorner" "0"
- "visible" "1"
- "enabled" "1"
- "labelText" "%attriblist%"
- "textAlignment" "center"
- "fgcolor" "TextColor"
- "centerwrap" "1"
- }
- }
-
- "TitleLabel"
- {
- "ControlName" "CExLabel"
- "fieldName" "TitleLabel"
- "font" "Cerbetica22"
- "labelText" "dynamic"
- "textAlignment" "center"
- "xpos" "100"
- "ypos" "10"
- "zpos" "0"
- "wide" "200"
- "tall" "60"
- "autoResize" "1"
- "pinCorner" "0"
- "visible" "1"
- "enabled" "1"
- "centerwrap" "1"
- }
-
- "ToolBG"
- {
- "ControlName" "CExLabel"
- "fieldName" "ToolBG"
- "font" "HudFontSmallBold"
- "labelText" ""
- "textAlignment" "east"
- "xpos" "10"
- "ypos" "10"
- "zpos" "-1"
- "wide" "84"
- "tall" "64"
- "autoResize" "1"
- "pinCorner" "0"
- "visible" "1"
- "enabled" "1"
- "paintbackground" "0"
- "border" "BackpackItemBorder_SelfMade"
- }
- "tool_icon"
- {
- "ControlName" "ScalableImagePanel"
- "fieldName" "tool_icon"
- "xpos" "10"
- "ypos" "10"
- "zpos" "2"
- "wide" "16"
- "tall" "16"
- "visible" "1"
- "enabled" "1"
- "image" "backpack_jewel_modify_target_b_g"
- "tileImage" "0"
- "tileVertically" "0"
- "drawcolor" "112 176 74 255"
- }
- "tool_modelpanel"
- {
- "ControlName" "CItemModelPanel"
- "fieldName" "tool_modelpanel"
- "xpos" "10"
- "ypos" "10"
- "zpos" "1"
- "wide" "84"
- "tall" "64"
- "visible" "1"
- "bgcolor_override" "Transparent"
- "noitem_textcolor" "TextColor"
- "PaintBackgroundType" "2"
- "paintborder" "0"
- "model_xpos" "2"
- "model_ypos" "5"
- "model_wide" "80"
- "model_tall" "54"
- "text_ypos" "100"
- "text_center" "1"
- "name_only" "1"
- "paint_icon_hide" "1"
-
- "itemmodelpanel"
- {
- "use_item_rendertarget" "0"
- "allow_rot" "0"
- "inventory_image_type" "1"
- }
- }
- "SubjectBG"
- {
- "ControlName" "CExLabel"
- "fieldName" "SubjectBG"
- "font" "HudFontSmallBold"
- "labelText" ""
- "textAlignment" "east"
- "xpos" "300"
- "ypos" "10"
- "zpos" "-1"
- "wide" "84"
- "tall" "64"
- "autoResize" "1"
- "pinCorner" "0"
- "visible" "1"
- "enabled" "1"
- "paintbackground" "0"
- "border" "BackpackItemBorder_Vintage"
- }
- "subject_icon"
- {
- "ControlName" "ScalableImagePanel"
- "fieldName" "subject_icon"
- "xpos" "300"
- "ypos" "10"
- "zpos" "2"
- "wide" "16"
- "tall" "16"
- "visible" "1"
- "enabled" "1"
- "image" "backpack_jewel_modify_target_b_g"
- "tileImage" "0"
- "tileVertically" "0"
- "drawcolor" "71 98 145 255"
- }
- "subject_modelpanel"
- {
- "ControlName" "CItemModelPanel"
- "fieldName" "subject_modelpanel"
- "xpos" "300"
- "ypos" "10"
- "zpos" "1"
- "wide" "84"
- "tall" "64"
- "visible" "1"
- "bgcolor_override" "Transparent"
- "noitem_textcolor" "TextColor"
- "PaintBackgroundType" "2"
- "paintborder" "0"
- "model_xpos" "2"
- "model_ypos" "5"
- "model_wide" "80"
- "model_tall" "54"
- "text_ypos" "100"
- "text_center" "1"
- "name_only" "1"
-
- "itemmodelpanel"
- {
- "use_item_rendertarget" "0"
- "allow_rot" "0"
- "inventory_image_type" "1"
- }
- }
-
- "ConfirmLabel"
- {
- "ControlName" "CExLabel"
- "fieldName" "ConfirmLabel"
- "font" "HudFontSmall"
- "labelText" "#ToolDecodeConfirm"
- "textAlignment" "center"
- "xpos" "20"
- "ypos" "80"
- "zpos" "0"
- "wide" "360"
- "tall" "20"
- "autoResize" "1"
- "pinCorner" "0"
- "visible" "1"
- "enabled" "1"
- "fgcolor_override" "Yellow"
- }
-
- "OptionalAppendLabel"
- {
- "ControlName" "CExLabel"
- "fieldName" "OptionalAppendLabel"
- "font" "FontRegular12"
- "labelText" "%optional_append%"
- "textAlignment" "center"
- "xpos" "20"
- "ypos" "120"
- "zpos" "0"
- "wide" "360"
- "tall" "60"
- "autoResize" "1"
- "pinCorner" "0"
- "visible" "1"
- "enabled" "1"
- "fgcolor_override" "LightRed"
- }
-
- "CancelButton"
- {
- "ControlName" "CExButton"
- "fieldName" "CancelButton"
- "xpos" "50"
- "ypos" "200"
- "zpos" "1"
- "wide" "130"
- "tall" "25"
- "autoResize" "0"
- "pinCorner" "3"
- "visible" "1"
- "enabled" "1"
- "tabPosition" "0"
- "labelText" "#Cancel"
- "font" "HudFontSmall"
- "textAlignment" "center"
- "dulltext" "0"
- "brighttext" "0"
- "default" "0"
- "Command" "cancel"
- "sound_depressed" "UI/buttonclick.wav"
- "sound_released" "UI/buttonclickrelease.wav"
- }
-
- "OkButton"
- {
- "ControlName" "CExButton"
- "fieldName" "OkButton"
- "xpos" "220"
- "ypos" "200"
- "zpos" "1"
- "wide" "130"
- "tall" "25"
- "autoResize" "0"
- "pinCorner" "3"
- "visible" "1"
- "enabled" "1"
- "tabPosition" "0"
- "labelText" "#CraftNameConfirm"
- "font" "HudFontSmall"
- "textAlignment" "center"
- "dulltext" "0"
- "brighttext" "0"
- "default" "1"
- "Command" "apply"
- "sound_depressed" "UI/buttonclick.wav"
- "sound_released" "UI/buttonclickrelease.wav"
- }
-} \ No newline at end of file
diff --git a/resource/ui/econ/confirmapplygiftwrapdialog.res b/resource/ui/econ/confirmapplygiftwrapdialog.res
index 4d2a5d8..ea7e427 100644
--- a/resource/ui/econ/confirmapplygiftwrapdialog.res
+++ b/resource/ui/econ/confirmapplygiftwrapdialog.res
@@ -58,7 +58,7 @@
{
"ControlName" "CExLabel"
"fieldName" "TitleLabel"
- "font" "Cerbetica22"
+ "font" "HudFontMediumBold"
"labelText" "dynamic"
"textAlignment" "center"
"xpos" "100"
@@ -219,7 +219,7 @@
"ypos" "200"
"zpos" "1"
"wide" "130"
- "tall" "25"
+ "tall" "20"
"autoResize" "0"
"pinCorner" "3"
"visible" "1"
@@ -244,7 +244,7 @@
"ypos" "200"
"zpos" "1"
"wide" "130"
- "tall" "25"
+ "tall" "20"
"autoResize" "0"
"pinCorner" "3"
"visible" "1"
diff --git a/resource/ui/econ/confirmapplypaintcandialog.res b/resource/ui/econ/confirmapplypaintcandialog.res
index 1767a92..20a49e1 100644
--- a/resource/ui/econ/confirmapplypaintcandialog.res
+++ b/resource/ui/econ/confirmapplypaintcandialog.res
@@ -40,7 +40,7 @@
"font" "ItemFontAttribLarge"
"xpos" "0"
"ypos" "30"
- "zpos" "101"
+ "zpos" "2"
"wide" "140"
"tall" "60"
"autoResize" "0"
@@ -58,7 +58,7 @@
{
"ControlName" "CExLabel"
"fieldName" "TitleLabel"
- "font" "Cerbetica22"
+ "font" "HudFontMediumBold"
"labelText" "dynamic"
"textAlignment" "center"
"xpos" "100"
@@ -246,7 +246,7 @@
"ypos" "200"
"zpos" "1"
"wide" "130"
- "tall" "25"
+ "tall" "20"
"autoResize" "0"
"pinCorner" "3"
"visible" "1"
@@ -271,7 +271,7 @@
"ypos" "200"
"zpos" "1"
"wide" "130"
- "tall" "25"
+ "tall" "20"
"autoResize" "0"
"pinCorner" "3"
"visible" "1"
diff --git a/resource/ui/econ/confirmapplystrangepartapplicationdialog.res b/resource/ui/econ/confirmapplystrangepartapplicationdialog.res
index 3c8c1fa..92d0343 100644
--- a/resource/ui/econ/confirmapplystrangepartapplicationdialog.res
+++ b/resource/ui/econ/confirmapplystrangepartapplicationdialog.res
@@ -17,16 +17,16 @@
"mouseoveritempanel"
{
- "ControlName" "CItemModelPanel"
- "fieldName" "mouseoveritempanel"
- "xpos" "c-70"
- "ypos" "270"
- "zpos" "100"
- "wide" "300"
- "tall" "300"
- "visible" "0"
- "bgcolor_override" "Transparent"
- "noitem_textcolor" "TextColor"
+ "ControlName" "CItemModelPanel"
+ "fieldName" "mouseoveritempanel"
+ "xpos" "c-70"
+ "ypos" "270"
+ "zpos" "100"
+ "wide" "300"
+ "tall" "300"
+ "visible" "0"
+ "bgcolor_override" "Transparent"
+ "noitem_textcolor" "TextColor"
"PaintBackgroundType" "2"
"paintborder" "1"
"text_ypos" "20"
@@ -40,7 +40,7 @@
"font" "ItemFontAttribLarge"
"xpos" "0"
"ypos" "30"
- "zpos" "101"
+ "zpos" "2"
"wide" "140"
"tall" "60"
"autoResize" "0"
@@ -58,7 +58,7 @@
{
"ControlName" "CExLabel"
"fieldName" "TitleLabel"
- "font" "Cerbetica22"
+ "font" "HudFontMediumBold"
"labelText" "dynamic"
"textAlignment" "center"
"xpos" "100"
@@ -159,7 +159,7 @@
"model_ypos" "5"
"model_wide" "80"
"model_tall" "54"
- "text_ypos" "100" // Hide it off the bottom
+ "text_ypos" "100"
"text_center" "1"
"name_only" "1"
@@ -167,6 +167,7 @@
{
"use_item_rendertarget" "0"
"allow_rot" "0"
+ "inventory_image_type" "1"
}
}
@@ -197,7 +198,7 @@
"ypos" "200"
"zpos" "1"
"wide" "130"
- "tall" "25"
+ "tall" "20"
"autoResize" "0"
"pinCorner" "3"
"visible" "1"
@@ -222,7 +223,7 @@
"ypos" "200"
"zpos" "1"
"wide" "130"
- "tall" "25"
+ "tall" "20"
"autoResize" "0"
"pinCorner" "3"
"visible" "1"
diff --git a/resource/ui/econ/confirmapplystrangerestrictionapplicationdialog.res b/resource/ui/econ/confirmapplystrangerestrictionapplicationdialog.res
new file mode 100644
index 0000000..16edfa4
--- /dev/null
+++ b/resource/ui/econ/confirmapplystrangerestrictionapplicationdialog.res
@@ -0,0 +1,243 @@
+"Resource/UI/ConfirmApplyStrangeRestrictionApplicationDialog.res"
+{
+ "ConfirmApplyStrangeRestrictionApplicationDialog"
+ {
+ "fieldName" "ConfirmApplyStrangeRestrictionApplicationDialog"
+ "visible" "1"
+ "enabled" "1"
+ "xpos" "c-200"
+ "ypos" "c-200"
+ "wide" "400"
+ "tall" "240"
+ "bgcolor_override" "DarkGrey"
+ "paintbackgroundtype" "0"
+ "settitlebarvisible" "0"
+ "border" "CyanBorderThick"
+ }
+
+ "mouseoveritempanel"
+ {
+ "ControlName" "CItemModelPanel"
+ "fieldName" "mouseoveritempanel"
+ "xpos" "c-70"
+ "ypos" "270"
+ "zpos" "100"
+ "wide" "300"
+ "tall" "300"
+ "visible" "0"
+ "bgcolor_override" "Transparent"
+ "noitem_textcolor" "TextColor"
+ "PaintBackgroundType" "2"
+ "paintborder" "1"
+ "text_ypos" "20"
+ "text_center" "1"
+ "model_hide" "1"
+ "resize_to_text" "1"
+ "padding_height" "15"
+
+ "attriblabel"
+ {
+ "font" "ItemFontAttribLarge"
+ "xpos" "0"
+ "ypos" "30"
+ "zpos" "2"
+ "wide" "140"
+ "tall" "60"
+ "autoResize" "0"
+ "pinCorner" "0"
+ "visible" "1"
+ "enabled" "1"
+ "labelText" "%attriblist%"
+ "textAlignment" "center"
+ "fgcolor" "TextColor"
+ "centerwrap" "1"
+ }
+ }
+
+ "TitleLabel"
+ {
+ "ControlName" "CExLabel"
+ "fieldName" "TitleLabel"
+ "font" "HudFontMediumBold"
+ "labelText" "dynamic"
+ "textAlignment" "center"
+ "xpos" "100"
+ "ypos" "10"
+ "zpos" "0"
+ "wide" "200"
+ "tall" "60"
+ "autoResize" "1"
+ "pinCorner" "0"
+ "visible" "1"
+ "enabled" "1"
+ "centerwrap" "1"
+ }
+
+ "ToolBG"
+ {
+ "ControlName" "CExLabel"
+ "fieldName" "ToolBG"
+ "font" "HudFontSmallBold"
+ "labelText" ""
+ "textAlignment" "east"
+ "xpos" "10"
+ "ypos" "10"
+ "zpos" "-1"
+ "wide" "84"
+ "tall" "64"
+ "autoResize" "1"
+ "pinCorner" "0"
+ "visible" "1"
+ "enabled" "1"
+ "paintbackground" "0"
+ "border" "BackpackItemBorder_SelfMade"
+ }
+ "tool_modelpanel"
+ {
+ "ControlName" "CItemModelPanel"
+ "fieldName" "tool_modelpanel"
+ "xpos" "10"
+ "ypos" "10"
+ "zpos" "1"
+ "wide" "84"
+ "tall" "64"
+ "visible" "1"
+ "bgcolor_override" "Transparent"
+ "noitem_textcolor" "TextColor"
+ "PaintBackgroundType" "2"
+ "paintborder" "0"
+ "model_xpos" "2"
+ "model_ypos" "5"
+ "model_wide" "80"
+ "model_tall" "54"
+ "text_ypos" "100"
+ "text_center" "1"
+ "name_only" "1"
+ "paint_icon_hide" "1"
+
+ "itemmodelpanel"
+ {
+ "use_item_rendertarget" "0"
+ "allow_rot" "0"
+ "inventory_image_type" "1"
+ }
+ }
+ "SubjectBG"
+ {
+ "ControlName" "CExLabel"
+ "fieldName" "SubjectBG"
+ "font" "HudFontSmallBold"
+ "labelText" ""
+ "textAlignment" "east"
+ "xpos" "300"
+ "ypos" "10"
+ "zpos" "-1"
+ "wide" "84"
+ "tall" "64"
+ "autoResize" "1"
+ "pinCorner" "0"
+ "visible" "1"
+ "enabled" "1"
+ "paintbackground" "0"
+ "border" "BackpackItemBorder_Vintage"
+ }
+
+ "subject_modelpanel"
+ {
+ "ControlName" "CItemModelPanel"
+ "fieldName" "subject_modelpanel"
+ "xpos" "300"
+ "ypos" "10"
+ "zpos" "1"
+ "wide" "84"
+ "tall" "64"
+ "visible" "1"
+ "bgcolor_override" "Transparent"
+ "noitem_textcolor" "TextColor"
+ "PaintBackgroundType" "2"
+ "paintborder" "0"
+ "model_xpos" "2"
+ "model_ypos" "5"
+ "model_wide" "80"
+ "model_tall" "54"
+ "text_ypos" "100"
+ "text_center" "1"
+ "name_only" "1"
+
+ "itemmodelpanel"
+ {
+ "use_item_rendertarget" "0"
+ "allow_rot" "0"
+ "inventory_image_type" "1"
+ }
+ }
+
+ "ConfirmLabel"
+ {
+ "ControlName" "CExLabel"
+ "fieldName" "ConfirmLabel"
+ "font" "HudFontSmall"
+ "labelText" "#ToolStrangeRestrictionApplyConfirm"
+ "textAlignment" "center"
+ "xpos" "20"
+ "ypos" "80"
+ "zpos" "0"
+ "wide" "360"
+ "tall" "100"
+ "autoResize" "1"
+ "pinCorner" "0"
+ "visible" "1"
+ "enabled" "1"
+ "fgcolor_override" "Yellow"
+ }
+
+ "CancelButton"
+ {
+ "ControlName" "CExButton"
+ "fieldName" "CancelButton"
+ "xpos" "50"
+ "ypos" "200"
+ "zpos" "1"
+ "wide" "130"
+ "tall" "20"
+ "autoResize" "0"
+ "pinCorner" "3"
+ "visible" "1"
+ "enabled" "1"
+ "tabPosition" "0"
+ "labelText" "#Cancel"
+ "font" "HudFontSmall"
+ "textAlignment" "center"
+ "dulltext" "0"
+ "brighttext" "0"
+ "default" "0"
+ "Command" "cancel"
+ "sound_depressed" "UI/buttonclick.wav"
+ "sound_released" "UI/buttonclickrelease.wav"
+ }
+
+ "OkButton"
+ {
+ "ControlName" "CExButton"
+ "fieldName" "OkButton"
+ "xpos" "220"
+ "ypos" "200"
+ "zpos" "1"
+ "wide" "130"
+ "tall" "20"
+ "autoResize" "0"
+ "pinCorner" "3"
+ "visible" "1"
+ "enabled" "1"
+ "tabPosition" "0"
+ "labelText" "#CraftNameConfirm"
+ "font" "HudFontSmall"
+ "textAlignment" "center"
+ "dulltext" "0"
+ "brighttext" "0"
+ "default" "1"
+ "Command" "apply"
+ "sound_depressed" "UI/buttonclick.wav"
+ "sound_released" "UI/buttonclickrelease.wav"
+ }
+} \ No newline at end of file
diff --git a/resource/ui/econ/confirmapplystrangifierdialog.res b/resource/ui/econ/confirmapplystrangifierdialog.res
index f217734..b31c461 100644
--- a/resource/ui/econ/confirmapplystrangifierdialog.res
+++ b/resource/ui/econ/confirmapplystrangifierdialog.res
@@ -17,16 +17,16 @@
"mouseoveritempanel"
{
- "ControlName" "CItemModelPanel"
- "fieldName" "mouseoveritempanel"
- "xpos" "c-70"
- "ypos" "270"
- "zpos" "100"
- "wide" "300"
- "tall" "300"
- "visible" "0"
- "bgcolor_override" "Transparent"
- "noitem_textcolor" "TextColor"
+ "ControlName" "CItemModelPanel"
+ "fieldName" "mouseoveritempanel"
+ "xpos" "c-70"
+ "ypos" "270"
+ "zpos" "100"
+ "wide" "300"
+ "tall" "300"
+ "visible" "0"
+ "bgcolor_override" "Transparent"
+ "noitem_textcolor" "TextColor"
"PaintBackgroundType" "2"
"paintborder" "1"
"text_ypos" "20"
@@ -58,7 +58,7 @@
{
"ControlName" "CExLabel"
"fieldName" "TitleLabel"
- "font" "Cerbetica22"
+ "font" "HudFontMediumBold"
"labelText" "dynamic"
"textAlignment" "center"
"xpos" "100"
@@ -110,7 +110,7 @@
"model_ypos" "5"
"model_wide" "80"
"model_tall" "54"
- "text_ypos" "100" // Hide it off the bottom
+ "text_ypos" "100"
"text_center" "1"
"name_only" "1"
"paint_icon_hide" "1"
@@ -141,6 +141,7 @@
"paintbackground" "0"
"border" "BackpackItemBorder_Vintage"
}
+
"subject_modelpanel"
{
"ControlName" "CItemModelPanel"
@@ -159,7 +160,7 @@
"model_ypos" "5"
"model_wide" "80"
"model_tall" "54"
- "text_ypos" "100" // Hide it off the bottom
+ "text_ypos" "100"
"text_center" "1"
"name_only" "1"
@@ -167,6 +168,7 @@
{
"use_item_rendertarget" "0"
"allow_rot" "0"
+ "inventory_image_type" "1"
}
}
@@ -198,7 +200,7 @@
"ypos" "200"
"zpos" "1"
"wide" "130"
- "tall" "25"
+ "tall" "20"
"autoResize" "0"
"pinCorner" "3"
"visible" "1"
@@ -223,7 +225,7 @@
"ypos" "200"
"zpos" "1"
"wide" "130"
- "tall" "25"
+ "tall" "20"
"autoResize" "0"
"pinCorner" "3"
"visible" "1"
diff --git a/resource/ui/econ/confirmapplyteamcolorpaintcandialog.res b/resource/ui/econ/confirmapplyteamcolorpaintcandialog.res
index 507eb6a..a088d91 100644
--- a/resource/ui/econ/confirmapplyteamcolorpaintcandialog.res
+++ b/resource/ui/econ/confirmapplyteamcolorpaintcandialog.res
@@ -17,16 +17,16 @@
"mouseoveritempanel"
{
- "ControlName" "CItemModelPanel"
- "fieldName" "mouseoveritempanel"
- "xpos" "c-70"
- "ypos" "270"
- "zpos" "100"
- "wide" "300"
- "tall" "300"
- "visible" "0"
- "bgcolor_override" "Transparent"
- "noitem_textcolor" "TextColor"
+ "ControlName" "CItemModelPanel"
+ "fieldName" "mouseoveritempanel"
+ "xpos" "c-70"
+ "ypos" "270"
+ "zpos" "100"
+ "wide" "300"
+ "tall" "300"
+ "visible" "0"
+ "bgcolor_override" "Transparent"
+ "noitem_textcolor" "TextColor"
"PaintBackgroundType" "2"
"paintborder" "1"
"text_ypos" "20"
@@ -40,7 +40,7 @@
"font" "ItemFontAttribLarge"
"xpos" "0"
"ypos" "30"
- "zpos" "101"
+ "zpos" "2"
"wide" "140"
"tall" "60"
"autoResize" "0"
@@ -58,7 +58,7 @@
{
"ControlName" "CExLabel"
"fieldName" "TitleLabel"
- "font" "Cerbetica26"
+ "font" "HudFontMediumBold"
"labelText" "dynamic"
"textAlignment" "center"
"xpos" "100"
@@ -266,7 +266,7 @@
"pinCorner" "0"
"visible" "0"
"enabled" "1"
- "fgcolor_override" "ColorCyan"
+ "fgcolor_override" "Yellow"
}
"CancelButton"
@@ -277,7 +277,7 @@
"ypos" "200"
"zpos" "1"
"wide" "130"
- "tall" "25"
+ "tall" "20"
"autoResize" "0"
"pinCorner" "3"
"visible" "1"
@@ -302,7 +302,7 @@
"ypos" "200"
"zpos" "1"
"wide" "130"
- "tall" "25"
+ "tall" "20"
"autoResize" "0"
"pinCorner" "3"
"visible" "1"
diff --git a/resource/ui/econ/confirmcustomizetexturedialog.res b/resource/ui/econ/confirmcustomizetexturedialog.res
index 9c30c6c..b5e3696 100644
--- a/resource/ui/econ/confirmcustomizetexturedialog.res
+++ b/resource/ui/econ/confirmcustomizetexturedialog.res
@@ -2,18 +2,17 @@
{
"ConfirmCustomizeTextureDialog"
{
- "fieldName" "ConfirmCustomizeTextureDialog"
- "visible" "1"
- "enabled" "1"
- "xpos" "c-280"
- "ypos" "c-225"
- "wide" "560"
- "tall" "345"
- "settitlebarvisible" "0"
- "paintborder" "2"
- "paintbackground" "1"
- "border" "CyanBorderThick"
- "bgcolor_override" "25 25 25 255"
+ "fieldName" "ConfirmCustomizeTextureDialog"
+ "visible" "1"
+ "enabled" "1"
+ "xpos" "c-280"
+ "ypos" "c-225"
+ "wide" "560"
+ "tall" "345"
+ "bgcolor_override" "DarkGrey"
+ "paintbackgroundtype" "0"
+ "settitlebarvisible" "0"
+ "border" "CyanBorderThick"
}
"mouseoveritempanel"
@@ -28,183 +27,159 @@
"visible" "0"
"bgcolor_override" "Transparent"
"noitem_textcolor" "TextColor"
- "PaintBackgroundType" "0"
- "paintborder" "0"
+ "PaintBackgroundType" "2"
+ "paintborder" "1"
"text_ypos" "20"
"text_center" "1"
"model_hide" "1"
"resize_to_text" "1"
"padding_height" "15"
- "BackColor"
- {
- "ControlName" "EditablePanel"
- "fieldName" "BackColor"
- "xpos" "0"
- "ypos" "0"
- "zpos" "-1"
- "wide" "f0"
- "tall" "f0"
- "visible" "1"
- "enabled" "1"
- "pinCorner" "0"
- "autoResize" "0"
- "PaintBackgroundType" "1"
- "border" "NoBorder"
- "bgcolor_override" "35 35 35 255"
-
- "attriblabel"
- {
- "font" "ItemFontAttribLarge"
- "xpos" "0"
- "ypos" "30"
- "zpos" "101"
- "wide" "140"
- "tall" "60"
- "autoResize" "0"
- "pinCorner" "0"
- "visible" "1"
- "enabled" "1"
- "labelText" "%attriblist%"
- "textAlignment" "center"
- "fgcolor" "TextColor"
- "centerwrap" "1"
- }
- }
+ "attriblabel"
+ {
+ "font" "ItemFontAttribLarge"
+ "xpos" "0"
+ "ypos" "30"
+ "zpos" "2"
+ "wide" "140"
+ "tall" "60"
+ "labelText" "%attriblist%"
+ "textAlignment" "center"
+ "fgcolor" "TextColor"
+ "centerwrap" "1"
+ }
}
"ToolBG"
{
- "ControlName" "CExLabel"
- "fieldName" "ToolBG"
- "font" "HudFontSmallBold"
- "labelText" ""
- "textAlignment" "east"
- "xpos" "10"
- "ypos" "10"
- "zpos" "-1"
- "wide" "84"
- "tall" "64"
- "paintbackground" "0"
- "border" "BackpackItemBorder_SelfMade"
+ "ControlName" "CExLabel"
+ "fieldName" "ToolBG"
+ "font" "HudFontSmallBold"
+ "labelText" ""
+ "textAlignment" "east"
+ "xpos" "10"
+ "ypos" "10"
+ "zpos" "-1"
+ "wide" "84"
+ "tall" "64"
+ "paintbackground" "0"
+ "border" "BackpackItemBorder_SelfMade"
}
-
"tool_icon"
{
- "ControlName" "ScalableImagePanel"
- "fieldName" "tool_icon"
- "xpos" "10"
- "ypos" "10"
- "zpos" "2"
- "wide" "16"
- "tall" "16"
- "visible" "1"
- "enabled" "1"
- "image" "backpack_jewel_modify_target_b_g"
- "tileImage" "0"
- "tileVertically" "0"
- "drawcolor" "112 176 74 255"
- }
-
+ "ControlName" "ScalableImagePanel"
+ "fieldName" "tool_icon"
+ "xpos" "10"
+ "ypos" "10"
+ "zpos" "2"
+ "wide" "16"
+ "tall" "16"
+ "visible" "1"
+ "enabled" "1"
+ "image" "backpack_jewel_modify_target_b_g"
+ "tileImage" "0"
+ "tileVertically" "0"
+ "drawcolor" "112 176 74 255"
+ }
"tool_modelpanel"
{
- "ControlName" "CItemModelPanel"
- "fieldName" "tool_modelpanel"
- "xpos" "10"
- "ypos" "10"
- "zpos" "1"
- "wide" "84"
- "tall" "64"
- "visible" "1"
- "bgcolor_override" "Transparent"
- "noitem_textcolor" "TextColor"
+ "ControlName" "CItemModelPanel"
+ "fieldName" "tool_modelpanel"
+ "xpos" "10"
+ "ypos" "10"
+ "zpos" "1"
+ "wide" "84"
+ "tall" "64"
+ "visible" "1"
+ "bgcolor_override" "Transparent"
+ "noitem_textcolor" "TextColor"
"PaintBackgroundType" "2"
- "paintborder" "0"
- "model_xpos" "2"
- "model_ypos" "5"
- "model_wide" "80"
- "model_tall" "54"
- "text_ypos" "100"
- "text_center" "1"
- "name_only" "1"
- "paint_icon_hide" "1"
+ "paintborder" "0"
+ "model_xpos" "2"
+ "model_ypos" "5"
+ "model_wide" "80"
+ "model_tall" "54"
+ "text_ypos" "100"
+ "text_center" "1"
+ "name_only" "1"
+ "paint_icon_hide" "1"
"itemmodelpanel"
{
"use_item_rendertarget" "0"
"allow_rot" "0"
+ "inventory_image_type" "1"
}
}
"TitleLabel"
{
- "ControlName" "CExLabel"
- "fieldName" "TitleLabel"
- "font" "Cerbetica32"
- "labelText" "dynamic"
- "textAlignment" "center"
- "xpos" "100"
- "ypos" "10"
- "zpos" "0"
- "wide" "365"
- "tall" "60"
- "centerwrap" "1"
+ "ControlName" "CExLabel"
+ "fieldName" "TitleLabel"
+ "font" "HudFontMediumBold"
+ "labelText" "dynamic"
+ "textAlignment" "center"
+ "xpos" "100"
+ "ypos" "10"
+ "zpos" "0"
+ "wide" "365"
+ "tall" "60"
+ "centerwrap" "1"
}
"SubjectBG"
{
- "ControlName" "CExLabel"
- "fieldName" "SubjectBG"
- "font" "HudFontSmallBold"
- "labelText" ""
- "textAlignment" "east"
- "xpos" "465"
- "ypos" "10"
- "zpos" "-1"
- "wide" "84"
- "tall" "64"
- "paintbackground" "0"
- "border" "BackpackItemBorder_3"
+ "ControlName" "CExLabel"
+ "fieldName" "SubjectBG"
+ "font" "HudFontSmallBold"
+ "labelText" ""
+ "textAlignment" "east"
+ "xpos" "465"
+ "ypos" "10"
+ "zpos" "-1"
+ "wide" "84"
+ "tall" "64"
+ "paintbackground" "0"
+ "border" "BackpackItemBorder_3"
}
-
"subject_icon"
{
- "ControlName" "ScalableImagePanel"
- "fieldName" "subject_icon"
- "xpos" "465"
- "ypos" "10"
- "zpos" "2"
- "wide" "16"
- "tall" "16"
- "visible" "1"
- "enabled" "1"
- "image" "backpack_jewel_modify_target_b_g"
- "tileImage" "0"
- "tileVertically" "0"
- "drawcolor" "71 98 145 255"
+ "ControlName" "ScalableImagePanel"
+ "fieldName" "subject_icon"
+ "xpos" "465"
+ "ypos" "10"
+ "zpos" "2"
+ "wide" "16"
+ "tall" "16"
+ "visible" "1"
+ "enabled" "1"
+ "image" "backpack_jewel_modify_target_b_g"
+ "tileImage" "0"
+ "tileVertically" "0"
+ "drawcolor" "71 98 145 255"
}
"subject_modelpanel"
{
- "ControlName" "CItemModelPanel"
- "fieldName" "subject_modelpanel"
- "xpos" "465"
- "ypos" "10"
- "zpos" "1"
- "wide" "84"
- "tall" "64"
- "visible" "1"
- "bgcolor_override" "Transparent"
- "noitem_textcolor" "TextColor"
+ "ControlName" "CItemModelPanel"
+ "fieldName" "subject_modelpanel"
+ "xpos" "465"
+ "ypos" "10"
+ "zpos" "1"
+ "wide" "84"
+ "tall" "64"
+ "visible" "1"
+ "bgcolor_override" "Transparent"
+ "noitem_textcolor" "TextColor"
"PaintBackgroundType" "2"
- "paintborder" "0"
- "model_xpos" "2"
- "model_ypos" "5"
- "model_wide" "80"
- "model_tall" "54"
- "text_ypos" "100"
- "text_center" "1"
- "name_only" "1"
+ "paintborder" "0"
+ "model_xpos" "2"
+ "model_ypos" "5"
+ "model_wide" "80"
+ "model_tall" "54"
+ "text_ypos" "100"
+ "text_center" "1"
+ "name_only" "1"
"itemmodelpanel"
{
@@ -213,26 +188,30 @@
}
}
+ // Dynamically sized and moded based on the current page
"paint_model"
{
- "ControlName" "CItemModelPanel"
- "fieldName" "paint_model"
- "xpos" "275"
- "ypos" "20"
- "zpos" "100"
- "wide" "160"
- "tall" "160"
- "visible" "1"
- "bgcolor_override" "Transparent"
- "noitem_textcolor" "TextColor"
- "paintborder" "0"
- "model_xpos" "00"
- "model_ypos" "00"
- "model_wide" "160"
- "model_tall" "160"
+ "ControlName" "CItemModelPanel"
+ "fieldName" "paint_model"
+ "xpos" "275"
+ "ypos" "20"
+ "zpos" "100"
+ "wide" "160"
+ "tall" "160"
+ "visible" "1"
+ "bgcolor_override" "0 0 0 0"
+ "noitem_textcolor" "117 107 94 255"
+ //"PaintBackgroundType" "2"
+ "paintborder" "0"
+ "model_xpos" "00"
+ "model_ypos" "00"
+ "model_wide" "160"
+ "model_tall" "160"
+ //"text_ypos" "1"
+ //"text_center" "1"
+ //"name_only" "1"
"model_only" "1"
- "paint_icon_hide" "1"
-
+ "paint_icon_hide" "1"
"itemmodelpanel"
{
"force_use_model" "1"
@@ -241,65 +220,70 @@
}
}
+ // ----------------------------
"SelectImagePage"
{
- "ControlName" "EditablePanel"
- "fieldName" "SelectImagePage"
- "xpos" "10"
- "ypos" "80"
- "wide" "540"
- "tall" "260"
- "visible" "1"
- "enabled" "1"
+ "ControlName" "EditablePanel"
+ "fieldName" "SelectImagePage"
+ "xpos" "10"
+ "ypos" "80"
+ "wide" "540"
+ "tall" "260"
+ "visible" "1"
+ "enabled" "1"
"PageTitleLabel"
{
- "ControlName" "CExLabel"
- "fieldName" "PageTitleLabel"
- "font" "HudFontMediumSmall"
- "labelText" "#ToolCustomizeTextureStep1"
- "textAlignment" "north-west"
- "xpos" "0"
- "ypos" "0"
- "zpos" "0"
- "wide" "540"
- "tall" "20"
+ "ControlName" "CExLabel"
+ "fieldName" "PageTitleLabel"
+ "font" "HudFontMediumSmall"
+ "labelText" "#ToolCustomizeTextureStep1"
+ "textAlignment" "north-west"
+ "xpos" "0"
+ "ypos" "0"
+ "zpos" "0"
+ "wide" "540"
+ "tall" "20"
}
+
"ImagePaletteGroupBox"
{
"ControlName" "EditablePanel"
- "fieldName" "ImagePaletteGroupBox"
- "xpos" "0"
- "ypos" "25"
- "zpos" "-1"
- "wide" "350"
- "tall" "200"
- "border" "GrayDialogBorder"
+ "fieldName" "ImagePaletteGroupBox"
+ "xpos" "0"
+ "ypos" "25"
+ "zpos" "-1"
+ "wide" "350"
+ "tall" "200"
+ "border" "GrayDialogBorder"
+ "bgcolor_override" "DarkGrey"
"UseAvatarRadio"
{
- "ControlName" "RadioButton"
- "fieldName" "UseAvatarRadio"
- "xpos" "10"
- "ypos" "10"
- "wide" "330"
- "tall" "20"
+ "ControlName" "RadioButton"
+ "fieldName" "UseAvatarRadio"
+ "xpos" "10"
+ "ypos" "10"
+ "wide" "330"
+ "tall" "20"
"labelText" "#ToolCustomizeTextureUseAvatarImage"
- "textAlignment" "west"
+ "textAlignment" "west"
"font" "HudFontSmallBold"
}
+
"UseAnyImageRadio"
{
- "ControlName" "RadioButton"
- "fieldName" "UseAnyImageRadio"
- "xpos" "10"
- "ypos" "80"
- "wide" "330"
- "tall" "20"
+ "ControlName" "RadioButton"
+ "fieldName" "UseAnyImageRadio"
+ "xpos" "10"
+ "ypos" "80"
+ "wide" "330"
+ "tall" "20"
"labelText" "#ToolCustomizeTextureUseAnyImage"
- "textAlignment" "west"
+ "textAlignment" "west"
"font" "HudFontSmallBold"
}
+
"BrowseForNewImageButton"
{
"ControlName" "CExButton"
@@ -310,73 +294,72 @@
"wide" "300"
"tall" "20"
"labelText" "#ToolCustomizeTextureBrowseButton"
- "font" "HudFontSmall"
+ "font" "HudFontSmallBold"
"Command" "pick_image"
"sound_depressed" "UI/buttonclick.wav"
"sound_released" "UI/buttonclickrelease.wav"
- "paintbackground" "1"
- "defaultBgColor_override" "15 15 15 255"
- "armedBgColor_override" "25 25 25 255"
- "depressedBgColor_override" "25 25 25 255"
- "defaultFgColor_override" "TanLight"
- "armedFgColor_override" "TanLight"
- "depressedFgColor_override" "TanLight"
- "border_default" "ButtonHover"
- "border_armed" "ButtonHover"
}
+
"ForBestResultsLabel"
{
- "ControlName" "CExLabel"
+ "ControlName" "CExLabel"
"fieldName" "ForBestResultsLabel"
"font" "HudFontSmall"
- "xpos" "40"
- "ypos" "140"
- "wide" "300"
- "tall" "40"
+ "xpos" "40"
+ "ypos" "140"
+ "wide" "300"
+ "tall" "40"
"labelText" "#ToolCustomizeTextureBestResults"
"textAlignment" "north-west"
- "wrap" "1"
+ "wrap" "1"
}
}
+
"PreviewImageGroupBox"
{
- "ControlName" "EditablePanel"
+ "ControlName" "EditablePanel"
"fieldName" "PreviewImageGroupBox"
- "xpos" "360"
- "ypos" "25"
- "zpos" "-1"
- "wide" "180"
- "tall" "200"
+ "xpos" "360"
+ "ypos" "25"
+ "zpos" "-1"
+ "wide" "180"
+ "tall" "200"
"border" "GrayDialogBorder"
+ "bgcolor_override" "DarkGrey"
"PreviewCroppedImage"
{
- "ControlName" "CRGBAImagePanel"
+ "ControlName" "CRGBAImagePanel"
"fieldName" "PreviewCroppedImage"
- "xpos" "20"
- "ypos" "20"
- "zpos" "-1"
- "wide" "140"
- "tall" "140"
+ "xpos" "20"
+ "ypos" "20"
+ "zpos" "-1"
+ "wide" "140"
+ "tall" "140"
}
+
"SquarizeComboBox"
{
- "ControlName" "ComboBox"
+ "ControlName" "ComboBox"
"fieldName" "SquarizeComboBox"
- "xpos" "20"
- "ypos" "170"
- "zpos" "-1"
- "wide" "140"
- "tall" "15"
+ "xpos" "20"
+ "ypos" "170"
+ "zpos" "-1"
+ "wide" "140"
+ "tall" "15"
"editable" "0"
"font" "HudFontSmall"
- "bgcolor_override" "ColorBlack"
- "disabledBgColor_override" "ColorBlack"
- "selectionColor_override" "ColorBlack"
- "selectionTextColor_override" "TanLight"
- "defaultSelectionBG2Color_override" "Transparent"
+
+ //"fgcolor_override" "235 226 202 255"
+ "bgcolor_override" "0 0 0 255"
+ //"disabledFgColor_override" "235 226 202 255"
+ "disabledBgColor_override" "0 0 0 255"
+ "selectionColor_override" "0 0 0 255"
+ "selectionTextColor_override" "235 226 202 255"
+ "defaultSelectionBG2Color_override" "0 0 0 0"
}
}
+
"CancelButton"
{
"ControlName" "CExButton"
@@ -392,16 +375,8 @@
"Command" "cancel"
"sound_depressed" "UI/buttonclick.wav"
"sound_released" "UI/buttonclickrelease.wav"
- "paintbackground" "1"
- "defaultBgColor_override" "15 15 15 255"
- "armedBgColor_override" "25 25 25 255"
- "depressedBgColor_override" "25 25 25 255"
- "defaultFgColor_override" "TanLight"
- "armedFgColor_override" "TanLight"
- "depressedFgColor_override" "TanLight"
- "border_default" "ButtonHover"
- "border_armed" "ButtonHover"
}
+
"NextButton"
{
"ControlName" "CExButton"
@@ -417,18 +392,10 @@
"Command" "next_page"
"sound_depressed" "UI/buttonclick.wav"
"sound_released" "UI/buttonclickrelease.wav"
- "paintbackground" "1"
- "defaultBgColor_override" "15 15 15 255"
- "armedBgColor_override" "25 25 25 255"
- "depressedBgColor_override" "25 25 25 255"
- "defaultFgColor_override" "TanLight"
- "armedFgColor_override" "TanLight"
- "depressedFgColor_override" "TanLight"
- "border_default" "ButtonHover"
- "border_armed" "ButtonHover"
}
}
+ // ----------------------------
"AdjustFilterPage"
{
"ControlName" "EditablePanel"
@@ -453,109 +420,119 @@
"wide" "540"
"tall" "20"
}
+
"FilterOptionsGroupBox"
{
- "ControlName" "EditablePanel"
+ "ControlName" "EditablePanel"
"fieldName" "SelectFilterGroupBox"
- "Font" "HudFontSmallestBold"
- "xpos" "0"
- "ypos" "25"
- "zpos" "-1"
- "wide" "160"
- "tall" "200"
+ "Font" "HudFontSmallestBold"
+ "xpos" "0"
+ "ypos" "25"
+ "zpos" "-1"
+ "wide" "160"
+ "tall" "200"
"border" "GrayDialogBorder"
+ "bgcolor_override" "DarkGrey"
"FilterLabel"
{
- "ControlName" "CExLabel"
+ "ControlName" "CExLabel"
"fieldName" "FilterLabel"
"font" "HudFontSmallBold"
- "xpos" "10"
- "ypos" "10"
- "wide" "140"
- "tall" "20"
- "labelText" "Filter:"
+ "xpos" "10"
+ "ypos" "10"
+ "wide" "140"
+ "tall" "20"
+ "labelText" "Filter:" // !FIXME! Localize
"textAlignment" "north-west"
- "visible" "0"
+ "visible" "0"
}
+
"FilterComboBox"
{
- "ControlName" "ComboBox"
+ "ControlName" "ComboBox"
"fieldName" "FilterComboBox"
- "xpos" "10"
- "ypos" "30"
- "zpos" "-1"
- "wide" "140"
- "tall" "15"
+ "xpos" "10"
+ "ypos" "30"
+ "zpos" "-1"
+ "wide" "140"
+ "tall" "15"
"editable" "0"
"font" "HudFontSmall"
- "visible" "0"
- "bgcolor_override" "ColorBlack"
- "disabledBgColor_override" "ColorBlack"
- "selectionColor_override" "ColorBlack"
- "selectionTextColor_override" "TanLight"
- "defaultSelectionBG2Color_override" "Transparent"
+ "visible" "0"
+
+ //"fgcolor_override" "235 226 202 255"
+ "bgcolor_override" "0 0 0 255"
+ //"disabledFgColor_override" "235 226 202 255"
+ "disabledBgColor_override" "0 0 0 255"
+ "selectionColor_override" "0 0 0 255"
+ "selectionTextColor_override" "235 226 202 255"
+ "defaultSelectionBG2Color_override" "0 0 0 0"
}
+
"PainterlyOptions"
{
- "ControlName" "EditablePanel"
+ "ControlName" "EditablePanel"
"fieldName" "PainterlyOptions"
- "xpos" "10"
- "ypos" "50"
- "zpos" "-1"
- "wide" "140"
- "tall" "150"
+ "xpos" "10"
+ "ypos" "50"
+ "zpos" "-1"
+ "wide" "140"
+ "tall" "150"
"FilterDescriptionLabel"
{
- "ControlName" "CExLabel"
+ "ControlName" "CExLabel"
"fieldName" "FilterDescriptionLabel"
- "xpos" "0"
- "ypos" "0"
- "wide" "140"
- "tall" "80"
+ "xpos" "0"
+ "ypos" "0"
+ "wide" "140"
+ "tall" "80"
"labelText" "#ToolCustomizeTexturePainterlyDescription"
"textAlignment" "north-west"
"font" "HudFontSmall"
"wrap" "1"
}
}
+
"StencilOptions"
{
- "ControlName" "EditablePanel"
+ "ControlName" "EditablePanel"
"fieldName" "StencilOptions"
- "xpos" "10"
- "ypos" "50"
- "zpos" "-1"
- "wide" "140"
- "tall" "150"
+ "xpos" "10"
+ "ypos" "50"
+ "zpos" "-1"
+ "wide" "140"
+ "tall" "150"
"FilterDescriptionLabel"
{
- "ControlName" "CExLabel"
+ "ControlName" "CExLabel"
"fieldName" "FilterDescriptionLabel"
- "xpos" "0"
- "ypos" "0"
- "wide" "120"
- "tall" "60"
+ "xpos" "0"
+ "ypos" "0"
+ "wide" "120"
+ "tall" "60"
"labelText" "#ToolCustomizeTextureStencilDescription"
"textAlignment" "north-west"
"font" "HudFontSmall"
"wrap" "1"
- "visible" "0"
+ "visible" "0"
}
+
"ColorPaletteLabel"
{
- "ControlName" "CExLabel"
+ "ControlName" "CExLabel"
"fieldName" "ColorPaletteLabel"
- "xpos" "0"
- "ypos" "60"
- "wide" "140"
- "tall" "15"
+ "xpos" "0"
+ "ypos" "60"
+ "wide" "140"
+ "tall" "15"
"labelText" "#ToolCustomizeTextureColorPalette"
"textAlignment" "north-west"
"font" "HudFontSmallBold"
}
+
"PrevStencilPaletteButton"
{
"ControlName" "CExButton"
@@ -566,21 +543,13 @@
"wide" "65"
"tall" "15"
"labelText" "<<"
- "font" "HudFontSmall"
+ "font" "HudFontSmallBold"
"textAlignment" "center"
"Command" "prev_stencil_palette"
"sound_depressed" "UI/buttonclick.wav"
"sound_released" "UI/buttonclickrelease.wav"
- "paintbackground" "1"
- "defaultBgColor_override" "15 15 15 255"
- "armedBgColor_override" "25 25 25 255"
- "depressedBgColor_override" "25 25 25 255"
- "defaultFgColor_override" "TanLight"
- "armedFgColor_override" "TanLight"
- "depressedFgColor_override" "TanLight"
- "border_default" "ButtonHover"
- "border_armed" "ButtonHover"
}
+
"NextStencilPaletteButton"
{
"ControlName" "CExButton"
@@ -591,21 +560,13 @@
"wide" "65"
"tall" "15"
"labelText" ">>"
- "font" "HudFontSmall"
+ "font" "HudFontSmallBold"
"textAlignment" "center"
"Command" "next_stencil_palette"
"sound_depressed" "UI/buttonclick.wav"
"sound_released" "UI/buttonclickrelease.wav"
- "paintbackground" "1"
- "defaultBgColor_override" "15 15 15 255"
- "armedBgColor_override" "25 25 25 255"
- "depressedBgColor_override" "25 25 25 255"
- "defaultFgColor_override" "TanLight"
- "armedFgColor_override" "TanLight"
- "depressedFgColor_override" "TanLight"
- "border_default" "ButtonHover"
- "border_armed" "ButtonHover"
}
+
"StencilGradientMap"
{
"ControlName" "CustomTextureStencilGradientMapWidget"
@@ -616,57 +577,65 @@
"wide" "140"
"tall" "20"
}
+
"StencilModeComboBox"
{
- "ControlName" "ComboBox"
+ "ControlName" "ComboBox"
"fieldName" "StencilModeComboBox"
- "xpos" "0"
- "ypos" "125"
- "zpos" "-1"
- "wide" "140"
- "tall" "15"
+ "xpos" "0"
+ "ypos" "125"
+ "zpos" "-1"
+ "wide" "140"
+ "tall" "15"
"editable" "0"
"font" "HudFontSmall"
- "bgcolor_override" "ColorBlack"
- "disabledBgColor_override" "ColorBlack"
- "selectionColor_override" "ColorBlack"
- "selectionTextColor_override" "TanLight"
- "defaultSelectionBG2Color_override" "Transparent"
+
+ //"fgcolor_override" "235 226 202 255"
+ "bgcolor_override" "0 0 0 255"
+ //"disabledFgColor_override" "235 226 202 255"
+ "disabledBgColor_override" "0 0 0 255"
+ "selectionColor_override" "0 0 0 255"
+ "selectionTextColor_override" "235 226 202 255"
+ "defaultSelectionBG2Color_override" "0 0 0 0"
}
}
}
+
"PreviewImageGroupBox"
{
- "ControlName" "EditablePanel"
+ "ControlName" "EditablePanel"
"fieldName" "PreviewImageGroupBox"
- "xpos" "170"
- "ypos" "25"
- "zpos" "-1"
- "wide" "180"
- "tall" "200"
+ "xpos" "170"
+ "ypos" "25"
+ "zpos" "-1"
+ "wide" "180"
+ "tall" "200"
"border" "GrayDialogBorder"
+ "bgcolor_override" "DarkGrey"
"PreviewFilteredImage"
{
- "ControlName" "CRGBAImagePanel"
+ "ControlName" "CRGBAImagePanel"
"fieldName" "PreviewFilteredImage"
- "xpos" "20"
- "ypos" "30"
- "zpos" "-1"
- "wide" "140"
- "tall" "140"
+ "xpos" "20"
+ "ypos" "30"
+ "zpos" "-1"
+ "wide" "140"
+ "tall" "140"
}
}
+
"PreviewModelGroupBox"
{
- "ControlName" "EditablePanel"
+ "ControlName" "EditablePanel"
"fieldName" "PreviewModelGroupBox"
- "xpos" "360"
- "ypos" "25"
- "zpos" "-1"
- "wide" "180"
- "tall" "200"
+ "xpos" "360"
+ "ypos" "25"
+ "zpos" "-1"
+ "wide" "180"
+ "tall" "200"
"border" "GrayDialogBorder"
+ "bgcolor_override" "DarkGrey"
"GradientBgPanel"
{
@@ -683,14 +652,15 @@
"image" "loadout_bottom_gradient"
"border" "ButtonBorder"
"paintbackgroundtype" "2"
- "paintbackground" "1"
+ "paintbackground" "1"
}
+
"DragToRotateLabel"
{
"ControlName" "CExLabel"
"fieldName" "DragToRotateLabel"
"font" "HudFontSmall"
- "labelText" "#ToolCustomizeTextureDragToRotate"
+ "labelText" "#Store_PreviewItem"
"textAlignment" "center"
"xpos" "10"
"ypos" "170"
@@ -700,6 +670,7 @@
"centerwrap" "1"
}
}
+
"CancelButton"
{
"ControlName" "CExButton"
@@ -715,16 +686,8 @@
"Command" "cancel"
"sound_depressed" "UI/buttonclick.wav"
"sound_released" "UI/buttonclickrelease.wav"
- "paintbackground" "1"
- "defaultBgColor_override" "15 15 15 255"
- "armedBgColor_override" "25 25 25 255"
- "depressedBgColor_override" "25 25 25 255"
- "defaultFgColor_override" "TanLight"
- "armedFgColor_override" "TanLight"
- "depressedFgColor_override" "TanLight"
- "border_default" "ButtonHover"
- "border_armed" "ButtonHover"
}
+
"BackButton"
{
"ControlName" "CExButton"
@@ -740,16 +703,8 @@
"Command" "prev_page"
"sound_depressed" "UI/buttonclick.wav"
"sound_released" "UI/buttonclickrelease.wav"
- "paintbackground" "1"
- "defaultBgColor_override" "15 15 15 255"
- "armedBgColor_override" "25 25 25 255"
- "depressedBgColor_override" "25 25 25 255"
- "defaultFgColor_override" "TanLight"
- "armedFgColor_override" "TanLight"
- "depressedFgColor_override" "TanLight"
- "border_default" "ButtonHover"
- "border_armed" "ButtonHover"
}
+
"NextButton"
{
"ControlName" "CExButton"
@@ -765,18 +720,10 @@
"Command" "next_page"
"sound_depressed" "UI/buttonclick.wav"
"sound_released" "UI/buttonclickrelease.wav"
- "paintbackground" "1"
- "defaultBgColor_override" "15 15 15 255"
- "armedBgColor_override" "25 25 25 255"
- "depressedBgColor_override" "25 25 25 255"
- "defaultFgColor_override" "TanLight"
- "armedFgColor_override" "TanLight"
- "depressedFgColor_override" "TanLight"
- "border_default" "ButtonHover"
- "border_armed" "ButtonHover"
}
}
+ // ----------------------------
"FinalConfirmPage"
{
"ControlName" "EditablePanel"
@@ -799,42 +746,46 @@
"wide" "540"
"tall" "20"
}
+
"WarningTextGroupBox"
{
- "ControlName" "EditablePanel"
+ "ControlName" "EditablePanel"
"fieldName" "WarningTextGroupBox"
- "Font" "HudFontSmallestBold"
- "xpos" "0"
- "ypos" "25"
- "zpos" "-1"
- "wide" "350"
- "tall" "200"
+ "Font" "HudFontSmallestBold"
+ "xpos" "0"
+ "ypos" "25"
+ "zpos" "-1"
+ "wide" "350"
+ "tall" "200"
"border" "GrayDialogBorder"
+ "bgcolor_override" "DarkGrey"
"WarningText"
{
- "ControlName" "CExLabel"
+ "ControlName" "CExLabel"
"fieldName" "WarningText"
"font" "HudFontSmall"
- "xpos" "10"
- "ypos" "10"
- "wide" "330"
- "tall" "180"
+ "xpos" "10"
+ "ypos" "10"
+ "wide" "330"
+ "tall" "180"
"labelText" "#ToolCustomizeTextureConfirmWarning"
"textAlignment" "west"
- "wrap" "1"
+ "wrap" "1"
}
}
+
"PreviewModelGroupBox"
{
- "ControlName" "EditablePanel"
+ "ControlName" "EditablePanel"
"fieldName" "PreviewModelGroupBox"
- "xpos" "360"
- "ypos" "25"
- "zpos" "-1"
- "wide" "180"
- "tall" "200"
+ "xpos" "360"
+ "ypos" "25"
+ "zpos" "-1"
+ "wide" "180"
+ "tall" "200"
"border" "GrayDialogBorder"
+ "bgcolor_override" "DarkGrey"
"GradientBgPanel"
{
@@ -851,8 +802,9 @@
"image" "loadout_bottom_gradient"
"border" "ButtonBorder"
"paintbackgroundtype" "2"
- "paintbackground" "1"
+ "paintbackground" "1"
}
+
"DragToRotateLabel"
{
"ControlName" "CExLabel"
@@ -868,6 +820,7 @@
"centerwrap" "1"
}
}
+
"CancelButton"
{
"ControlName" "CExButton"
@@ -884,16 +837,8 @@
"Command" "cancel"
"sound_depressed" "UI/buttonclick.wav"
"sound_released" "UI/buttonclickrelease.wav"
- "paintbackground" "1"
- "defaultBgColor_override" "15 15 15 255"
- "armedBgColor_override" "25 25 25 255"
- "depressedBgColor_override" "25 25 25 255"
- "defaultFgColor_override" "TanLight"
- "armedFgColor_override" "TanLight"
- "depressedFgColor_override" "TanLight"
- "border_default" "ButtonHover"
- "border_armed" "ButtonHover"
}
+
"BackButton"
{
"ControlName" "CExButton"
@@ -909,16 +854,8 @@
"Command" "prev_page"
"sound_depressed" "UI/buttonclick.wav"
"sound_released" "UI/buttonclickrelease.wav"
- "paintbackground" "1"
- "defaultBgColor_override" "15 15 15 255"
- "armedBgColor_override" "25 25 25 255"
- "depressedBgColor_override" "25 25 25 255"
- "defaultFgColor_override" "TanLight"
- "armedFgColor_override" "TanLight"
- "depressedFgColor_override" "TanLight"
- "border_default" "ButtonHover"
- "border_armed" "ButtonHover"
}
+
"OkButton"
{
"ControlName" "CExButton"
@@ -935,18 +872,10 @@
"Command" "apply"
"sound_depressed" "UI/buttonclick.wav"
"sound_released" "UI/buttonclickrelease.wav"
- "paintbackground" "1"
- "defaultBgColor_override" "15 15 15 255"
- "armedBgColor_override" "25 25 25 255"
- "depressedBgColor_override" "25 25 25 255"
- "defaultFgColor_override" "TanLight"
- "armedFgColor_override" "TanLight"
- "depressedFgColor_override" "TanLight"
- "border_default" "ButtonHover"
- "border_armed" "ButtonHover"
}
}
+ // ----------------------------
"PerformingActionPage"
{
"ControlName" "EditablePanel"
@@ -970,48 +899,51 @@
"tall" "200"
"centerwrap" "1"
}
+
"PreviewModelGroupBox"
{
- "ControlName" "EditablePanel"
+ "ControlName" "EditablePanel"
"fieldName" "PreviewModelGroupBox"
- "xpos" "360"
- "ypos" "25"
- "zpos" "-1"
- "wide" "180"
- "tall" "200"
+ "xpos" "360"
+ "ypos" "25"
+ "zpos" "-1"
+ "wide" "180"
+ "tall" "200"
"border" "GrayDialogBorder"
+ "bgcolor_override" "DarkGrey"
- "GradientBgPanel"
- {
- "ControlName" "ImagePanel"
- "FieldName" "GradientBgPanel"
- "xpos" "10"
- "ypos" "10"
- "zpos" "1"
- "wide" "160"
- "tall" "180"
- "visible" "1"
- "tileImage" "0"
- "scaleImage" "1"
- "image" "loadout_bottom_gradient"
- "border" "ButtonBorder"
- "paintbackgroundtype" "2"
- "paintbackground" "1"
- }
- "DragToRotateLabel"
- {
- "ControlName" "CExLabel"
- "fieldName" "DragToRotateLabel"
- "font" "HudFontSmall"
- "labelText" "#ToolCustomizeTextureDragToRotate"
- "textAlignment" "center"
- "xpos" "10"
- "ypos" "170"
- "zpos" "2"
- "wide" "160"
- "tall" "20"
- "centerwrap" "1"
+ "GradientBgPanel"
+ {
+ "ControlName" "ImagePanel"
+ "FieldName" "GradientBgPanel"
+ "xpos" "10"
+ "ypos" "10"
+ "zpos" "1"
+ "wide" "160"
+ "tall" "180"
+ "visible" "1"
+ "tileImage" "0"
+ "scaleImage" "1"
+ "image" "loadout_bottom_gradient"
+ "border" "ButtonBorder"
+ "paintbackgroundtype" "2"
+ "paintbackground" "1"
+ }
+
+ "DragToRotateLabel"
+ {
+ "ControlName" "CExLabel"
+ "fieldName" "DragToRotateLabel"
+ "font" "HudFontSmall"
+ "labelText" "#ToolCustomizeTextureDragToRotate"
+ "textAlignment" "center"
+ "xpos" "10"
+ "ypos" "170"
+ "zpos" "2"
+ "wide" "160"
+ "tall" "20"
+ "centerwrap" "1"
+ }
}
}
- }
} \ No newline at end of file
diff --git a/resource/ui/econ/confirmdialog.res b/resource/ui/econ/confirmdialog.res
index 1ebb33f..d473802 100644
--- a/resource/ui/econ/confirmdialog.res
+++ b/resource/ui/econ/confirmdialog.res
@@ -25,7 +25,7 @@
{
"ControlName" "CExLabel"
"fieldName" "TitleLabel"
- "font" "Cerbetica32"
+ "font" "HudFontMediumBold"
"labelText" "#ConfirmTitle"
"textAlignment" "center"
"xpos" "0"
diff --git a/resource/ui/econ/confirmdialogabandonnopenalty.res b/resource/ui/econ/confirmdialogabandonnopenalty.res
index 2ff68fb..b80230a 100644
--- a/resource/ui/econ/confirmdialogabandonnopenalty.res
+++ b/resource/ui/econ/confirmdialogabandonnopenalty.res
@@ -24,7 +24,7 @@
{
"ControlName" "CExLabel"
"fieldName" "TitleLabel"
- "font" "Cerbetica32"
+ "font" "HudFontMediumBold"
"labelText" "#ConfirmTitle"
"textAlignment" "north"
"xpos" "0"
@@ -48,8 +48,8 @@
"wide" "40"
"tall" "40"
"image" "pve/mvm_timeout_active_large"
- "visible" "1"
- "enabled" "1"
+ "visible" "0"
+ "enabled" "0"
"scaleImage" "1"
}
diff --git a/resource/ui/econ/confirmdialogabandonpenalty.res b/resource/ui/econ/confirmdialogabandonpenalty.res
index b72db7d..44cd4a1 100644
--- a/resource/ui/econ/confirmdialogabandonpenalty.res
+++ b/resource/ui/econ/confirmdialogabandonpenalty.res
@@ -24,7 +24,7 @@
{
"ControlName" "CExLabel"
"fieldName" "TitleLabel"
- "font" "Cerbetica32"
+ "font" "HudFontMediumBold"
"labelText" "#ConfirmTitle"
"textAlignment" "north"
"xpos" "0"
@@ -48,8 +48,8 @@
"wide" "40"
"tall" "40"
"image" "pve/mvm_timeout_active_large"
- "visible" "1"
- "enabled" "1"
+ "visible" "0"
+ "enabled" "0"
"scaleImage" "1"
}
@@ -77,11 +77,11 @@
{
"ControlName" "CExButton"
"fieldName" "CancelButton"
- "xpos" "165"
+ "xpos" "190"
"ypos" "165"
"zpos" "20"
- "wide" "125"
- "tall" "25"
+ "wide" "100"
+ "tall" "20"
"autoResize" "0"
"pinCorner" "0"
"visible" "1"
@@ -105,8 +105,8 @@
"xpos" "10"
"ypos" "165"
"zpos" "20"
- "wide" "125"
- "tall" "25"
+ "wide" "175"
+ "tall" "20"
"default" "1"
"autoResize" "0"
"pinCorner" "0"
diff --git a/resource/ui/econ/confirmdialogabandonsafe.res b/resource/ui/econ/confirmdialogabandonsafe.res
index 97269a7..268860b 100644
--- a/resource/ui/econ/confirmdialogabandonsafe.res
+++ b/resource/ui/econ/confirmdialogabandonsafe.res
@@ -24,7 +24,7 @@
{
"ControlName" "CExLabel"
"fieldName" "TitleLabel"
- "font" "Cerbetica32"
+ "font" "HudFontMediumBold"
"labelText" "#ConfirmTitle"
"textAlignment" "north"
"xpos" "0"
@@ -63,11 +63,11 @@
{
"ControlName" "CExButton"
"fieldName" "CancelButton"
- "xpos" "165"
+ "xpos" "190"
"ypos" "165"
"zpos" "20"
- "wide" "125"
- "tall" "25"
+ "wide" "100"
+ "tall" "20"
"autoResize" "0"
"pinCorner" "0"
"visible" "1"
@@ -91,8 +91,8 @@
"xpos" "10"
"ypos" "165"
"zpos" "20"
- "wide" "125"
- "tall" "25"
+ "wide" "175"
+ "tall" "20"
"default" "1"
"autoResize" "0"
"pinCorner" "0"
diff --git a/resource/ui/econ/confirmdialogoptout.res b/resource/ui/econ/confirmdialogoptout.res
deleted file mode 100644
index 628cd9a..0000000
--- a/resource/ui/econ/confirmdialogoptout.res
+++ /dev/null
@@ -1,145 +0,0 @@
-"Resource/UI/ConfirmDialogOptOut.res"
-{
- "ConfirmDialog"
- {
- "ControlName" "Frame"
- "fieldName" "ConfirmDialog"
- "xpos" "c-150"
- "ypos" "140"
- "wide" "300"
- "tall" "250"
- "autoResize" "0"
- "pinCorner" "0"
- "visible" "1"
- "enabled" "1"
- "tabPosition" "0"
- "settitlebarvisible" "0"
- "paintborder" "2"
- "paintbackground" "1"
- "border" "CyanBorderThick"
- "bgcolor_override" "25 25 25 255"
- }
-
- "TitleLabel"
- {
- "ControlName" "CExLabel"
- "fieldName" "TitleLabel"
- "font" "Cerbetica32"
- "labelText" "#ConfirmTitle"
- "textAlignment" "north"
- "xpos" "0"
- "ypos" "15"
- "zpos" "1"
- "wide" "300"
- "tall" "40"
- "autoResize" "1"
- "pinCorner" "0"
- "visible" "1"
- "enabled" "1"
- }
-
- "ExplanationLabel"
- {
- "ControlName" "CExLabel"
- "fieldName" "ExplanationLabel"
- "font" "HudFontSmallBold"
- "labelText" "%text%"
- "textAlignment" "center"
- "xpos" "40"
- "ypos" "45"
- "zpos" "1"
- "wide" "220"
- "tall" "130"
- "autoResize" "0"
- "pinCorner" "0"
- "visible" "1"
- "enabled" "1"
- "centerwrap" "1"
- "fgcolor_override" "ColorCyan"
- }
-
- "CancelButton"
- {
- "ControlName" "CExButton"
- "fieldName" "CancelButton"
- "xpos" "165"
- "ypos" "185"
- "zpos" "20"
- "wide" "125"
- "tall" "25"
- "autoResize" "0"
- "pinCorner" "0"
- "visible" "1"
- "enabled" "1"
- "tabPosition" "0"
- "labelText" "#Cancel"
- "font" "HudFontSmallBold"
- "textAlignment" "center"
- "textinsetx" "50"
- "dulltext" "0"
- "brighttext" "0"
- "Command" "cancel"
- "sound_depressed" "UI/buttonclick.wav"
- "sound_released" "UI/buttonclickrelease.wav"
- "paintbackground" "1"
- "defaultBgColor_override" "15 15 15 255"
- "armedBgColor_override" "25 25 25 255"
- "depressedBgColor_override" "25 25 25 255"
- "defaultFgColor_override" "TanLight"
- "armedFgColor_override" "TanLight"
- "depressedFgColor_override" "TanLight"
- "border_default" "ButtonHover"
- "border_armed" "ButtonHover"
- }
-
- "ConfirmButton"
- {
- "ControlName" "CExButton"
- "fieldName" "ConfirmButton"
- "xpos" "10"
- "ypos" "185"
- "zpos" "20"
- "wide" "125"
- "tall" "25"
- "default" "1"
- "autoResize" "0"
- "pinCorner" "0"
- "visible" "1"
- "enabled" "1"
- "tabPosition" "0"
- "labelText" "#ConfirmButtonText"
- "font" "HudFontSmallBold"
- "textAlignment" "center"
- "textinsetx" "50"
- "dulltext" "0"
- "brighttext" "0"
- "Command" "confirm"
- "sound_depressed" "UI/buttonclick.wav"
- "sound_released" "UI/buttonclickrelease.wav"
- "border_default" "ButtonHover"
- "border_armed" "ButtonHover"
- }
-
- "OptOutCheckbox"
- {
- "ControlName" "CheckButton"
- "fieldName" "OptOutCheckbox"
- "xpos" "0"
- "ypos" "217"
- "zpos" "2"
- "wide" "300"
- "tall" "25"
- "autoResize" "0"
- "pinCorner" "0"
- "visible" "1"
- "enabled" "1"
- "tabPosition" "0"
- "labelText" "#TF_Confirm_Opt_Out"
- "textAlignment" "center"
- "dulltext" "0"
- "brighttext" "0"
- "wrap" "0"
- "font" "HudFontSmallest"
- "selected_fgcolor_override" "ColorRed"
- }
-} \ No newline at end of file
diff --git a/resource/ui/econ/confirmitempreviewdialog.res b/resource/ui/econ/confirmitempreviewdialog.res
deleted file mode 100644
index 70c53e6..0000000
--- a/resource/ui/econ/confirmitempreviewdialog.res
+++ /dev/null
@@ -1,226 +0,0 @@
-"Resource/UI/ConfirmItemPreviewDialog.res"
-{
- "ConfirmItemPreviewDialog"
- {
- "fieldName" "ConfirmItemPreviewDialog"
- "visible" "1"
- "enabled" "1"
- "xpos" "c-200"
- "ypos" "105"
- "wide" "400"
- "tall" "240"
- "settitlebarvisible" "0"
- "paintborder" "2"
- "paintbackground" "1"
- "border" "CyanBorderThick"
- "bgcolor_override" "25 25 25 255"
- }
- "mouseoveritempanel"
- {
- "ControlName" "CItemModelPanel"
- "fieldName" "mouseoveritempanel"
- "xpos" "c-70"
- "ypos" "270"
- "zpos" "100"
- "wide" "300"
- "tall" "300"
- "visible" "0"
- "bgcolor_override" "Transparent"
- "noitem_textcolor" "TextColor"
- "PaintBackgroundType" "0"
- "paintborder" "0"
- "text_ypos" "20"
- "text_center" "1"
- "model_hide" "1"
- "resize_to_text" "1"
- "padding_height" "15"
-
- "BackColor"
- {
- "ControlName" "EditablePanel"
- "fieldName" "BackColor"
- "xpos" "0"
- "ypos" "0"
- "zpos" "-1"
- "wide" "f0"
- "tall" "f0"
- "visible" "1"
- "enabled" "1"
- "pinCorner" "0"
- "autoResize" "0"
- "PaintBackgroundType" "1"
- "border" "NoBorder"
- "bgcolor_override" "35 35 35 255"
-
- "attriblabel"
- {
- "font" "ItemFontAttribLarge"
- "xpos" "0"
- "ypos" "30"
- "zpos" "101"
- "wide" "140"
- "tall" "60"
- "autoResize" "0"
- "pinCorner" "0"
- "visible" "1"
- "enabled" "1"
- "labelText" "%attriblist%"
- "textAlignment" "center"
- "fgcolor" "TextColor"
- "centerwrap" "1"
- }
- }
- }
- "TitleLabel"
- {
- "ControlName" "CExLabel"
- "fieldName" "TitleLabel"
- "font" "Cerbetica32"
- "labelText" "dynamic"
- "textAlignment" "center"
- "xpos" "100"
- "ypos" "80"
- "zpos" "0"
- "wide" "200"
- "tall" "30"
- "autoResize" "1"
- "pinCorner" "0"
- "visible" "1"
- "enabled" "1"
- "centerwrap" "1"
- }
- "ToolBG"
- {
- "ControlName" "CExLabel"
- "fieldName" "ToolBG"
- "font" "HudFontSmallBold"
- "labelText" ""
- "textAlignment" "east"
- "xpos" "158"
- "ypos" "14"
- "zpos" "-1"
- "wide" "84"
- "tall" "64"
- "autoResize" "1"
- "pinCorner" "0"
- "visible" "1"
- "enabled" "1"
- "paintbackground" "0"
- "border" "BackpackItemBorder_SelfMade"
- }
- "tool_icon"
- {
- "ControlName" "ScalableImagePanel"
- "fieldName" "tool_icon"
- "xpos" "158"
- "ypos" "14"
- "zpos" "2"
- "wide" "16"
- "tall" "16"
- "visible" "1"
- "enabled" "1"
- "image" "backpack_jewel_modify_target_b_g"
- "tileImage" "0"
- "tileVertically" "0"
- "drawcolor" "112 176 74 255"
- }
- "tool_modelpanel"
- {
- "ControlName" "CItemModelPanel"
- "fieldName" "tool_modelpanel"
- "xpos" "158"
- "ypos" "14"
- "zpos" "1"
- "wide" "84"
- "tall" "64"
- "visible" "1"
- "bgcolor_override" "Transparent"
- "noitem_textcolor" "TextColor"
- "PaintBackgroundType" "2"
- "paintborder" "0"
- "model_xpos" "2"
- "model_ypos" "5"
- "model_wide" "80"
- "model_tall" "54"
- "text_ypos" "100"
- "text_center" "1"
- "name_only" "1"
- "paint_icon_hide" "1"
-
- "itemmodelpanel"
- {
- "use_item_rendertarget" "0"
- "allow_rot" "0"
- }
- }
- "ConfirmLabel"
- {
- "ControlName" "CExLabel"
- "fieldName" "ConfirmLabel"
- "font" "HudFontSmall"
- "labelText" "#ItemPreview_Confirm"
- "textAlignment" "center"
- "xpos" "20"
- "ypos" "100"
- "zpos" "0"
- "wide" "360"
- "tall" "80"
- "autoResize" "1"
- "pinCorner" "0"
- "visible" "1"
- "enabled" "1"
- "fgcolor_override" "ColorCyan"
- }
- "CancelButton"
- {
- "ControlName" "CExButton"
- "fieldName" "CancelButton"
- "xpos" "50"
- "ypos" "200"
- "zpos" "1"
- "wide" "130"
- "tall" "25"
- "autoResize" "0"
- "pinCorner" "3"
- "visible" "1"
- "enabled" "1"
- "tabPosition" "0"
- "labelText" "#Cancel"
- "font" "HudFontSmall"
- "textAlignment" "center"
- "dulltext" "0"
- "brighttext" "0"
- "default" "0"
- "Command" "cancel"
- "sound_depressed" "UI/buttonclick.wav"
- "sound_released" "UI/buttonclickrelease.wav"
- "border_default" "ButtonHover"
- "border_armed" "ButtonHover"
- }
- "OkButton"
- {
- "ControlName" "CExButton"
- "fieldName" "OkButton"
- "xpos" "220"
- "ypos" "200"
- "zpos" "1"
- "wide" "130"
- "tall" "25"
- "autoResize" "0"
- "pinCorner" "3"
- "visible" "1"
- "enabled" "1"
- "tabPosition" "0"
- "labelText" "#CraftNameConfirm"
- "font" "HudFontSmall"
- "textAlignment" "center"
- "dulltext" "0"
- "brighttext" "0"
- "default" "1"
- "Command" "apply"
- "sound_depressed" "UI/buttonclick.wav"
- "sound_released" "UI/buttonclickrelease.wav"
- "border_default" "ButtonHover"
- "border_armed" "ButtonHover"
- }
-} \ No newline at end of file
diff --git a/resource/ui/econ/genericwaitingdialog.res b/resource/ui/econ/genericwaitingdialog.res
new file mode 100644
index 0000000..b09ec91
--- /dev/null
+++ b/resource/ui/econ/genericwaitingdialog.res
@@ -0,0 +1,104 @@
+"Resource/UI/GenericWaitingDialog.res"
+{
+ "GenericWaitingDialog"
+ {
+ "fieldName" "GenericWaitingDialog"
+ "visible" "1"
+ "enabled" "1"
+ "xpos" "c-100"
+ "ypos" "200"
+ "wide" "200"
+ "tall" "105"
+ "bgcolor_override" "DarkGrey"
+ "paintbackgroundtype" "1"
+ "settitlebarvisible" "0"
+ "border" "NoBorder"
+ }
+
+ "TitleLabel"
+ {
+ "ControlName" "Label"
+ "fieldName" "TitleLabel"
+ "font" "HudFontMediumSmall"
+ "xpos" "0"
+ "ypos" "8"
+ "zpos" "0"
+ "wide" "200"
+ "tall" "42"
+ "autoResize" "0"
+ "pinCorner" "0"
+ "visible" "1"
+ "enabled" "1"
+ "wrap" "0"
+ "centerwrap" "1"
+ "labelText" "%updatetext%"
+ "textAlignment" "center"
+ "fgcolor_override" "255 255 255 255"
+ "bgcolor_override" "Transparent"
+ }
+
+ "EllipsesLabel"
+ {
+ "ControlName" "Label"
+ "fieldName" "EllipsesLabel"
+ "font" "HudFontSmallest"
+ "xpos" "0"
+ "ypos" "42"
+ "zpos" "0"
+ "wide" "200"
+ "tall" "20"
+ "autoResize" "0"
+ "pinCorner" "0"
+ "visible" "1"
+ "enabled" "1"
+ "labelText" "%ellipses%"
+ "textAlignment" "north"
+ "fgcolor_override" "255 255 255 255"
+ "bgcolor_override" "Transparent"
+ }
+
+ "DurationLabel"
+ {
+ "ControlName" "Label"
+ "fieldName" "DurationLabel"
+ "font" "HudFontSmallest"
+ "xpos" "0"
+ "ypos" "52"
+ "zpos" "0"
+ "wide" "200"
+ "tall" "60"
+ "autoResize" "0"
+ "pinCorner" "0"
+ "visible" "1"
+ "enabled" "1"
+ "labelText" "%duration%"
+ "textAlignment" "north"
+ "fgcolor_override" "255 255 255 255"
+ "bgcolor_override" "Transparent"
+ }
+
+ "CloseButton"
+ {
+ "ControlName" "CExImageButton"
+ "fieldName" "CloseButton"
+ "xpos" "50"
+ "ypos" "70"
+ "zpos" "1"
+ "wide" "100"
+ "tall" "25"
+ "autoResize" "0"
+ "pinCorner" "3"
+ "visible" "1"
+ "enabled" "1"
+ "tabPosition" "0"
+ "labelText" "#Cancel"
+ "font" "HudFontSmallest"
+ "textAlignment" "center"
+ "dulltext" "0"
+ "brighttext" "0"
+ "default" "1"
+ "Command" "user_close"
+ "sound_depressed" "UI/buttonclick.wav"
+ "sound_released" "UI/buttonclickrelease.wav"
+ }
+} \ No newline at end of file
diff --git a/resource/ui/econ/inspectionpanel.res b/resource/ui/econ/inspectionpanel.res
index 58cd2e1..dc4a79f 100644
--- a/resource/ui/econ/inspectionpanel.res
+++ b/resource/ui/econ/inspectionpanel.res
@@ -120,7 +120,7 @@
"ControlName" "CNavigationPanel"
"fieldName" "TeamNavPanel"
"xpos" "cs-0.5"
- "ypos" "55"
+ "ypos" "p.7-16"
"zpos" "100"
"wide" "60"
"tall" "25"
@@ -157,7 +157,7 @@
"sound_armed" "UI/buttonrollover.wav"
"paintbackground" "0"
"paintbackgroundtype" "0"
- "defaultBgColor_Override" "ColorBlack"
+ "defaultBgColor_Override" "0 0 0 255"
"paintborder" "0"
"image_drawcolor" "255 255 255 77"
"image_armedcolor" "255 255 255 128"
@@ -214,16 +214,16 @@
"ControlName" "EditablePanel"
"fieldName" "PaintkitPreviewContainer"
"xpos" "cs-0.5"
- "ypos" "p.68"
+ "ypos" "p.7"
"wide" "300"
"tall" "100"
"zpos" "100"
- //"paintborder" "0"
- "border" "NoBorder"
- "mouseinputenabled" "1"
- "proportionaltoparent" "1"
- "visible" "0"
+ "visible" "1"
"bgcolor_override" "DarkerGrey"
+ "PaintBackgroundType" "2"
+ "mouseinputenabled" "1"
+ "proportionaltoparent" "1"
+ "paintborder" "0"
"fixed_item"
{
@@ -255,7 +255,7 @@
"enabled" "1"
"tabPosition" "0"
"labeltext" ""
- "font" "HudFontSmallBold"
+ "font" "HudFontSmall"
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
@@ -398,7 +398,7 @@
{
"ControlName" "CExLabel"
"fieldName" "ItemLabel"
- "font" "Cerbetica12"
+ "font" "HudFontSmallest"
"labelText" "#TF_ItemPreview_ItemPreview"
"textAlignment" "west"
"xpos" "8"
@@ -500,7 +500,7 @@
{
"ControlName" "Button"
"fieldName" "NewSeedButton"
- "font" "HudFontSmallest"
+ "font" "HudFontSmall"
"xpos" "8"
"ypos" "75"
@@ -598,7 +598,7 @@
"wide" "75"
"tall" "20"
"labelText" "#TF_ItemAd_ViewOnMarket"
- "font" "Cerbetica10"
+ "font" "HudFontSmall"
"textinsetx" "0"
"textAlignment" "center"
"proportionaltoparent" "1"
diff --git a/resource/ui/econ/inspectionpanel_cosmetic.res b/resource/ui/econ/inspectionpanel_cosmetic.res
index 3605879..79fae37 100644
--- a/resource/ui/econ/inspectionpanel_cosmetic.res
+++ b/resource/ui/econ/inspectionpanel_cosmetic.res
@@ -64,7 +64,7 @@
"enabled" "1"
"tabPosition" "0"
"labelText" "<"
- "font" "CerbeticaBold14"
+ "font" "Cerbetica14"
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
@@ -91,7 +91,7 @@
"enabled" "1"
"tabPosition" "0"
"labelText" ">"
- "font" "CerbeticaBold14"
+ "font" "Cerbetica14"
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
@@ -238,7 +238,7 @@
{
"ControlName" "CExLabel"
"fieldName" "ItemNameLabel"
- "font" "CerbeticaBold20"
+ "font" "Cerbetica20"
"labelText" "%itemname%"
"textAlignment" "west"
"xpos" "240"
@@ -288,7 +288,7 @@
{
"ControlName" "CExLabel"
"fieldName" "ItemLevelInfoLabel"
- "font" "FontStoreOriginalPrice"
+ "font" "HudFontSmallest"
"labelText" "%item_level_info%"
"textAlignment" "north-west"
"wide" "228"
@@ -305,7 +305,7 @@
{
"ControlName" "CExLabel"
"fieldName" "RestrictionsLabel"
- "font" "FontStoreOriginalPrice"
+ "font" "HudFontSmallest"
"labelText" "#Store_ItemDesc_Restrictions"
"textAlignment" "north-west"
"wide" "228"
@@ -322,7 +322,7 @@
{
"ControlName" "CExLabel"
"fieldName" "RestrictionsTextLabel"
- "font" "FontStoreOriginalPrice"
+ "font" "HudFontSmallest"
"labelText" "#Store_HolidayRestrictionText"
"textAlignment" "north-west"
"wide" "228"
@@ -339,7 +339,7 @@
{
"ControlName" "CExLabel"
"fieldName" "UsedByLabel"
- "font" "FontStoreOriginalPrice"
+ "font" "HudFontSmallest"
"labelText" "#Store_ItemDesc_UsedBy"
"textAlignment" "north-west"
"wide" "228"
@@ -356,7 +356,7 @@
{
"ControlName" "CExLabel"
"fieldName" "UsedByTextLabel"
- "font" "FontStoreOriginalPrice"
+ "font" "HudFontSmallest"
"labelText" "%used_by_classes%"
"textAlignment" "north-west"
"wide" "228"
@@ -372,7 +372,7 @@
{
"ControlName" "CExLabel"
"fieldName" "SlotLabel"
- "font" "FontStoreOriginalPrice"
+ "font" "HudFontSmallest"
"labelText" "#Store_ItemDesc_Slot"
"textAlignment" "north-west"
"wide" "228"
@@ -389,7 +389,7 @@
{
"ControlName" "CExLabel"
"fieldName" "SlotTextLabel"
- "font" "FontStoreOriginalPrice"
+ "font" "HudFontSmallest"
"labelText" "%slot%"
"textAlignment" "north-west"
"wide" "228"
@@ -405,7 +405,7 @@
{
"ControlName" "CExLabel"
"fieldName" "ArmoryTextLabel"
- "font" "FontStoreOriginalPrice"
+ "font" "HudFontSmallest"
"textAlignment" "north-west"
"wide" "228"
"tall" "10"
@@ -421,7 +421,7 @@
{
"ControlName" "CExLabel"
"fieldName" "AttributesLabel"
- "font" "FontStoreOriginalPrice"
+ "font" "HudFontSmallest"
"textAlignment" "north-west"
"zpos" "2"
"wide" "228"
@@ -460,7 +460,7 @@
"enabled" "1"
"tabPosition" "0"
"labelText" "#Store_ItemDesc_ItemWikiPage"
- "font" "CerbeticaBold12"
+ "font" "Cerbetica12"
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
@@ -704,7 +704,7 @@
"enabled" "1"
"tabPosition" "0"
"labelText" "<"
- "font" "CerbeticaBold18"
+ "font" "Cerbetica18"
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
@@ -732,7 +732,7 @@
"enabled" "1"
"tabPosition" "0"
"labelText" ">"
- "font" "CerbeticaBold18"
+ "font" "Cerbetica18"
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
diff --git a/resource/ui/econ/itemmodelpanel.res b/resource/ui/econ/itemmodelpanel.res
index 3689124..4f6ed8d 100644
--- a/resource/ui/econ/itemmodelpanel.res
+++ b/resource/ui/econ/itemmodelpanel.res
@@ -78,7 +78,7 @@
{
"ControlName" "CExLabel"
"fieldName" "namelabel"
- "font" "ItemFontNameLarge"
+ "font" "ItemFontNameLarger"
"xpos" "0"
"ypos" "0"
"zpos" "2"
@@ -152,7 +152,7 @@
{
"ControlName" "CExLabel"
"fieldName" "quantitylabel"
- "font" "Cerbetica8"
+ "font" "Default"
"xpos" "4"
"ypos" "4"
"zpos" "2"
@@ -173,7 +173,7 @@
{
"ControlName" "CExLabel"
"fieldName" "serieslabel"
- "font" "Cerbetica8"
+ "font" "Default"
"xpos" "4"
"ypos" "4"
"zpos" "2"
diff --git a/resource/ui/econ/itempickuppanel.res b/resource/ui/econ/itempickuppanel.res
index c0e99ef..cbc303d 100644
--- a/resource/ui/econ/itempickuppanel.res
+++ b/resource/ui/econ/itempickuppanel.res
@@ -168,7 +168,7 @@
"enabled" "1"
"tabPosition" "0"
"labelText" "#NextItem"
- "font" "CerbeticaBold16"
+ "font" "Cerbetica16"
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
@@ -192,7 +192,7 @@
"enabled" "1"
"tabPosition" "0"
"labelText" "#PreviousItem"
- "font" "CerbeticaBold16"
+ "font" "Cerbetica16"
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
diff --git a/resource/ui/econ/notificationtoastcontainer.res b/resource/ui/econ/notificationtoastcontainer.res
index 562c9f1..6f78626 100644
--- a/resource/ui/econ/notificationtoastcontainer.res
+++ b/resource/ui/econ/notificationtoastcontainer.res
@@ -12,7 +12,7 @@
"visible" "1"
"enabled" "1"
"bgcolor_override" "DarkGrey"
- "border" "CyanBorderThick"
+ "border" "CyanBorder"
}
"HelpTextLabel"
@@ -32,7 +32,7 @@
"wrap" "1"
"labelText" ""
"textAlignment" "North"
- "font" "TFFontSmall"
+ "font" "TeamMenu"
"textinsetx" "2"
"textinsety" "7"
}
diff --git a/resource/ui/econ/notificationtoastcontrol.res b/resource/ui/econ/notificationtoastcontrol.res
new file mode 100644
index 0000000..ad6f35d
--- /dev/null
+++ b/resource/ui/econ/notificationtoastcontrol.res
@@ -0,0 +1,193 @@
+"Resource/UI/NotificationToastControl.res"
+{
+ "NotificationToastControl"
+ {
+ "ControlName" "CNotificationToastControl"
+ "fieldName" "NotificationToastControl"
+ "xpos" "0"
+ "ypos" "0"
+ "zpos" "1"
+ "wide" "190"
+ "tall" "30"
+ "visible" "1"
+ "enabled" "1"
+ "border" "NoBorder"
+ "paintborder" "1"
+ "paintbackground" "1"
+ "PaintBackgroundType" "0"
+ "defaultbgcolor_override" "TanLight"
+ "bgcolor_override" "TanLight"
+ }
+
+ "DeleteButton"
+ {
+ "ControlName" "CExImageButton"
+ "fieldName" "DeleteButton"
+ "xpos" "165"
+ "ypos" "5"
+ "zpos" "10"
+ "wide" "20"
+ "tall" "20"
+ "autoResize" "0"
+ "pinCorner" "0"
+ "visible" "0"
+ "enabled" "1"
+ "tabPosition" "0"
+ "labeltext" ""
+ "font" "TFFontSmall"
+ "textAlignment" "center"
+ "dulltext" "0"
+ "brighttext" "0"
+ "default" "1"
+ "sound_depressed" "UI/buttonclick.wav"
+ "sound_released" "UI/buttonclickrelease.wav"
+ "Command" "delete"
+ "armedBgColor_override" "LightRed"
+
+ "SubImage"
+ {
+ "ControlName" "ImagePanel"
+ "fieldName" "SubImage"
+ "xpos" "2"
+ "ypos" "2"
+ "zpos" "1"
+ "wide" "16"
+ "tall" "16"
+ "visible" "1"
+ "enabled" "1"
+ "image" "replay/thumbnails/close"
+ "scaleImage" "1"
+ }
+ }
+
+ "TriggerButton"
+ {
+ "ControlName" "CExImageButton"
+ "fieldName" "TriggerButton"
+ "xpos" "144"
+ "if_one_button"
+ {
+ "xpos" "165"
+ }
+ "ypos" "5"
+ "zpos" "10"
+ "wide" "20"
+ "tall" "20"
+ "autoResize" "0"
+ "pinCorner" "0"
+ "visible" "0"
+ "enabled" "1"
+ "tabPosition" "0"
+ "labeltext" ""
+ "font" "TFFontSmall"
+ "textAlignment" "center"
+ "dulltext" "0"
+ "brighttext" "0"
+ "default" "1"
+ "sound_depressed" "UI/buttonclick.wav"
+ "sound_released" "UI/buttonclickrelease.wav"
+ "Command" "trigger"
+ "armedBgColor_override" "CreditsGreen"
+
+ "SubImage"
+ {
+ "ControlName" "ImagePanel"
+ "fieldName" "SubImage"
+ "xpos" "2"
+ "ypos" "2"
+ "zpos" "1"
+ "wide" "16"
+ "tall" "16"
+ "visible" "1"
+ "enabled" "1"
+ "image" "glyph_view"
+ "scaleImage" "1"
+ }
+ }
+
+ "AcceptButton"
+ {
+ "ControlName" "CExImageButton"
+ "fieldName" "AcceptButton"
+ "xpos" "144"
+ "if_one_button"
+ {
+ "xpos" "165"
+ }
+ "ypos" "5"
+ "zpos" "10"
+ "wide" "20"
+ "tall" "20"
+ "autoResize" "0"
+ "pinCorner" "0"
+ "visible" "0"
+ "enabled" "1"
+ "tabPosition" "0"
+ "labeltext" ""
+ "font" "TFFontSmall"
+ "textAlignment" "center"
+ "dulltext" "0"
+ "brighttext" "0"
+ "default" "1"
+ "sound_depressed" "UI/buttonclick.wav"
+ "sound_released" "UI/buttonclickrelease.wav"
+ "Command" "accept"
+ "armedBgColor_override" "CreditsGreen"
+
+ "SubImage"
+ {
+ "ControlName" "ImagePanel"
+ "fieldName" "SubImage"
+ "xpos" "2"
+ "ypos" "2"
+ "zpos" "1"
+ "wide" "16"
+ "tall" "16"
+ "visible" "1"
+ "enabled" "1"
+ "image" "glyph_view"
+ "scaleImage" "1"
+ }
+ }
+
+ "DeclineButton"
+ {
+ "ControlName" "CExImageButton"
+ "fieldName" "DeclineButton"
+ "xpos" "165"
+ "ypos" "5"
+ "zpos" "10"
+ "wide" "20"
+ "tall" "20"
+ "autoResize" "0"
+ "pinCorner" "0"
+ "visible" "0"
+ "enabled" "1"
+ "tabPosition" "0"
+ "labeltext" ""
+ "font" "TFFontSmall"
+ "textAlignment" "center"
+ "dulltext" "0"
+ "brighttext" "0"
+ "default" "1"
+ "sound_depressed" "UI/buttonclick.wav"
+ "sound_released" "UI/buttonclickrelease.wav"
+ "Command" "decline"
+ "armedBgColor_override" "LightRed"
+
+ "SubImage"
+ {
+ "ControlName" "ImagePanel"
+ "fieldName" "SubImage"
+ "xpos" "2"
+ "ypos" "2"
+ "zpos" "1"
+ "wide" "16"
+ "tall" "16"
+ "visible" "1"
+ "enabled" "1"
+ "image" "replay/thumbnails/close"
+ "scaleImage" "1"
+ }
+ }
+} \ No newline at end of file
diff --git a/resource/ui/econ/paintkitconsumedialog.res b/resource/ui/econ/paintkitconsumedialog.res
new file mode 100644
index 0000000..f338514
--- /dev/null
+++ b/resource/ui/econ/paintkitconsumedialog.res
@@ -0,0 +1,295 @@
+"Resource/UI/PaintkitConsumeDialog.res"
+{
+ "PaintkitConsume"
+ {
+ "fieldName" "PaintkitConsume"
+ "xpos" "cs-0.5"
+ "ypos" "cs-0.5"
+ "wide" "400"
+ "tall" "400"
+ "visible" "1"
+ "zpos" "1000"
+ }
+
+ "Title"
+ {
+ "ControlName" "Label"
+ "fieldName" "Title"
+ "font" "HudFontMedium"
+ "labelText" "#TF_UsePaintkit_Panel_Title"
+ "textAlignment" "north"
+ "xpos" "cs-0.5"
+ "ypos" "10"
+ "zpos" "10"
+ "wide" "f20"
+ "tall" "30"
+ "visible" "1"
+ "enabled" "1"
+ "fgcolor_override" "TanLight"
+ "proportionaltoparent" "1"
+ }
+
+ "DescText"
+ {
+ "ControlName" "Label"
+ "fieldName" "DescText"
+ "font" "HudFontSmall"
+ "labelText" "#TF_UsePaintkit_Panel_Desc"
+ "textAlignment" "north"
+ "xpos" "cs-0.5"
+ "ypos" "r60"
+ "zpos" "10"
+ "wide" "f20"
+ "tall" "30"
+ "visible" "0"
+ "enabled" "0"
+ "fgcolor_override" "White"
+ "proportionaltoparent" "1"
+ }
+
+ "BGPanel"
+ {
+ "fieldName" "BGPanel"
+ "controlname" "EditablePanel"
+ "xpos" "0"
+ "ypos" "0"
+ "wide" "f0"
+ "tall" "f0"
+ "proportionaltoparent" "1"
+ "border" "CyanBorderThick"
+ "bgcolor_override" "DarkGrey"
+ }
+
+ "Shade"
+ {
+ "fieldName" "Shade"
+ "controlname" "EditablePanel"
+ "xpos" "0"
+ "ypos" "0"
+ "zpos" "100"
+ "wide" "f0"
+ "tall" "f0"
+ "visible" "0"
+ "proportionaltoparent" "1"
+ "mouseinputenabled" "1"
+ "bgcolor_override" "0 0 0 150"
+ }
+
+ "RedeemingPanel"
+ {
+ "fieldName" "RedeemingPanel"
+ "controlname" "EditablePanel"
+ "xpos" "cs-0.5"
+ "ypos" "cs-0.5"
+ "zpos" "101"
+ "wide" "250"
+ "tall" "150"
+ "proportionaltoparent" "1"
+ "visible" "0"
+ "border" "CyanBorderThick"
+ "bgcolor_override" "DarkGrey"
+
+ "CTFLogoPanel"
+ {
+ "fieldName" "WorkingLogo"
+ "controlname" "CTFLogoPanel"
+ "xpos" "cs-0.5"
+ "ypos" "cs-0.5-15"
+ "zpos" "1"
+ "wide" "100"
+ "tall" "o1"
+ "proportionaltoparent" "1"
+ "velocity" "200"
+ "radius" "30"
+ "fgcolor_override" "TanDark"
+ }
+
+ "WorkingText"
+ {
+ "ControlName" "Label"
+ "fieldName" "WorkingText"
+ "font" "HudFontSmallBold"
+ "labelText" "#TF_UsePaintkit_Working"
+ "textAlignment" "north"
+ "xpos" "cs-0.5"
+ "ypos" "r30"
+ "wide" "f20"
+ "tall" "30"
+ "visible" "1"
+ "enabled" "1"
+ "fgcolor_override" "TanLight"
+ "proportionaltoparent" "1"
+ }
+ }
+
+ "SuccessPanel"
+ {
+ "fieldName" "SuccessPanel"
+ "controlname" "EditablePanel"
+ "xpos" "cs-0.5"
+ "ypos" "cs-0.5"
+ "zpos" "101"
+ "wide" "250"
+ "tall" "150"
+ "proportionaltoparent" "1"
+ "visible" "0"
+ "border" "CyanBorderThick"
+ "bgcolor_override" "DarkGrey"
+
+ "CTFLogoPanel"
+ {
+ "fieldName" "SuccessLogo"
+ "controlname" "CTFLogoPanel"
+ "xpos" "cs-0.5"
+ "ypos" "cs-0.5-15"
+ "zpos" "1"
+ "wide" "100"
+ "tall" "o1"
+ "proportionaltoparent" "1"
+ "velocity" "0"
+ "radius" "30"
+ "fgcolor_override" "CreditsGreen"
+ }
+
+ "SuccessText"
+ {
+ "ControlName" "Label"
+ "fieldName" "SuccessText"
+ "font" "HudFontMediumBold"
+ "labelText" "#AbuseReport_SucceededTitle"
+ "textAlignment" "north"
+ "xpos" "cs-0.5"
+ "ypos" "r40"
+ "wide" "f20"
+ "tall" "30"
+ "visible" "1"
+ "enabled" "1"
+ "fgcolor_override" "CreditsGreen"
+ "proportionaltoparent" "1"
+ }
+ }
+
+ "FailurePanel"
+ {
+ "fieldName" "FailurePanel"
+ "controlname" "EditablePanel"
+ "xpos" "cs-0.5"
+ "ypos" "cs-0.5"
+ "zpos" "101"
+ "wide" "250"
+ "tall" "150"
+ "proportionaltoparent" "1"
+ "visible" "0"
+ "border" "CyanBorderThick"
+ "bgcolor_override" "DarkGrey"
+
+ "CTFLogoPanel"
+ {
+ "fieldName" "FailureLogo"
+ "controlname" "CTFLogoPanel"
+ "xpos" "cs-0.5"
+ "ypos" "cs-0.5-15"
+ "zpos" "1"
+ "wide" "100"
+ "tall" "o1"
+ "proportionaltoparent" "1"
+ "velocity" "0"
+ "radius" "30"
+ "fgcolor_override" "RedSolid"
+ }
+
+ "FailureText"
+ {
+ "ControlName" "Label"
+ "fieldName" "FailureText"
+ "font" "HudFontSmallBold"
+ "labelText" "#TF_UsePaintkit_Failed"
+ "textAlignment" "north"
+ "xpos" "cs-0.5"
+ "ypos" "r40"
+ "wide" "f20"
+ "tall" "30"
+ "visible" "1"
+ "enabled" "1"
+ "fgcolor_override" "RedSolid"
+ "proportionaltoparent" "1"
+ "centerwrap" "1"
+ }
+ }
+
+ "InspectionPanel"
+ {
+ "fieldName" "InspectionPanel"
+ "xpos" "0"
+ "ypos" "40"
+ "zpos" "10"
+ "wide" "f0"
+ "tall" "350"
+ "proportionaltoparent" "1"
+ }
+
+ "CancelButton"
+ {
+ "ControlName" "CExButton"
+ "fieldName" "CancelButton"
+ "xpos" "rs1-50"
+ "ypos" "rs1-15"
+ "zpos" "20"
+ "wide" "100"
+ "tall" "25"
+ "autoResize" "0"
+ "pinCorner" "0"
+ "visible" "1"
+ "enabled" "1"
+ "tabPosition" "0"
+ "labelText" "#GameUI_CancelBold"
+ "font" "HudFontSmall"
+ "textAlignment" "center"
+ "textinsetx" "50"
+ "dulltext" "0"
+ "brighttext" "0"
+ "Command" "cancel"
+ "proportionaltoparent" "1"
+ "sound_depressed" "UI/buttonclick.wav"
+ "sound_released" "UI/buttonclickrelease.wav"
+ "border_default" "Econ.Button.Border.Default"
+ "border_armed" "Econ.Button.Border.Armed"
+ "armedBgColor_override" "Econ.Button.ArmedBgColor"
+ "armedFgColor_override" "Econ.Button.ArmedFgColor"
+ "depressedBgColor_override" "Econ.Button.DepressedBgColor"
+ "depressedFgColor_override" "Econ.Button.DepressedFgColor"
+ }
+
+ "ConfirmButton"
+ {
+ "ControlName" "CExButton"
+ "fieldName" "ConfirmButton"
+ "xpos" "50"
+ "ypos" "rs1-15"
+ "zpos" "20"
+ "wide" "140"
+ "tall" "25"
+ "default" "1"
+ "autoResize" "0"
+ "pinCorner" "0"
+ "visible" "1"
+ "enabled" "1"
+ "tabPosition" "0"
+ "labelText" "#TF_QuestView_RedeemReward"
+ "font" "HudFontSmall"
+ "textAlignment" "center"
+ "textinsetx" "50"
+ "dulltext" "0"
+ "brighttext" "0"
+ "Command" "accept"
+ "proportionaltoparent" "1"
+ "sound_depressed" "UI/buttonclick.wav"
+ "sound_released" "UI/buttonclickrelease.wav"
+ "border_default" "Econ.Button.Border.Default"
+ "border_armed" "Econ.Button.Border.Armed"
+ "armedBgColor_override" "Econ.Button.ArmedBgColor"
+ "armedFgColor_override" "Econ.Button.ArmedFgColor"
+ "depressedBgColor_override" "Econ.Button.DepressedBgColor"
+ "depressedFgColor_override" "Econ.Button.DepressedFgColor"
+ }
+} \ No newline at end of file
diff --git a/resource/ui/econ/store/v2/storehome_base.res b/resource/ui/econ/store/v2/storehome_base.res
index f1b0d62..7a02259 100644
--- a/resource/ui/econ/store/v2/storehome_base.res
+++ b/resource/ui/econ/store/v2/storehome_base.res
@@ -185,7 +185,7 @@
"autoResize" "0"
"PaintBackgroundType" "2"
"border" "NoBorder"
- "bgcolor_override" "35 35 35 255"
+ "bgcolor_override" "DarkGrey"
}
"attriblabel"
@@ -295,7 +295,7 @@
"ControlName" "CNavigationPanel"
"fieldName" "ItemCategoryTabs"
"xpos" "c-230"
- "ypos" "30"
+ "ypos" "31"
"zpos" "0"
"wide" "430"
"tall" "25"
@@ -321,8 +321,8 @@
"tabPosition" "0"
"textAlignment" "center"
"scaleImage" "1"
- "font" "Cerbetica16"
- "fgcolor" "124 114 99 255"
+ "font" "HudFontSmallest"
+ "fgcolor" "TanDark"
"defaultBgColor_override" "25 25 25 255"
"defaultFgColor_override" "124 114 99 255"
@@ -417,11 +417,11 @@
{
"ControlName" "CExLabel"
"fieldName" "BackpackSpaceLabel"
- "font" "Cerbetica14"
+ "font" "HudFontSmallest"
"labelText" "%freebackpackspace%"
"textAlignment" "west"
- "xpos" "c-230"
- "ypos" "310"
+ "xpos" "c-237"
+ "ypos" "315"
"zpos" "10"
"wide" "160"
"tall" "20"
@@ -435,10 +435,10 @@
{
"ControlName" "CExButton"
"fieldName" "CartButton"
- "font" "HudFontSmallBold"
+ "font" "HudFontSmall"
"labelText" "%storecart%"
"textAlignment" "east"
- "xpos" "c-230"
+ "xpos" "c-238"
"ypos" "334"
"zpos" "12"
"wide" "56"
@@ -448,6 +448,7 @@
"PaintBackgroundType" "2"
"textinsetx" "15"
"Command" "viewcart"
+ "defaultBgColor_override" "TanDarker"
"sound_depressed" "UI/buttonclick.wav"
"sound_released" "UI/buttonclickrelease.wav"
}
@@ -456,7 +457,7 @@
{
"ControlName" "ImagePanel"
"fieldName" "CartImage"
- "xpos" "c-225"
+ "xpos" "c-233"
"ypos" "336"
"zpos" "13"
"wide" "24"
@@ -482,7 +483,7 @@
"enabled" "1"
"tabPosition" "0"
"labelText" "#Store_BrowseTheStore"
- "font" "HudFontSmallBold"
+ "font" "HudFontSmall"
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
@@ -507,7 +508,7 @@
"enabled" "1"
"tabPosition" "0"
"labelText" "#Store_MarketPlace"
- "font" "HudFontSmallBold"
+ "font" "HudFontSmall"
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
@@ -608,16 +609,17 @@
{
"ControlName" "EditablePanel"
"fieldName" "Wall"
- "xpos" "0"
+ "xpos" "c-250"
"ypos" "55"
"zpos" "-5"
- "wide" "f0"
- "tall" "f0"
+ "wide" "505"
+ "tall" "260"
"autoResize" "0"
"pinCorner" "0"
"visible" "1"
"enabled" "1"
"paintbackground" "1"
- "bgcolor_override" "0 0 0 100"
+ "bgcolor_override" "DarkerGrey"
+ "PaintBackgroundType" "2"
}
} \ No newline at end of file
diff --git a/resource/ui/econ/store/v2/storepage.res b/resource/ui/econ/store/v2/storepage.res
index 6f894cf..b876c4c 100644
--- a/resource/ui/econ/store/v2/storepage.res
+++ b/resource/ui/econ/store/v2/storepage.res
@@ -33,7 +33,7 @@
"item_backdrop_right_margin" "11"
"item_backdrop_top_margin" "9"
"item_backdrop_bottom_margin" "42"
- "item_backdrop_paintbackgroundtype" "2"
+ "item_backdrop_paintbackgroundtype" "0"
"item_panel_bgcolor" "Grey"
"item_panel_bgcolor_mouseover" "156 146 128 255"
"item_panel_bgcolor_selected" "176 166 148 255"
@@ -199,7 +199,7 @@
{
"defaultFgColor_override" "TanLight"
"defaultBgColor_override" "15 15 15 255"
- "armedFgColor_override" "15 255 255 255 255"
+ "armedFgColor_override" "15 255 255 255"
"armedBgColor_override" "15 15 15 255"
"paintbackgroundtype" "2"
}
@@ -240,7 +240,7 @@
{
"defaultFgColor_override" "TanLight"
"defaultBgColor_override" "15 15 15 255"
- "armedFgColor_override" "15 255 255 255 255"
+ "armedFgColor_override" "15 255 255 255"
"armedBgColor_override" "15 15 15 255"
"paintbackgroundtype" "2"
}
@@ -314,7 +314,7 @@
"ypos" "170"
"zpos" "100"
"wide" "200"
- "tall" "40"
+ "tall" "20"
"autoResize" "1"
"pinCorner" "0"
"visible" "0"
@@ -325,13 +325,14 @@
"paintborder" "1"
"textinsetx" "100"
"border" "LoadoutItemPopupBorder"
+ "fgcolor" "White"
}
"PrevPageButton"
{
"ControlName" "CExButton"
"fieldName" "PrevPageButton"
- "xpos" "c210"
+ "xpos" "c190"
"ypos" "280"
"zpos" "5"
"wide" "20"
@@ -349,17 +350,16 @@
"Command" "prevpage"
"sound_depressed" "UI/buttonclick.wav"
"sound_released" "UI/buttonclickrelease.wav"
- "defaultBgColor_override" "DarkerGrey"
}
"CurPageLabel"
{
"ControlName" "CExLabel"
"fieldName" "CurPageLabel"
- "font" "HudFontSmallBold"
+ "font" "HudFontSmall"
"labelText" "%backpackpage%"
"textAlignment" "center"
- "xpos" "c230"
+ "xpos" "c220"
"ypos" "280"
"zpos" "5"
"wide" "40"
@@ -393,7 +393,6 @@
"Command" "nextpage"
"sound_depressed" "UI/buttonclick.wav"
"sound_released" "UI/buttonclickrelease.wav"
- "defaultBgColor_override" "DarkerGrey"
}
"PriceLabel"
@@ -432,7 +431,7 @@
"pinCorner" "0"
"visible" "1"
"enabled" "1"
- "fgcolor" "StoreDarkTan"
+ "fgcolor" "White"
}
"SubcategoryFiltersLabel"
@@ -451,7 +450,7 @@
"pinCorner" "0"
"visible" "1"
"enabled" "1"
- "fgcolor" "StoreDarkTan"
+ "fgcolor" "White"
}
"SortFilterLabel"
@@ -470,7 +469,7 @@
"pinCorner" "0"
"visible" "1"
"enabled" "1"
- "fgcolor" "StoreDarkTan"
+ "fgcolor" "White"
}
"ClassFilterLabel"
@@ -489,7 +488,7 @@
"pinCorner" "0"
"visible" "1"
"enabled" "1"
- "fgcolor" "StoreDarkTan"
+ "fgcolor" "White"
}
"ClassFilterNavPanel"
@@ -698,11 +697,11 @@
{
"ControlName" "CExLabel"
"fieldName" "BackpackSpaceLabel"
- "font" "Cerbetica14"
+ "font" "HudFontSmallest"
"labelText" "%freebackpackspace%"
"textAlignment" "west"
- "xpos" "c-292"
- "ypos" "277"
+ "xpos" "c-300"
+ "ypos" "315"
"zpos" "0"
"wide" "200"
"tall" "20"
@@ -716,11 +715,11 @@
{
"ControlName" "CExButton"
"fieldName" "CartButton"
- "font" "HudFontSmallBold"
+ "font" "HudFontSmall"
"labelText" "%storecart%"
"textAlignment" "east"
- "xpos" "c-292"
- "ypos" "299"
+ "xpos" "c-300"
+ "ypos" "334"
"zpos" "12"
"wide" "56"
"tall" "24"
@@ -728,9 +727,8 @@
"enabled" "1"
"PaintBackgroundType" "2"
"textinsetx" "15"
-
"Command" "viewcart"
- "font" "HudFontSmallBold"
+ "defaultBgColor_override" "TanDarker"
"sound_depressed" "UI/buttonclick.wav"
"sound_released" "UI/buttonclickrelease.wav"
}
@@ -739,8 +737,8 @@
{
"ControlName" "ImagePanel"
"fieldName" "CartImage"
- "xpos" "c-289"
- "ypos" "302"
+ "xpos" "c-295"
+ "ypos" "336"
"zpos" "13"
"wide" "24"
"tall" "20"
diff --git a/resource/ui/econ/store/v2/storepanel.res b/resource/ui/econ/store/v2/storepanel.res
index 16d3602..202b658 100644
--- a/resource/ui/econ/store/v2/storepanel.res
+++ b/resource/ui/econ/store/v2/storepanel.res
@@ -91,7 +91,7 @@
"FooterLine"
{
"ControlName" "EditablePanel"
- "fieldName" "HeaderLine"
+ "fieldName" "FooterLine"
"xpos" "0"
"ypos" "420"
"zpos" "2"
@@ -109,7 +109,7 @@
"fieldName" "Sheet"
"tabxindent" "80"
"tabxdelta" "10"
- "tabwidth" "240"
+ "tabxfittotext" "1"
"tabheight" "20"
"yoffset" "14"
"transition_time" "0"
@@ -135,16 +135,15 @@
{
"textinsetx" "25"
"textAlignment" "center"
- "font" "Cerbetica20"
- "ypos" "50"
+ "font" "HudFontSmall"
"selectedcolor" "TanLight"
"unselectedcolor" "TanDark"
- "paintbackground" "1"
- "defaultBgColor_override" "DarkGrey"
+ "defaultBgColor_override" "DarkGrey"
+ "paintbackground" "1"
+ "activeborder_override" "CyanBorderTabs"
+ "normalborder_override" "CyanBorderTabsInactive"
"unselectedBgColor_override" "10 10 10 255"
- "activeborder_override" "CyanBorderTabs"
"depressedBgColor_override" "10 10 10 255"
- "normalborder_override" "CyanBorderTabsInactive"
}
}
@@ -155,15 +154,15 @@
"xpos" "c-300"
"ypos" "437"
"zpos" "2"
- "wide" "100"
+ "wide" "130"
"tall" "25"
"autoResize" "0"
"pinCorner" "3"
"visible" "1"
"enabled" "1"
"tabPosition" "0"
- "labelText" "<< Back (&Q)"
- "font" "HudFontSmallBold"
+ "labelText" "Exit Store (&Q)"
+ "font" "HudFontSmall"
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
@@ -222,7 +221,7 @@
"zpos" "5"
"wide" "70"
"tall" "100"
- "font" "Cerbetica10"
+ "font" "HudFontSmallest"
"wrap" "1"
"labelText" "#Store_ConfirmStampDonationAddTitle"
"visible" "0"
@@ -243,7 +242,7 @@
"enabled" "1"
"tabPosition" "0"
"labelText" "#Store_Checkout"
- "font" "HudFontSmallBold"
+ "font" "HudFontSmall"
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
diff --git a/resource/ui/econ/store/v2/storepreviewitempanel.res b/resource/ui/econ/store/v2/storepreviewitempanel.res
index 8beec68..89c57b5 100644
--- a/resource/ui/econ/store/v2/storepreviewitempanel.res
+++ b/resource/ui/econ/store/v2/storepreviewitempanel.res
@@ -118,7 +118,7 @@
{
"ControlName" "CExLabel"
"fieldName" "ItemNameLabel"
- "font" "CerbeticaBold20"
+ "font" "Cerbetica20"
"labelText" "%itemname%"
"textAlignment" "west"
"xpos" "240"
@@ -168,7 +168,7 @@
{
"ControlName" "CExLabel"
"fieldName" "ItemLevelInfoLabel"
- "font" "FontStoreOriginalPrice"
+ "font" "HudFontSmallest"
"labelText" "%item_level_info%"
"textAlignment" "north-west"
"wide" "228"
@@ -185,7 +185,7 @@
{
"ControlName" "CExLabel"
"fieldName" "RestrictionsLabel"
- "font" "FontStoreOriginalPrice"
+ "font" "HudFontSmallest"
"labelText" "#Store_ItemDesc_Restrictions"
"textAlignment" "north-west"
"wide" "228"
@@ -202,7 +202,7 @@
{
"ControlName" "CExLabel"
"fieldName" "RestrictionsTextLabel"
- "font" "FontStoreOriginalPrice"
+ "font" "HudFontSmallest"
"labelText" "#Store_HolidayRestrictionText"
"textAlignment" "north-west"
"wide" "228"
@@ -219,7 +219,7 @@
{
"ControlName" "CExLabel"
"fieldName" "UsedByLabel"
- "font" "FontStoreOriginalPrice"
+ "font" "HudFontSmallest"
"labelText" "#Store_ItemDesc_UsedBy"
"textAlignment" "north-west"
"wide" "228"
@@ -236,7 +236,7 @@
{
"ControlName" "CExLabel"
"fieldName" "UsedByTextLabel"
- "font" "FontStoreOriginalPrice"
+ "font" "HudFontSmallest"
"labelText" "%used_by_classes%"
"textAlignment" "north-west"
"wide" "228"
@@ -252,7 +252,7 @@
{
"ControlName" "CExLabel"
"fieldName" "SlotLabel"
- "font" "FontStoreOriginalPrice"
+ "font" "HudFontSmallest"
"labelText" "#Store_ItemDesc_Slot"
"textAlignment" "north-west"
"wide" "228"
@@ -269,7 +269,7 @@
{
"ControlName" "CExLabel"
"fieldName" "SlotTextLabel"
- "font" "FontStoreOriginalPrice"
+ "font" "HudFontSmallest"
"labelText" "%slot%"
"textAlignment" "north-west"
"wide" "228"
@@ -285,7 +285,7 @@
{
"ControlName" "CExLabel"
"fieldName" "PriceLabel"
- "font" "CerbeticaBold14"
+ "font" "HudFontSmall"
"textAlignment" "north-west"
"wide" "228"
"tall" "25"
@@ -301,7 +301,7 @@
{
"ControlName" "CExLabel"
"fieldName" "ArmoryTextLabel"
- "font" "FontStoreOriginalPrice"
+ "font" "HudFontSmallest"
"textAlignment" "north-west"
"wide" "228"
"tall" "10"
@@ -317,7 +317,7 @@
{
"ControlName" "CExLabel"
"fieldName" "AttributesLabel"
- "font" "FontStoreOriginalPrice"
+ "font" "HudFontSmallest"
"textAlignment" "north-west"
"wide" "228"
"tall" "10"
@@ -341,7 +341,7 @@
"enabled" "1"
"tabPosition" "0"
"labelText" "#Store_ItemDesc_ItemWikiPage"
- "font" "CerbeticaBold12"
+ "font" "HudFontSmall"
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
@@ -354,7 +354,7 @@
{
"ControlName" "CExLabel"
"fieldName" "TradableLabel"
- "font" "FontStoreOriginalPrice"
+ "font" "HudFontSmallest"
"labelText" "#Store_ItemDesc_Tradable"
"textAlignment" "north-west"
"wide" "205"
@@ -371,7 +371,7 @@
{
"ControlName" "CExLabel"
"fieldName" "TradableTextLabel"
- "font" "FontStoreOriginalPrice"
+ "font" "HudFontSmallest"
"labelText" "%tradable%"
"textAlignment" "north-west"
"wide" "205"
@@ -387,7 +387,7 @@
{
"ControlName" "CExLabel"
"fieldName" "GiftableLabel"
- "font" "FontStoreOriginalPrice"
+ "font" "HudFontSmallest"
"labelText" "#Store_ItemDesc_Giftable"
"textAlignment" "north-west"
"wide" "205"
@@ -404,7 +404,7 @@
{
"ControlName" "CExLabel"
"fieldName" "GiftableTextLabel"
- "font" "FontStoreOriginalPrice"
+ "font" "HudFontSmallest"
"labelText" "%giftable%"
"textAlignment" "north-west"
"wide" "205"
@@ -420,7 +420,7 @@
{
"ControlName" "CExLabel"
"fieldName" "NameableLabel"
- "font" "FontStoreOriginalPrice"
+ "font" "HudFontSmallest"
"labelText" "#Store_ItemDesc_Nameable"
"textAlignment" "north-west"
"wide" "205"
@@ -437,7 +437,7 @@
{
"ControlName" "CExLabel"
"fieldName" "NameableTextLabel"
- "font" "FontStoreOriginalPrice"
+ "font" "HudFontSmallest"
"labelText" "%nameable%"
"textAlignment" "north-west"
"wide" "205"
@@ -453,7 +453,7 @@
{
"ControlName" "CExLabel"
"fieldName" "CraftableLabel"
- "font" "FontStoreOriginalPrice"
+ "font" "HudFontSmallest"
"labelText" "#Store_ItemDesc_Craftable"
"textAlignment" "north-west"
"wide" "205"
@@ -470,7 +470,7 @@
{
"ControlName" "CExLabel"
"fieldName" "CraftableTextLabel"
- "font" "FontStoreOriginalPrice"
+ "font" "HudFontSmallest"
"labelText" "%craftable%"
"textAlignment" "north-west"
"wide" "205"
@@ -1058,7 +1058,7 @@
"enabled" "1"
"tabPosition" "0"
"labelText" "#Store_NextWeapon"
- "font" "CerbeticaBold12"
+ "font" "HudFontSmallest"
"textAlignment" "center"
"textinsetx" "50"
"dulltext" "0"
@@ -1198,7 +1198,7 @@
"paintbackground" "0"
"paintbackgroundtype" "0"
- "defaultBgColor_Override" "ColorBlack"
+ "defaultBgColor_Override" "0 0 0 255"
"paintborder" "0"
@@ -1419,7 +1419,7 @@
"enabled" "1"
"tabPosition" "0"
"labelText" "#TF_BackCarat"
- "font" "CerbeticaBold14"
+ "font" "HudFontSmall"
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
@@ -1443,7 +1443,7 @@
"enabled" "1"
"tabPosition" "0"
"labelText" "#Store_TryItOut"
- "font" "CerbeticaBold14"
+ "font" "HudFontSmall"
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
@@ -1460,14 +1460,14 @@
"xpos" "c0"
"ypos" "c105"
"zpos" "2"
- "wide" "160"
+ "wide" "150"
"tall" "20"
"autoResize" "0"
"visible" "1"
"enabled" "1"
"tabPosition" "0"
"labelText" "%storeaddtocart%"
- "font" "CerbeticaBold14"
+ "font" "HudFontSmall"
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
diff --git a/resource/ui/econ/store/v2/storepreviewitempanel_maps.res b/resource/ui/econ/store/v2/storepreviewitempanel_maps.res
index fc95819..18c7440 100644
--- a/resource/ui/econ/store/v2/storepreviewitempanel_maps.res
+++ b/resource/ui/econ/store/v2/storepreviewitempanel_maps.res
@@ -138,11 +138,11 @@
{
"ControlName" "CExLabel"
"fieldName" "ItemNameLabel"
- "font" "CerbeticaBold18"
+ "font" "HudFontMediumSmall"
"labelText" "%selectiontitle%"
"textAlignment" "center"
"xpos" "c-130"
- "ypos" "c-130"
+ "ypos" "c-129"
"wide" "260"
"tall" "33"
"autoResize" "1"
@@ -384,7 +384,7 @@
"enabled" "1"
"tabPosition" "0"
"labelText" "#Store_NextWeapon"
- "font" "CerbeticaBold12"
+ "font" "HudFontSmall"
"textAlignment" "center"
"textinsetx" "50"
"dulltext" "0"
@@ -541,7 +541,7 @@
"enabled" "1"
"tabPosition" "0"
"labelText" "#TF_BackCarat"
- "font" "CerbeticaBold14"
+ "font" "HudFontSmall"
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
@@ -565,7 +565,7 @@
"enabled" "1"
"tabPosition" "0"
"labelText" "#Store_AddToCart"
- "font" "CerbeticaBold14"
+ "font" "HudFontSmall"
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
diff --git a/resource/ui/econ/store/v2/storeviewcartpanel.res b/resource/ui/econ/store/v2/storeviewcartpanel.res
index d579550..0d2b1c3 100644
--- a/resource/ui/econ/store/v2/storeviewcartpanel.res
+++ b/resource/ui/econ/store/v2/storeviewcartpanel.res
@@ -76,7 +76,7 @@
{
"ControlName" "Label"
"fieldname" "quantitylabel"
- "font" "HudFontSmallestBold"
+ "font" "HudFontSmallest"
"textAlignment" "north-east"
"xpos" "70"
"ypos" "45"
@@ -113,14 +113,14 @@
"ypos" "17"
"zpos" "5"
"wide" "100"
- "tall" "25"
+ "tall" "20"
"autoResize" "0"
"pinCorner" "0"
"visible" "1"
"enabled" "1"
"tabPosition" "0"
"labelText" "#Store_Remove"
- "font" "HudFontSmallBold"
+ "font" "HudFontSmall"
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
@@ -146,26 +146,7 @@
"visible" "1"
"enabled" "1"
"labelText" "%price%"
- "fgcolor_override" "130 120 104 255"
- }
-
- "PreviewItemLabel"
- {
- "ControlName" "Label"
- "fieldname" "PreviewItemLabel"
- "font" "HudFontSmallest"
- "textAlignment" "center"
- "xpos" "110"
- "ypos" "36"
- "wide" "250"
- "tall" "15"
- "zpos" "15"
- "autoResize" "1"
- "pinCorner" "0"
- "visible" "1"
- "enabled" "1"
- "labelText" "%preview_item%"
- "fgcolor_override" "130 120 104 255"
+ "fgcolor_override" "DullWhite"
}
}
}
@@ -233,7 +214,7 @@
"FooterLine"
{
"ControlName" "EditablePanel"
- "fieldName" "HeaderLine"
+ "fieldName" "FooterLine"
"xpos" "0"
"ypos" "420"
"zpos" "2"
@@ -261,7 +242,7 @@
"ControlName" "EditablePanel"
"fieldName" "HeaderLine"
"xpos" "0"
- "ypos" "420"
+ "ypos" "0"
"zpos" "2"
"wide" "f0"
"tall" "2"
@@ -333,20 +314,20 @@
"wide" "600"
"tall" "240"
"PaintBackgroundType" "2"
- "fgcolor_override" "118 107 94 255" // Gets copied to the scrollbar fgcolor as part of ScrollableEditablePanel
+ "fgcolor_override" "DullWhite" // Gets copied to the scrollbar fgcolor as part of ScrollableEditablePanel
"bgcolor_override" "DarkGrey"
"autohide_buttons" "1"
"Scrollbar"
{
"xpos" "586"
- "wide" "11"
+ "wide" "4"
"tall" "240"
"zpos" "1000"
"Slider"
{
- "PaintBackgroundType" "2"
+ "PaintBackgroundType" "1"
}
"nobuttons" "1"
@@ -438,7 +419,7 @@
"pinCorner" "0"
"visible" "1"
"enabled" "1"
- "fgcolor_override" "130 120 104 255"
+ "fgcolor_override" "White"
}
"TotalSubtextLabelB"
@@ -457,7 +438,7 @@
"pinCorner" "0"
"visible" "1"
"enabled" "1"
- "fgcolor_override" "130 120 104 255"
+ "fgcolor_override" "White"
}
"TotalPriceLabel"
@@ -476,7 +457,7 @@
"visible" "1"
"enabled" "1"
"labelText" "%totalprice%"
- "fgcolor_override" "130 120 104 255"
+ "fgcolor_override" "White"
}
}
}
@@ -498,7 +479,7 @@
"enabled" "1"
"tabPosition" "0"
"labelText" "#Store_ContinueShopping"
- "font" "HudFontSmallBold"
+ "font" "HudFontSmall"
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
@@ -523,7 +504,7 @@
"enabled" "1"
"tabPosition" "0"
"labelText" "#Store_Checkout"
- "font" "HudFontSmallBold"
+ "font" "HudFontSmall"
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
diff --git a/resource/ui/econ/strangecounttransferdialog.res b/resource/ui/econ/strangecounttransferdialog.res
index a485d53..4c16925 100644
--- a/resource/ui/econ/strangecounttransferdialog.res
+++ b/resource/ui/econ/strangecounttransferdialog.res
@@ -34,7 +34,7 @@
{
"ControlName" "CExLabel"
"fieldName" "TitleLabel"
- "font" "Cerbetica26"
+ "font" "HudFontMedium"
"labelText" "#TF_StrangeCount_TransferTitle"
"textAlignment" "center"
"xpos" "95"
diff --git a/resource/ui/econ/tradingstartdialog.res b/resource/ui/econ/tradingstartdialog.res
index 57a0ef1..ff6f033 100644
--- a/resource/ui/econ/tradingstartdialog.res
+++ b/resource/ui/econ/tradingstartdialog.res
@@ -9,7 +9,7 @@
"ypos" "80"
"wide" "400"
"tall" "300"
- "bgcolor_override" "DarkGrey"
+ "bgcolor_override" "DarkerGrey"
"paintbackgroundtype" "2"
"settitlebarvisible" ""
"border" "CyanBorderThick"
@@ -57,7 +57,7 @@
"visible" "1"
"enabled" "1"
"scaleImage" "1"
- "color_outline" "52 48 45 255"
+ "color_outline" "HudTimerProgressInActive"
}
}
}
@@ -66,14 +66,14 @@
{
"ControlName" "CExLabel"
"fieldName" "TitleLabel"
- "font" "HudFontMediumBold"
+ "font" "HudFontMedium"
"labelText" "#TF_TradeStartDialog_Title"
"textAlignment" "north"
"xpos" "0"
"ypos" "15"
"zpos" "1"
"wide" "400"
- "tall" "35"
+ "tall" "25"
"autoResize" "0"
"pinCorner" "0"
"visible" "1"
@@ -121,7 +121,7 @@
{
"ControlName" "CExLabel"
"fieldName" "QueryLabel"
- "font" "HudFontSmallBold"
+ "font" "HudFontSmallest"
"labelText" "#TF_TradeStartDialog_Select"
"textAlignment" "north"
"xpos" "0"
@@ -144,14 +144,14 @@
"ypos" "50"
"zpos" "1"
"wide" "200"
- "tall" "25"
+ "tall" "20"
"autoResize" "0"
"pinCorner" "3"
"visible" "1"
"enabled" "1"
"tabPosition" "0"
"labelText" "#TF_TradeStartDialog_SelectFriends"
- "font" "HudFontSmallBold"
+ "font" "HudFontSmall"
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
@@ -168,14 +168,14 @@
"ypos" "90"
"zpos" "1"
"wide" "200"
- "tall" "25"
+ "tall" "20"
"autoResize" "0"
"pinCorner" "3"
"visible" "1"
"enabled" "1"
"tabPosition" "0"
"labelText" "#TF_TradeStartDialog_SelectServer"
- "font" "HudFontSmallBold"
+ "font" "HudFontSmall"
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
@@ -192,14 +192,14 @@
"ypos" "130"
"zpos" "1"
"wide" "200"
- "tall" "25"
+ "tall" "20"
"autoResize" "0"
"pinCorner" "3"
"visible" "1"
"enabled" "1"
"tabPosition" "0"
"labelText" "#TF_TradeStartDialog_SelectProfile"
- "font" "HudFontSmallBold"
+ "font" "HudFontSmall"
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
@@ -354,10 +354,10 @@
"labelText" "#TF_TradeStartDialog_ProfileHelp"
"textAlignment" "center"
"xpos" "0"
- "ypos" "35"
+ "ypos" "40"
"zpos" "-1"
"wide" "400"
- "tall" "40"
+ "tall" "30"
"autoResize" "0"
"pinCorner" "0"
"visible" "1"
@@ -443,14 +443,14 @@
"ypos" "150"
"zpos" "1"
"wide" "200"
- "tall" "25"
+ "tall" "20"
"autoResize" "0"
"pinCorner" "3"
"visible" "1"
"enabled" "1"
"tabPosition" "0"
"labelText" "#TF_TradeStartDialog_ProfileGo"
- "font" "HudFontSmallBold"
+ "font" "HudFontSmall"
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
@@ -469,14 +469,14 @@
"ypos" "250"
"zpos" "1"
"wide" "100"
- "tall" "25"
+ "tall" "20"
"autoResize" "0"
"pinCorner" "3"
"visible" "1"
"enabled" "1"
"tabPosition" "0"
"labelText" "#Cancel"
- "font" "HudFontSmallBold"
+ "font" "HudFontSmall"
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
diff --git a/resource/ui/flagstatus.res b/resource/ui/flagstatus.res
index 0e706a6..daffae7 100644
--- a/resource/ui/flagstatus.res
+++ b/resource/ui/flagstatus.res
@@ -12,6 +12,10 @@
"visible" "1"
"enabled" "1"
"scaleImage" "1"
+
+ "if_mvm" {
+ "ypos" "0"
+ }
}
"Briefcase"
@@ -30,9 +34,15 @@
"if_mvm"
{
+ "ypos" "14"
"wide" "24"
"tall" "24"
}
+
+ "if_specialdelivery"
+ {
+ "visible" "0"
+ }
}
"StatusIcon"
@@ -53,5 +63,10 @@
{
"visible" "0"
}
+
+ "if_specialdelivery"
+ {
+ "visible" "0"
+ }
}
} \ No newline at end of file
diff --git a/resource/ui/freezepanel_basic.res b/resource/ui/freezepanel_basic.res
index ff8e67d..2e7f8cc 100644
--- a/resource/ui/freezepanel_basic.res
+++ b/resource/ui/freezepanel_basic.res
@@ -41,7 +41,7 @@
"pinCorner" "0"
"visible" "1"
"enabled" "1"
- "fillcolor" "0 0 0 100"
+ "fillcolor" "TransparentBlack"
}
"TitleBackground"
@@ -57,7 +57,7 @@
"pinCorner" "0"
"visible" "1"
"enabled" "1"
- "fillcolor" "0 0 0 100"
+ "fillcolor" "TransparentBlack"
}
"itemmodelpanel"
@@ -72,7 +72,7 @@
{
"ControlName" "CExLabel"
"fieldName" "ItemLabel"
- "font" "Cerbetica12"
+ "font" "HudFontSmall"
"xpos" "10"
"ypos" "3"
"zpos" "1"
@@ -138,8 +138,8 @@
{
"ControlName" "Label"
"fieldName" "FreezeLabel"
- "font" "Cerbetica12"
- "xpos" "40"
+ "font" "HudFontSmall"
+ "xpos" "25"
"ypos" "15"
"zpos" "1"
"wide" "198"
@@ -149,7 +149,7 @@
"visible" "1"
"enabled" "1"
"labelText" "#FreezePanel_Killer"
- "textAlignment" "west"
+ "textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
}
@@ -176,9 +176,9 @@
{
"ControlName" "CExLabel"
"fieldName" "FreezeLabelKiller"
- "font" "Cerbetica12"
- "xpos" "42"
- "ypos" "28"
+ "font" "HudFontSmall"
+ "xpos" "25"
+ "ypos" "30"
"zpos" "1"
"wide" "196"
"tall" "15"
diff --git a/resource/ui/freezepanelkillerhealth.res b/resource/ui/freezepanelkillerhealth.res
index 4359cb8..796aa7b 100644
--- a/resource/ui/freezepanelkillerhealth.res
+++ b/resource/ui/freezepanelkillerhealth.res
@@ -40,10 +40,10 @@
"enabled" "0"
}
- "PlayerStatusHealthValueFreezePanel"
+ "GuiPlayerHealth"
{
"ControlName" "CExLabel"
- "fieldName" "PlayerStatusHealthValueFreezePanel"
+ "fieldName" "GuiPlayerHealth"
"xpos" "3"
"ypos" "3"
"zpos" "5"
@@ -52,14 +52,14 @@
"visible" "1"
"enabled" "1"
"textAlignment" "center"
- "font" "CerbeticaBold16"
+ "font" "Cerbetica16"
"labeltext" "%Health%"
}
- "PlayerStatusHealthValueFreezePanelShadow"
+ "GuiPlayerHealthShadow"
{
"ControlName" "CExLabel"
- "fieldName" "PlayerStatusHealthValueFreezePanelShadow"
+ "fieldName" "GuiPlayerHealthShadow"
"xpos" "4"
"ypos" "4"
"zpos" "5"
@@ -68,7 +68,7 @@
"visible" "1"
"enabled" "1"
"textAlignment" "center"
- "font" "CerbeticaBold16"
+ "font" "Cerbetica16"
"fgcolor" "TransparentBlack"
"labeltext" "%Health%"
}
diff --git a/resource/ui/hud_obj_dispenser.res b/resource/ui/hud_obj_dispenser.res
index 4c31572..89a5d5c 100644
--- a/resource/ui/hud_obj_dispenser.res
+++ b/resource/ui/hud_obj_dispenser.res
@@ -6,7 +6,7 @@
"fieldName" "BuildingStatusItem"
"xpos" "0"
"ypos" "0"
- "wide" "150"
+ "wide" "140"
"tall" "31"
"autoResize" "0"
"pinCorner" "0"
@@ -29,7 +29,7 @@
{
"ControlName" "CIconPanel"
"fieldName" "Icon"
- "xpos" "24"
+ "xpos" "21"
"ypos" "1"
"wide" "28"
"tall" "28"
@@ -54,7 +54,7 @@
{
"ControlName" "CExLabel"
"fieldName" "NotBuiltLabel"
- "font" "Cerbetica10"
+ "font" "Default"
"xpos" "60"
"ypos" "0"
"wide" "200"
@@ -178,8 +178,8 @@
"ControlName" "CBuildingHealthBar"
"fieldName" "Health"
"font" "Default"
- "xpos" "13"
- "ypos" "3"
+ "xpos" "10"
+ "ypos" "4"
"wide" "8"
"tall" "24"
"autoResize" "0"
diff --git a/resource/ui/hud_obj_sentrygun.res b/resource/ui/hud_obj_sentrygun.res
index 65cc65a..3a71de0 100644
--- a/resource/ui/hud_obj_sentrygun.res
+++ b/resource/ui/hud_obj_sentrygun.res
@@ -6,8 +6,8 @@
"fieldName" "BuildingStatusItem"
"xpos" "0"
"ypos" "0"
- "wide" "160"
- "tall" "206"
+ "wide" "140"
+ "tall" "35"
"autoResize" "0"
"pinCorner" "0"
"visible" "1"
@@ -29,10 +29,10 @@
{
"ControlName" "CIconPanel"
"fieldName" "Icon_Sentry_1"
- "xpos" "22"
- "ypos" "158"
- "wide" "36"
- "tall" "36"
+ "xpos" "21"
+ "ypos" "1"
+ "wide" "28"
+ "tall" "28"
"visible" "1"
"enabled" "1"
"scaleImage" "1"
@@ -44,10 +44,10 @@
{
"ControlName" "CIconPanel"
"fieldName" "Icon_Sentry_2"
- "xpos" "22"
- "ypos" "158"
- "wide" "36"
- "tall" "36"
+ "xpos" "21"
+ "ypos" "1"
+ "wide" "28"
+ "tall" "28"
"visible" "0"
"enabled" "1"
"scaleImage" "1"
@@ -59,10 +59,10 @@
{
"ControlName" "CIconPanel"
"fieldName" "Icon_Sentry_3"
- "xpos" "22"
- "ypos" "158"
- "wide" "36"
- "tall" "36"
+ "xpos" "21"
+ "ypos" "1"
+ "wide" "28"
+ "tall" "28"
"visible" "0"
"enabled" "1"
"scaleImage" "1"
@@ -75,20 +75,22 @@
"ControlName" "EditablePanel"
"fieldName" "NotBuiltPanel"
"xpos" "0"
- "ypos" "152"
+ "ypos" "0"
"wide" "160"
- "tall" "60"
+ "tall" "35"
"visible" "1"
"NotBuiltLabel"
{
"ControlName" "CExLabel"
"fieldName" "NotBuiltLabel"
- "font" "Cerbetica10"
+ "font" "Default"
"xpos" "60"
"ypos" "0"
"wide" "200"
- "tall" "60"
+ "tall" "35"
+ "autoResize" "0"
+ "pinCorner" "0"
"visible" "1"
"enabled" "1"
"labelText" "#Building_hud_sentry_not_built"
@@ -103,9 +105,9 @@
"ControlName" "EditablePanel"
"fieldName" "BuiltPanel"
"xpos" "0"
- "ypos" "146"
+ "ypos" "0"
"wide" "160"
- "tall" "60"
+ "tall" "35"
"visible" "0"
"Icon_Upgrade_1"
@@ -160,11 +162,10 @@
{
"ControlName" "CBuildingStatusAlertTray"
"fieldName" "AlertTray"
- "xpos" "114"
+ "xpos" "113"
"ypos" "0"
- "zpos" "-2"
- "wide" "44"
- "tall" "60"
+ "wide" "34"
+ "tall" "35"
"visible" "1"
"enabled" "1"
"icon" "obj_status_alert_background_tall"
@@ -175,10 +176,10 @@
"ControlName" "CIconPanel"
"fieldName" "WrenchIcon"
"xpos" "121"
- "ypos" "18"
+ "ypos" "7"
"zpos" "1"
- "wide" "27"
- "tall" "27"
+ "wide" "19"
+ "tall" "19"
"visible" "0"
"enabled" "1"
"scaleImage" "1"
@@ -191,10 +192,10 @@
"ControlName" "CIconPanel"
"fieldName" "SapperIcon"
"xpos" "117"
- "ypos" "12"
+ "ypos" "5"
"zpos" "1"
- "wide" "35"
- "tall" "35"
+ "wide" "25"
+ "tall" "25"
"visible" "0"
"enabled" "1"
"scaleImage" "1"
@@ -207,10 +208,10 @@
"ControlName" "CBuildingHealthBar"
"fieldName" "Health"
"font" "Default"
- "xpos" "13"
- "ypos" "3"
+ "xpos" "10"
+ "ypos" "4"
"wide" "8"
- "tall" "53"
+ "tall" "24"
"autoResize" "0"
"pinCorner" "0"
"visible" "1"
@@ -227,16 +228,16 @@
"xpos" "60"
"ypos" "0"
"wide" "100"
- "tall" "60"
+ "tall" "35"
"visible" "0"
"BuildingLabel"
{
"ControlName" "CExLabel"
"fieldName" "BuildingLabel"
- "font" "DefaultSmall"
+ "font" "Default"
"xpos" "0"
- "ypos" "18"
+ "ypos" "5"
"wide" "200"
"tall" "12"
"autoResize" "0"
@@ -255,7 +256,7 @@
"fieldName" "BuildingProgress"
"font" "Default"
"xpos" "0"
- "ypos" "29"
+ "ypos" "16"
"wide" "50"
"tall" "8"
"autoResize" "0"
@@ -275,7 +276,7 @@
"xpos" "60"
"ypos" "0"
"wide" "100"
- "tall" "60"
+ "tall" "35"
"visible" "0"
"KillIcon"
@@ -283,7 +284,7 @@
"ControlName" "ImagePanel"
"fieldName" "KillIcon"
"xpos" "0"
- "ypos" "12"
+ "ypos" "0"
"zpos" "1"
"wide" "10"
"tall" "10"
@@ -298,17 +299,17 @@
{
"ControlName" "CExLabel"
"fieldName" "KillsLabel"
- "font" "DefaultSmall"
+ "font" "Default"
"xpos" "12"
- "ypos" "13"
- "wide" "200"
- "tall" "22"
+ "ypos" "2"
+ "wide" "38"
+ "tall" "8"
"autoResize" "0"
"pinCorner" "0"
"visible" "1"
"enabled" "1"
"labelText" "#Building_hud_sentry_kills_assists"
- "textAlignment" "north-west"
+ "textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
}
@@ -318,7 +319,7 @@
"ControlName" "ImagePanel"
"fieldName" "ShellIcon"
"xpos" "0"
- "ypos" "25"
+ "ypos" "12"
"zpos" "1"
"wide" "10"
"tall" "10"
@@ -335,7 +336,7 @@
"fieldName" "Shells"
"font" "Default"
"xpos" "12"
- "ypos" "26"
+ "ypos" "12"
"wide" "38"
"tall" "8"
"autoResize" "0"
@@ -352,11 +353,11 @@
"ControlName" "ImagePanel"
"fieldName" "RocketIcon"
"xpos" "0"
- "ypos" "38"
+ "ypos" "23"
"zpos" "1"
"wide" "10"
"tall" "10"
- "visible" "0"
+ "visible" "1"
"enabled" "1"
"scaleImage" "1"
"image" "../hud/hud_obj_status_rockets_64"
@@ -369,12 +370,12 @@
"fieldName" "Rockets"
"font" "Default"
"xpos" "12"
- "ypos" "39"
+ "ypos" "23"
"wide" "38"
"tall" "8"
"autoResize" "0"
"pinCorner" "0"
- "visible" "0"
+ "visible" "1"
"enabled" "1"
"textAlignment" "Left"
"dulltext" "0"
@@ -386,7 +387,7 @@
"ControlName" "CIconPanel"
"fieldName" "UpgradeIcon"
"xpos" "0"
- "ypos" "38"
+ "ypos" "24"
"zpos" "1"
"wide" "10"
"tall" "10"
@@ -403,7 +404,7 @@
"fieldName" "Upgrade"
"font" "Default"
"xpos" "12"
- "ypos" "39"
+ "ypos" "23"
"wide" "38"
"tall" "8"
"autoResize" "0"
diff --git a/resource/ui/hud_obj_sentrygun_disp.res b/resource/ui/hud_obj_sentrygun_disp.res
index abad62a..8835042 100644
--- a/resource/ui/hud_obj_sentrygun_disp.res
+++ b/resource/ui/hud_obj_sentrygun_disp.res
@@ -54,7 +54,7 @@
{
"ControlName" "CExLabel"
"fieldName" "NotBuiltLabel"
- "font" "Cerbetica10"
+ "font" "Default"
"xpos" "60"
"ypos" "0"
"wide" "200"
diff --git a/resource/ui/hud_obj_tele.res b/resource/ui/hud_obj_tele.res
index da40541..aef1143 100644
--- a/resource/ui/hud_obj_tele.res
+++ b/resource/ui/hud_obj_tele.res
@@ -6,7 +6,7 @@
"fieldName" "BuildingStatusItem"
"xpos" "0"
"ypos" "0"
- "wide" "150"
+ "wide" "140"
"tall" "31"
"autoResize" "0"
"pinCorner" "0"
@@ -29,7 +29,7 @@
{
"ControlName" "CIconPanel"
"fieldName" "Icon"
- "xpos" "24"
+ "xpos" "21"
"ypos" "1"
"wide" "28"
"tall" "28"
@@ -54,7 +54,7 @@
{
"ControlName" "CExLabel"
"fieldName" "NotBuiltLabel"
- "font" "Cerbetica10"
+ "font" "Default"
"xpos" "60"
"ypos" "0"
"wide" "200"
@@ -178,8 +178,8 @@
"ControlName" "CBuildingHealthBar"
"fieldName" "Health"
"font" "Default"
- "xpos" "13"
- "ypos" "3"
+ "xpos" "10"
+ "ypos" "6"
"wide" "8"
"tall" "24"
"autoResize" "0"
@@ -205,7 +205,7 @@
{
"ControlName" "CExLabel"
"fieldName" "BuildingLabel"
- "font" "DefaultSmall"
+ "font" "Default"
"xpos" "0"
"ypos" "5"
"wide" "200"
diff --git a/resource/ui/hud_obj_tele_entrance.res b/resource/ui/hud_obj_tele_entrance.res
index fb70295..0e82ac5 100644
--- a/resource/ui/hud_obj_tele_entrance.res
+++ b/resource/ui/hud_obj_tele_entrance.res
@@ -6,7 +6,7 @@
"fieldName" "BuildingStatusItem"
"xpos" "0"
"ypos" "0"
- "wide" "150"
+ "wide" "140"
"tall" "31"
"autoResize" "0"
"pinCorner" "0"
@@ -29,7 +29,7 @@
{
"ControlName" "CIconPanel"
"fieldName" "Icon"
- "xpos" "24"
+ "xpos" "21"
"ypos" "1"
"wide" "28"
"tall" "28"
@@ -54,7 +54,7 @@
{
"ControlName" "CExLabel"
"fieldName" "NotBuiltLabel"
- "font" "Cerbetica10"
+ "font" "Default"
"xpos" "60"
"ypos" "0"
"wide" "200"
@@ -178,8 +178,8 @@
"ControlName" "CBuildingHealthBar"
"fieldName" "Health"
"font" "Default"
- "xpos" "13"
- "ypos" "3"
+ "xpos" "10"
+ "ypos" "4"
"wide" "8"
"tall" "24"
"autoResize" "0"
@@ -205,7 +205,7 @@
{
"ControlName" "CExLabel"
"fieldName" "BuildingLabel"
- "font" "DefaultSmall"
+ "font" "Default"
"xpos" "0"
"ypos" "5"
"wide" "200"
@@ -308,7 +308,7 @@
{
"ControlName" "CExLabel"
"fieldName" "TimesUsedLabel"
- "font" "DefaultSmall"
+ "font" "Default"
"xpos" "12"
"ypos" "5"
"wide" "200"
diff --git a/resource/ui/hud_obj_tele_exit.res b/resource/ui/hud_obj_tele_exit.res
index 35ef965..2c4ab9a 100644
--- a/resource/ui/hud_obj_tele_exit.res
+++ b/resource/ui/hud_obj_tele_exit.res
@@ -6,7 +6,7 @@
"fieldName" "BuildingStatusItem"
"xpos" "0"
"ypos" "0"
- "wide" "150"
+ "wide" "140"
"tall" "31"
"autoResize" "0"
"pinCorner" "0"
@@ -29,7 +29,7 @@
{
"ControlName" "CIconPanel"
"fieldName" "Icon"
- "xpos" "24"
+ "xpos" "21"
"ypos" "1"
"wide" "28"
"tall" "28"
@@ -54,7 +54,7 @@
{
"ControlName" "CExLabel"
"fieldName" "NotBuiltLabel"
- "font" "Cerbetica10"
+ "font" "Default"
"xpos" "60"
"ypos" "0"
"wide" "200"
@@ -77,7 +77,7 @@
"xpos" "0"
"ypos" "0"
"wide" "160"
- "tall" "43"
+ "tall" "31"
"visible" "0"
"Icon_Upgrade_1"
@@ -178,8 +178,8 @@
"ControlName" "CBuildingHealthBar"
"fieldName" "Health"
"font" "Default"
- "xpos" "13"
- "ypos" "3"
+ "xpos" "10"
+ "ypos" "4"
"wide" "8"
"tall" "24"
"autoResize" "0"
@@ -205,7 +205,7 @@
{
"ControlName" "CExLabel"
"fieldName" "BuildingLabel"
- "font" "DefaultSmall"
+ "font" "Default"
"xpos" "0"
"ypos" "5"
"wide" "200"
diff --git a/resource/ui/hudaccountpanel.res b/resource/ui/hudaccountpanel.res
index ac5a751..00cab75 100644
--- a/resource/ui/hudaccountpanel.res
+++ b/resource/ui/hudaccountpanel.res
@@ -2,33 +2,34 @@
{
"CHudAccountPanel"
{
- "delta_item_x" "12"
- "delta_item_start_y" "130"
- "delta_item_end_y" "150"
+ "delta_item_x" "10"
+ "delta_item_start_y" "10"
+ "delta_item_end_y" "35"
"PositiveColor" "ColorGreen"
"NegativeColor" "ColorRed"
- "delta_lifetime" "1.5"
- "delta_item_font" "Cerbetica20"
- "delta_item_start_y_minmode" "75"
- "delta_item_end_y_minmode" "105"
- "delta_item_font_minmode" "Cerbetica16"
+ "delta_lifetime" "2"
+ "delta_item_font" "HudFontMedium"
+ "delta_item_x_minmode" "18"
+ "delta_item_start_y_minmode" "10"
+ "delta_item_end_y_minmode" "25"
+ "delta_item_font_minmode" "HudFontSmall"
}
"AccountBG"
{
- "ControlName" "CTFImagePanel"
- "fieldName" "AccountBG"
- "xpos" "5"
- "ypos" "103"
- "zpos" "0"
- "wide" "84"
- "tall" "42"
- "visible" "0"
- "enabled" "0"
- "image" "../hud/misc_ammo_area_blue"
- "scaleImage" "1"
- "teambg_2" "../hud/misc_ammo_area_red"
- "teambg_3" "../hud/misc_ammo_area_blue"
+ "ControlName" "CTFImagePanel"
+ "fieldName" "AccountBG"
+ "xpos" "5"
+ "ypos" "103"
+ "zpos" "0"
+ "wide" "84"
+ "tall" "42"
+ "visible" "0"
+ "enabled" "0"
+ "image" "../hud/misc_ammo_area_blue"
+ "scaleImage" "1"
+ "teambg_2" "../hud/misc_ammo_area_red"
+ "teambg_3" "../hud/misc_ammo_area_blue"
}
"MetalIcon"
@@ -36,8 +37,7 @@
"ControlName" "CIconPanel"
"fieldName" "MetalIcon"
"xpos" "0"
- "ypos" "120"
- "ypos_minmode" "70"
+ "ypos" "5"
"zpos" "1"
"wide" "10"
"tall" "10"
@@ -72,12 +72,11 @@
{
"ControlName" "CExLabel"
"fieldName" "AccountValue"
- "xpos" "1"
- "ypos" "112"
- "ypos_minmode" "62"
+ "xpos" "5"
+ "ypos" "0"
"zpos" "2"
- "wide" "55"
- "tall" "26"
+ "wide" "50"
+ "tall" "20"
"autoResize" "1"
"pinCorner" "2"
"visible" "1"
@@ -87,8 +86,8 @@
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
- "font" "Cerbetica24"
- "font_minmode" "Cerbetica20"
+ "font" "HudFontMedium"
+ "font_minmode" "HudFontMediumSecondary"
}
"AccountValueShadow"
@@ -98,8 +97,8 @@
"xpos" "-2"
"ypos" "-2"
"zpos" "2"
- "wide" "55"
- "tall" "26"
+ "wide" "50"
+ "tall" "20"
"autoResize" "1"
"pinCorner" "2"
"visible" "1"
@@ -109,8 +108,8 @@
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
- "font" "Cerbetica24"
- "font_minmode" "Cerbetica20"
+ "font" "HudFontMedium"
+ "font_minmode" "HudFontMediumSecondary"
"fgcolor" "TransparentBlack"
"pin_to_sibling" "AccountValue"
diff --git a/resource/ui/hudachievementtrackeritem.res b/resource/ui/hudachievementtrackeritem.res
index 04e69c3..c87717b 100644
--- a/resource/ui/hudachievementtrackeritem.res
+++ b/resource/ui/hudachievementtrackeritem.res
@@ -25,7 +25,7 @@
"tall" "16"
"zpos" "4"
"textinsetx" "5"
- "font" "CerbeticaBold14"
+ "font" "Cerbetica16"
"textAlignment" "north-west"
}
@@ -51,7 +51,7 @@
"fieldName" "AchievementDesc"
"labeltext" ""
"xpos" "5"
- "ypos" "12"
+ "ypos" "14"
"wide" "190"
"tall" "18"
"zpos" "4"
diff --git a/resource/ui/hudammoweapons-white.res b/resource/ui/hudammoweapons-white.res
deleted file mode 100644
index 660f0b7..0000000
--- a/resource/ui/hudammoweapons-white.res
+++ /dev/null
@@ -1,153 +0,0 @@
-"Resource/UI/HudAmmoWeapons.res"
-{
- "HudWeaponAmmoBG"
- {
- "ControlName" "CTFImagePanel"
- "fieldName" "HudWeaponAmmoBG"
- "xpos" "9999"
- "ypos" "9999"
- "zpos" "1"
- "wide" "90"
- "tall" "45"
- "visible" "0"
- "enabled" "1"
- "image" "../hud/ammo_blue_bg"
- "scaleImage" "1"
- "teambg_2" "../hud/ammo_red_bg"
- "teambg_2_lodef" "../hud/ammo_red_bg_lodef"
- "teambg_3" "../hud/ammo_blue_bg"
- "teambg_3_lodef" "../hud/ammo_blue_bg_lodef"
- }
- "HudWeaponLowAmmoImage"
- {
- "ControlName" "ImagePanel"
- "fieldName" "HudWeaponLowAmmoImage"
- "xpos" "9999"
- "ypos" "9999"
- "zpos" "0"
- "wide" "90"
- "tall" "45"
- "visible" "0"
- "enabled" "0"
- "image" "../hud/ammo_red_bg"
- "scaleImage" "1"
- "teambg_2" "../hud/ammo_red_bg"
- "teambg_2_lodef" "../hud/ammo_red_bg_lodef"
- "teambg_3" "../hud/ammo_blue_bg"
- "teambg_3_lodef" "../hud/ammo_blue_bg_lodef"
- }
- "AmmoInClip"
- {
- "ControlName" "CExLabel"
- "fieldName" "AmmoInClip"
- "font" "CerbeticaBold56"
- "font_minmode" "CerbeticaBold32"
- "fgcolor" "TanLight"
- "xpos" "-18"
- "ypos" "-11"
- "xpos_minmode" "-16"
- "ypos_minmode" "-1"
- "zpos" "5"
- "wide" "80"
- "tall" "80"
- "visible" "0"
- "enabled" "1"
- "textAlignment" "east"
- "labelText" "%Ammo%"
- }
- "AmmoInClipShadow"
- {
- "ControlName" "CExLabel"
- "fieldName" "AmmoInClipShadow"
- "font" "CerbeticaBold56"
- "font_minmode" "CerbeticaBold32"
- "fgcolor" "TransparentBlack"
- "xpos" "-16"
- "ypos" "-9"
- "xpos_minmode" "-14"
- "ypos_minmode" "1"
- "zpos" "5"
- "wide" "80"
- "tall" "80"
- "visible" "0"
- "enabled" "1"
- "textAlignment" "east"
- "labelText" "%Ammo%"
- }
- "AmmoInReserve"
- {
- "ControlName" "CExLabel"
- "fieldName" "AmmoInReserve"
- "font" "CerbeticaBold32"
- "font_minmode" "CerbeticaBold20"
- "fgcolor" "TanLight"
- "xpos" "67"
- "ypos" "-10"
- "xpos_minmode" "69"
- "ypos_minmode" "-1"
- "zpos" "7"
- "wide" "60"
- "tall" "80"
- "visible" "0"
- "enabled" "1"
- "textAlignment" "west"
- "labelText" "%AmmoInReserve%"
- }
- "AmmoInReserveShadow"
- {
- "ControlName" "CExLabel"
- "fieldName" "AmmoInReserveShadow"
- "font" "CerbeticaBold32"
- "font_minmode" "CerbeticaBold20"
- "fgcolor" "TransparentBlack"
- "xpos" "68"
- "ypos" "-9"
- "xpos_minmode" "70"
- "ypos_minmode" "0"
- "zpos" "7"
- "wide" "60"
- "tall" "80"
- "visible" "0"
- "enabled" "1"
- "textAlignment" "west"
- "labelText" "%AmmoInReserve%"
- }
- "AmmoNoClip"
- {
- "ControlName" "CExLabel"
- "fieldName" "AmmoNoClip"
- "font" "CerbeticaBold56"
- "font_minmode" "CerbeticaBold32"
- "fgcolor" "TanLight"
- "xpos" "26"
- "ypos" "-11"
- "xpos_minmode" "22"
- "ypos_minmode" "-1"
- "zpos" "5"
- "wide" "100"
- "tall" "80"
- "visible" "0"
- "enabled" "1"
- "textAlignment" "center"
- "labelText" "%Ammo%"
- }
- "AmmoNoClipShadow"
- {
- "ControlName" "CExLabel"
- "fieldName" "AmmoNoClipShadow"
- "font" "CerbeticaBold56"
- "font_minmode" "CerbeticaBold32"
- "fgcolor" "TransparentBlack"
- "xpos" "28"
- "ypos" "-9"
- "xpos_minmode" "24"
- "ypos_minmode" "1"
- "zpos" "5"
- "wide" "100"
- "tall" "80"
- "visible" "0"
- "enabled" "1"
- "textAlignment" "center"
- "labelText" "%Ammo%"
- }
-} \ No newline at end of file
diff --git a/resource/ui/hudammoweapons.res b/resource/ui/hudammoweapons.res
index a1e14ed..26ef7cb 100644
--- a/resource/ui/hudammoweapons.res
+++ b/resource/ui/hudammoweapons.res
@@ -18,13 +18,13 @@
{
"ControlName" "CExLabel"
"fieldName" "AmmoInClip"
- "font" "CerbeticaBold56"
- "font_minmode" "CerbeticaBold32"
+ "font" "Cerbetica56"
+ "font_minmode" "Cerbetica32"
"fgcolor" "Ammo In Clip"
"xpos" "0"
"ypos" "0"
"zpos" "5"
- "wide" "65"
+ "wide" "60"
"tall" "50"
"visible" "0"
"enabled" "1"
@@ -35,13 +35,13 @@
{
"ControlName" "CExLabel"
"fieldName" "AmmoInClipShadow"
- "font" "CerbeticaBold56"
- "font_minmode" "CerbeticaBold32"
+ "font" "Cerbetica56"
+ "font_minmode" "Cerbetica32"
"fgcolor" "TransparentBlack"
"xpos" "-2"
"ypos" "-2"
"zpos" "5"
- "wide" "65"
+ "wide" "60"
"tall" "50"
"visible" "0"
"enabled" "1"
@@ -57,13 +57,13 @@
{
"ControlName" "CExLabel"
"fieldName" "AmmoInReserve"
- "font" "CerbeticaBold32"
- "font_minmode" "CerbeticaBold20"
+ "font" "Cerbetica32"
+ "font_minmode" "Cerbetica20"
"fgcolor" "Ammo In Reserve"
- "xpos" "70"
+ "xpos" "65"
"ypos" "0"
"zpos" "7"
- "wide" "100"
+ "wide" "f0"
"tall" "50"
"visible" "0"
"enabled" "1"
@@ -74,13 +74,13 @@
{
"ControlName" "CExLabel"
"fieldName" "AmmoInReserveShadow"
- "font" "CerbeticaBold32"
- "font_minmode" "CerbeticaBold20"
+ "font" "Cerbetica32"
+ "font_minmode" "Cerbetica20"
"fgcolor" "TransparentBlack"
"xpos" "-2"
"ypos" "-2"
"zpos" "7"
- "wide" "100"
+ "wide" "f0"
"tall" "50"
"visible" "0"
"enabled" "1"
@@ -96,13 +96,13 @@
{
"ControlName" "CExLabel"
"fieldName" "AmmoNoClip"
- "font" "CerbeticaBold56"
- "font_minmode" "CerbeticaBold32"
+ "font" "Cerbetica56"
+ "font_minmode" "Cerbetica32"
"fgcolor" "Ammo In Clip"
"xpos" "0"
"ypos" "0"
"zpos" "5"
- "wide" "100"
+ "wide" "110"
"tall" "50"
"visible" "0"
"enabled" "1"
@@ -113,13 +113,13 @@
{
"ControlName" "CExLabel"
"fieldName" "AmmoNoClipShadow"
- "font" "CerbeticaBold56"
- "font_minmode" "CerbeticaBold32"
+ "font" "Cerbetica56"
+ "font_minmode" "Cerbetica32"
"fgcolor" "TransparentBlack"
"xpos" "-2"
"ypos" "-2"
"zpos" "4"
- "wide" "100"
+ "wide" "110"
"tall" "50"
"visible" "0"
"enabled" "1"
diff --git a/resource/ui/hudarenaclasslayout.res b/resource/ui/hudarenaclasslayout.res
index defd6dd..50f3863 100644
--- a/resource/ui/hudarenaclasslayout.res
+++ b/resource/ui/hudarenaclasslayout.res
@@ -19,9 +19,9 @@
"teambg_3" "../hud/color_panel_blu"
"paintborder" "0"
- "src_corner_height" "23" // pixels inside the image
+ "src_corner_height" "23"
"src_corner_width" "23"
- "draw_corner_width" "0" // screen size of the corners ( and sides ), proportional
+ "draw_corner_width" "0"
"draw_corner_height" "0"
}
@@ -44,10 +44,9 @@
"teambg_3" "../hud/color_panel_clear"
"paintborder" "0"
- "src_corner_height" "23" // pixels inside the image
+ "src_corner_height" "23"
"src_corner_width" "23"
-
- "draw_corner_width" "0" // screen size of the corners ( and sides ), proportional
+ "draw_corner_width" "0"
"draw_corner_height" "0"
}
@@ -64,7 +63,7 @@
"pinCorner" "0"
"visible" "0"
"enabled" "0"
- "font" "CerbeticaBold20"
+ "font" "Cerbetica20"
"labelText" "#TF_Arena_Team_Layout"
"textAlignment" "center"
"fgcolor" "TanLight"
@@ -82,7 +81,7 @@
"pinCorner" "0"
"visible" "0"
"enabled" "0"
- "font" "CerbeticaBold20"
+ "font" "Cerbetica20"
"labelText" "#TF_Arena_Team_Layout"
"textAlignment" "center"
"fgcolor" "TransparentBlack"
diff --git a/resource/ui/hudarenanotification.res b/resource/ui/hudarenanotification.res
index 0ab2238..36b20b1 100644
--- a/resource/ui/hudarenanotification.res
+++ b/resource/ui/hudarenanotification.res
@@ -2,36 +2,35 @@
{
"HudArenaNotificationBG"
{
- "ControlName" "ImagePanel"
+ "ControlName" "EditablePanel"
"fieldName" "HudArenaNotificationBG"
- "xpos" "20"
+ "xpos" "0"
"ypos" "0"
"zpos" "-1"
"wide" "280"
- "tall" "100"
- "autoResize" "0"
- "pinCorner" "0"
+ "tall" "75"
"visible" "1"
"enabled" "1"
- "fillcolor" "0 0 0 230"
- "border" "CyanBorderThick"
+ "bgcolor_override" "TransparentBlack"
+ "PaintBackgroundType" "2"
+ "border" "CyanBorderThick"
}
"WarningLabel"
{
"ControlName" "Label"
"fieldName" "WarningLabel"
- "font" "CerbeticaBold72"
- "xpos" "40"
- "ypos" "15"
+ "font" "HudFontGiantBold"
+ "xpos" "0"
+ "ypos" "0"
"zpos" "1"
- "wide" "72"
- "tall" "72"
+ "wide" "50"
+ "tall" "75"
"autoResize" "0"
"pinCorner" "0"
"visible" "1"
"enabled" "1"
- "wrap" "1"
+ "wrap" "0"
"labelText" "!"
"textAlignment" "center"
}
@@ -40,12 +39,12 @@
{
"ControlName" "Label"
"fieldName" "BalanceLabel"
- "font" "CerbeticaBold20"
- "xpos" "70"
+ "font" "HudFontSmall"
+ "xpos" "50"
"ypos" "0"
"zpos" "1"
"wide" "230"
- "tall" "64"
+ "tall" "40"
"autoResize" "0"
"pinCorner" "0"
"visible" "1"
@@ -59,12 +58,12 @@
{
"ControlName" "Label"
"fieldName" "BalanceLabelTip"
- "font" "CerbeticaBold16"
- "xpos" "70"
- "ypos" "34"
+ "font" "HudFontSmall"
+ "xpos" "50"
+ "ypos" "30"
"zpos" "1"
"wide" "230"
- "tall" "64"
+ "tall" "35"
"autoResize" "0"
"pinCorner" "0"
"visible" "1"
@@ -79,7 +78,7 @@
"ControlName" "CTFImagePanel"
"fieldName" "SwitchImage"
"xpos" "25"
- "ypos" "23"
+ "ypos" "0"
"zpos" "1"
"wide" "50"
"tall" "50"
diff --git a/resource/ui/hudarenaplayercount.res b/resource/ui/hudarenaplayercount.res
index eff1c27..96cd136 100644
--- a/resource/ui/hudarenaplayercount.res
+++ b/resource/ui/hudarenaplayercount.res
@@ -38,7 +38,7 @@
"pinCorner" "0"
"visible" "1"
"enabled" "1"
- "font" "CerbeticaBold28"
+ "font" "Cerbetica28"
"labelText" "%blue_alive%"
"textAlignment" "east"
"fgcolor" "TanLight"
@@ -56,7 +56,7 @@
"pinCorner" "0"
"visible" "1"
"enabled" "1"
- "font" "CerbeticaBold28"
+ "font" "Cerbetica28"
"labelText" "%blue_alive%"
"textAlignment" "east"
"fgcolor" "TransparentBlack"
@@ -120,7 +120,7 @@
"pinCorner" "0"
"visible" "1"
"enabled" "1"
- "font" "CerbeticaBold28"
+ "font" "Cerbetica28"
"labelText" "%red_alive%"
"textAlignment" "west"
"fgcolor" "TanLight"
@@ -138,7 +138,7 @@
"pinCorner" "0"
"visible" "1"
"enabled" "1"
- "font" "CerbeticaBold28"
+ "font" "Cerbetica28"
"labelText" "%red_alive%"
"textAlignment" "west"
"fgcolor" "TransparentBlack"
diff --git a/resource/ui/hudarenateammenu.res b/resource/ui/hudarenateammenu.res
index d8dfd5b..58c369e 100644
--- a/resource/ui/hudarenateammenu.res
+++ b/resource/ui/hudarenateammenu.res
@@ -12,6 +12,7 @@
"pinCorner" "0"
"visible" "1"
"enabled" "1"
+ "fgcolor" "255 0 0 255"
"tabPosition" "0"
}
@@ -21,13 +22,13 @@
"fieldName" "SidePanelBG"
"xpos" "0"
"ypos" "0"
- "zpos" "1"
+ "zpos" "0"
"wide" "255"
"tall" "f0"
"visible" "1"
"enabled" "1"
"scaleImage" "1"
- "fillcolor" "0 0 0 60"
+ "fillcolor" "0 0 0 120"
}
"SysMenu"
@@ -70,10 +71,10 @@
"wide" "255"
"tall" "30"
"textAlignment" "center"
- "font" "CerbeticaBold28"
+ "font" "Cerbetica28"
"visible" "1"
"enabled" "1"
- "fgcolor" "TanLight"
+ "fgcolor_override" "TanLight"
}
"teambutton2"
@@ -96,31 +97,11 @@
"brighttext" "0"
"paintborder" "0"
"command" "jointeam spectate"
- "font" "CerbeticaBold20"
-
- "defaultFgColor_override" "255 255 255 128"
- "armedFgColor_override" "TanLight"
- "depressedFgColor_override" "255 255 255 128"
- "selectedFgColor_override" "TanLight"
-
- "defaultBgColor_override" "0 0 0 200"
- "armedBgColor_override" "TanDarker"
- "depressedBgColor_override" "0 0 0 200"
- "selectedBgColor_override" "TanDarker"
- }
-
- "JoinBG"
- {
- "ControlName" "ImagePanel"
- "fieldName" "JoinBG"
- "xpos" "0"
- "ypos" "c-35"
- "zpos" "0"
- "wide" "255"
- "tall" "30"
- "visible" "1"
- "enabled" "1"
- "fillcolor" "0 0 0 200"
+ "font" "Cerbetica20"
+ "defaultFgColor_override" "255 255 255 128"
+ "armedFgColor_override" "235 226 202 255"
+ "depressedFgColor_override" "255 255 255 128"
+ "selectedFgColor_override" "235 226 202 255"
}
"teambutton3"
@@ -143,31 +124,25 @@
"brighttext" "0"
"paintborder" "0"
"command" "jointeam spectatearena"
- "font" "CerbeticaBold20"
-
- "defaultFgColor_override" "255 255 255 128"
- "armedFgColor_override" "TanLight"
- "depressedFgColor_override" "255 255 255 128"
- "selectedFgColor_override" "TanLight"
-
- "defaultBgColor_override" "0 0 0 200"
- "armedBgColor_override" "TanDarker"
- "depressedBgColor_override" "0 0 0 200"
- "selectedBgColor_override" "TanDarker"
+ "font" "Cerbetica20"
+ "defaultFgColor_override" "255 255 255 128"
+ "armedFgColor_override" "235 226 202 255"
+ "depressedFgColor_override" "255 255 255 128"
+ "selectedFgColor_override" "235 226 202 255"
}
- "SpecBG"
+ "SpectateBG"
{
- "ControlName" "ImagePanel"
- "fieldName" "SpecBG"
+ "ControlName" "EditablePanel"
+ "fieldName" "SpectateBG"
"xpos" "0"
- "ypos" "c5"
+ "ypos" "c-35"
"zpos" "0"
"wide" "255"
"tall" "30"
"visible" "1"
"enabled" "1"
- "fillcolor" "0 0 0 200"
+ "bgcolor_override" "HudBlack"
}
"MenuBG"
@@ -186,41 +161,6 @@
"fillcolor" "255 255 255 200"
}
- "TeamMenuAuto"
- {
- "ControlName" "CExLabel"
- "fieldName" "TeamMenuAuto"
- "xpos" "9999"
- }
-
- "TeamMenuSpectate"
- {
- "ControlName" "CExLabel"
- "fieldName" "TeamMenuSpectate"
- "xpos" "9999"
- }
-
- "ShadedBar"
- {
- "ControlName" "ImagePanel"
- "fieldName" "ShadedBar"
- "xpos" "9999"
- }
-
- "autodoor"
- {
- "ControlName" "CModelPanel"
- "fieldName" "autodoor"
- "xpos" "9999"
- }
-
- "spectate"
- {
- "ControlName" "CModelPanel"
- "fieldName" "spectate"
- "xpos" "9999"
- }
-
"CancelButton"
{
"ControlName" "CExButton"
diff --git a/resource/ui/hudarenawinpanel.res b/resource/ui/hudarenawinpanel.res
index 5278ae6..cd4d2a3 100644
--- a/resource/ui/hudarenawinpanel.res
+++ b/resource/ui/hudarenawinpanel.res
@@ -42,7 +42,7 @@
{
"ControlName" "CExLabel"
"fieldName" "BlueTeamLabel"
- "font" "Cerbetica24"
+ "font" "HudFontMedium"
"labelText" "%blueteamname%"
"textAlignment" "west"
"xpos" "29"
@@ -58,7 +58,7 @@
{
"ControlName" "CExLabel"
"fieldName" "BlueTeamScore"
- "font" "Cerbetica48"
+ "font" "Cerbetica40"
"labelText" "%blueteamscore%"
"textAlignment" "east"
"xpos" "138"
@@ -75,7 +75,7 @@
{
"ControlName" "CExLabel"
"fieldName" "BlueTeamScoreDropshadow"
- "font" "Cerbetica48"
+ "font" "Cerbetica40"
"fgcolor" "TransparentBlack"
"labelText" "%blueteamscore%"
"textAlignment" "east"
@@ -97,7 +97,7 @@
{
"ControlName" "CExLabel"
"fieldName" "RedTeamLabel"
- "font" "Cerbetica24"
+ "font" "HudFontMedium"
"labelText" "%redteamname%"
"textAlignment" "east"
"xpos" "220"
@@ -113,7 +113,7 @@
{
"ControlName" "CExLabel"
"fieldName" "RedTeamScore"
- "font" "Cerbetica48"
+ "font" "Cerbetica40"
"labelText" "%redteamscore%"
"textAlignment" "west"
"xpos" "230"
@@ -130,7 +130,7 @@
{
"ControlName" "CExLabel"
"fieldName" "RedTeamScoreDropshadow"
- "font" "Cerbetica48"
+ "font" "Cerbetica40"
"fgcolor" "TransparentBlack"
"labelText" "%redteamscore%"
"textAlignment" "west"
@@ -175,7 +175,7 @@
{
"ControlName" "CExLabel"
"fieldName" "ArenaStreakLabel"
- "font" "CerbeticaBold14"
+ "font" "Cerbetica14"
"fgcolor" "TanLight"
"xpos" "9999"
"ypos" "9999"
@@ -229,7 +229,7 @@
{
"ControlName" "CExLabel"
"fieldName" "WinningTeamLabel"
- "font" "CerbeticaBold20"
+ "font" "Cerbetica20"
"xpos" "35"
"ypos" "41"
"zpos" "1"
@@ -248,7 +248,7 @@
{
"ControlName" "CExLabel"
"fieldName" "WinningTeamLabelDropshadow"
- "font" "CerbeticaBold20"
+ "font" "Cerbetica20"
"fgcolor" "TransparentBlack"
"xpos" "36"
"ypos" "42"
@@ -269,7 +269,7 @@
{
"ControlName" "CExLabel"
"fieldName" "LosingTeamLabel"
- "font" "CerbeticaBold20"
+ "font" "Cerbetica20"
"xpos" "35"
"ypos" "41"
"zpos" "1"
@@ -288,7 +288,7 @@
{
"ControlName" "CExLabel"
"fieldName" "LosingTeamLabelDropshadow"
- "font" "CerbeticaBold20"
+ "font" "Cerbetica20"
"fgcolor" "TransparentBlack"
"xpos" "36"
"ypos" "42"
@@ -327,7 +327,7 @@
{
"ControlName" "CExLabel"
"fieldName" "DetailsLabel"
- "font" "Cerbetica9"
+ "font" "Default"
"xpos" "35"
"ypos" "122"
"zpos" "1"
@@ -363,7 +363,7 @@
{
"ControlName" "CExLabel"
"fieldName" "TopPlayerLabel"
- "font" "Cerbetica9"
+ "font" "Default"
"xpos" "50"
"ypos" "64"
"zpos" "3"
@@ -382,7 +382,7 @@
{
"ControlName" "CExLabel"
"fieldName" "DamageThisRoundLabel"
- "font" "Cerbetica9"
+ "font" "Default"
"xpos" "265"
"ypos" "64"
"zpos" "3"
@@ -401,7 +401,7 @@
{
"ControlName" "CExLabel"
"fieldName" "PointsThisRoundLabel"
- "font" "Cerbetica9"
+ "font" "Default"
"xpos" "315"
"ypos" "64"
"zpos" "3"
@@ -420,7 +420,7 @@
{
"ControlName" "CExLabel"
"fieldName" "PointsThisRoundLabel"
- "font" "Cerbetica9"
+ "font" "Default"
"xpos" "360"
"ypos" "64"
"zpos" "3"
@@ -439,7 +439,7 @@
{
"ControlName" "CExLabel"
"fieldName" "PointsThisRoundLabel"
- "font" "Cerbetica9"
+ "font" "Default"
"xpos" "400"
"ypos" "64"
"zpos" "3"
diff --git a/resource/ui/hudcurrencyaccount.res b/resource/ui/hudcurrencyaccount.res
index 13dd95e..5437b3c 100644
--- a/resource/ui/hudcurrencyaccount.res
+++ b/resource/ui/hudcurrencyaccount.res
@@ -4,7 +4,7 @@
{
"ControlName" "CExLabel"
"fieldName" "Currency"
- "font" "Cerbetica14"
+ "font" "HudFontSmall"
"fgcolor" "CreditsGreen"
"xpos" "45"
"ypos" "0"
@@ -28,7 +28,7 @@
"tall" "20"
"visible" "1"
"enabled" "1"
- "bgcolor_override" "0 0 0 200"
+ "bgcolor_override" "TransparentBlack"
"PaintBackgroundType" "2"
}
@@ -36,7 +36,7 @@
{
"ControlName" "CExLabel"
"fieldName" "CurrencyLabel"
- "font" "Cerbetica14"
+ "font" "HudFontSmall"
"fgcolor" "TanLight"
"xpos" "4"
"ypos" "0"
diff --git a/resource/ui/huddamageaccount.res b/resource/ui/huddamageaccount.res
index 4200996..f4f00a1 100644
--- a/resource/ui/huddamageaccount.res
+++ b/resource/ui/huddamageaccount.res
@@ -9,8 +9,8 @@
"PositiveColor" "Heal Numbers"
"NegativeColor" "Damage Numbers"
"delta_lifetime" "2"
- "delta_item_font" "CerbeticaBoldOutline24"
- "delta_item_font_big" "CerbeticaBoldOutline24"
+ "delta_item_font" "Cerbetica24Outline"
+ "delta_item_font_big" "Cerbetica24Outline"
}
"DamageAccountValue"
@@ -28,8 +28,8 @@
"enabled" "1"
"labelText" "%metal%"
"textAlignment" "center"
- "font" "CerbeticaBold32"
- "font_minmode" "CerbeticaBold20"
+ "font" "Cerbetica28"
+ "font_minmode" "Cerbetica20"
"fgcolor" "Last DamageHeal Info"
}
@@ -46,8 +46,8 @@
"enabled" "1"
"labelText" "%metal%"
"textAlignment" "center"
- "font" "CerbeticaBold32"
- "font_minmode" "CerbeticaBold20"
+ "font" "Cerbetica28"
+ "font_minmode" "Cerbetica20"
"fgcolor" "TransparentBlack"
"pin_to_sibling" "DamageAccountValue"
diff --git a/resource/ui/huddemomancharge.res b/resource/ui/huddemomancharge.res
index 2a22772..85d6a4c 100644
--- a/resource/ui/huddemomancharge.res
+++ b/resource/ui/huddemomancharge.res
@@ -42,8 +42,7 @@
"textAlignment" "west"
"dulltext" "0"
"brighttext" "0"
- "font" "Cerbetica11"
- "font_minmode" "Cerbetica8"
+ "font" "HudFontSmallest"
"fgcolor_override" "White"
}
} \ No newline at end of file
diff --git a/resource/ui/huddemomanpipes.res b/resource/ui/huddemomanpipes.res
index 3948a53..868a74b 100644
--- a/resource/ui/huddemomanpipes.res
+++ b/resource/ui/huddemomanpipes.res
@@ -19,7 +19,7 @@
"textAlignment" "west"
"dulltext" "0"
"brighttext" "0"
- "font" "Cerbetica10"
+ "font" "HudFontSmall"
}
"ChargeMeter"
@@ -75,8 +75,8 @@
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
- "font" "CerbeticaBold32"
- "font_minmode" "CerbeticaBold20"
+ "font" "Cerbetica28"
+ "font_minmode" "Cerbetica20"
}
"NumPipesLabelDropshadow"
{
@@ -97,8 +97,8 @@
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
- "font" "CerbeticaBold32"
- "font_minmode" "CerbeticaBold20"
+ "font" "Cerbetica28"
+ "font_minmode" "Cerbetica20"
"fgcolor" "TransparentBlack"
"pin_to_sibling" "NumPipesLabel"
diff --git a/resource/ui/hudhealthaccount.res b/resource/ui/hudhealthaccount.res
index 01f94a7..c6833c3 100644
--- a/resource/ui/hudhealthaccount.res
+++ b/resource/ui/hudhealthaccount.res
@@ -12,7 +12,7 @@
"PositiveColor" "ColorGreen"
"NegativeColor" "ColorRed"
"delta_lifetime" "1.5"
- "delta_item_font" "CerbeticaBold28"
- "delta_item_font_minmode" "CerbeticaBold20"
+ "delta_item_font" "Cerbetica28"
+ "delta_item_font_minmode" "Cerbetica20"
}
} \ No newline at end of file
diff --git a/resource/ui/hudinspectpanel.res b/resource/ui/hudinspectpanel.res
new file mode 100644
index 0000000..9637e87
--- /dev/null
+++ b/resource/ui/hudinspectpanel.res
@@ -0,0 +1,59 @@
+"Resource/UI/HudInspectPanel.res"
+{
+ "itempanel"
+ {
+ "ControlName" "CItemModelPanel"
+ "fieldName" "itempanel"
+ "xpos" "0"
+ "ypos" "0"
+ "zpos" "10"
+ "wide" "190"
+ "tall" "100"
+ "visible" "0"
+ "bgcolor_override" "TransparentBlack"
+ "PaintBackgroundType" "0"
+
+ "model_ypos" "10"
+ "model_center_x" "1"
+ "model_wide" "90"
+ "model_tall" "60"
+
+ "text_xpos" "10"
+ "text_ypos" "10"
+ "text_wide" "170"
+ "text_center" "1"
+
+ "max_text_height" "100"
+ "padding_height" "10"
+ "resize_to_text" "1"
+ "text_forcesize" "2"
+
+ "itemmodelpanel"
+ {
+ "fieldName" "itemmodelpanel"
+ "use_item_rendertarget" "0"
+ "useparentbg" "1"
+ "inventory_image_type" "1"
+ }
+
+ "ItemLabel"
+ {
+ "ControlName" "Label"
+ "fieldName" "ItemLabel"
+ "font" "HudFontSmall"
+ "xpos" "10"
+ "ypos" "3"
+ "zpos" "1"
+ "wide" "270"
+ "tall" "9"
+ "autoResize" "0"
+ "pinCorner" "0"
+ "visible" "1"
+ "enabled" "1"
+ "labelText" "#FreezePanel_Item"
+ "textAlignment" "Left"
+ "dulltext" "0"
+ "brighttext" "0"
+ }
+ }
+} \ No newline at end of file
diff --git a/resource/ui/huditemattributetracker.res b/resource/ui/huditemattributetracker.res
index 3336b15..6ae1b3e 100644
--- a/resource/ui/huditemattributetracker.res
+++ b/resource/ui/huditemattributetracker.res
@@ -24,7 +24,7 @@
"tall" "20"
"proportionaltoparent" "1"
- "border" "NoBorder" //QuestStatusBorder
+ "border" "NoBorder"
"paintborder" "2"
"Header"
@@ -38,7 +38,7 @@
"tall" "18"
"zpos" "4"
"textinsetx" "5"
- "fgcolor_override" "255 255 255 255" //235 226 202 255
+ "fgcolor_override" "255 255 255 255"
"font" "AchievementTracker_Name"
//"wrap" "1"
"TextAlignment" "north-east"
@@ -56,7 +56,7 @@
"tall" "f0"
"zpos" "4"
"textinsetx" "5"
- "fgcolor_override" "255 255 255 255" //235 226 202 255
+ "fgcolor_override" "255 255 255 255"
"font" "QuestObjectiveTracker_Desc"
//"wrap" "1"
"TextAlignment" "north-east"
@@ -72,8 +72,8 @@
"zpos" "0"
"wide" "o1"
"tall" "p0.8"
- "visible" "0" //1
- "enabled" "0" //1
+ "visible" "0"
+ "enabled" "0"
"image" "tf2_folder_icon"
"scaleImage" "1"
"proportionaltoparent" "1"
diff --git a/resource/ui/huditemeffectmeter.res b/resource/ui/huditemeffectmeter.res
index 75c70d4..64c7fe6 100644
--- a/resource/ui/huditemeffectmeter.res
+++ b/resource/ui/huditemeffectmeter.res
@@ -6,8 +6,9 @@
"visible" "1"
"enabled" "1"
"xpos" "c-75"
+ "xpos_minmode" "c-55"
"ypos" "c103"
- "ypos_minmode" "c50"
+ "ypos_minmode" "c48"
"wide" "180"
"tall" "8"
"MeterFG" "White"
@@ -20,7 +21,7 @@
"fieldName" "ItemEffectMeterLabel"
"xpos" "125"
"ypos" "0"
- "zpos" "3"
+ "zpos" "2"
"wide" "80"
"tall" "8"
"autoResize" "1"
@@ -33,8 +34,7 @@
"textAlignment" "west"
"dulltext" "0"
"brighttext" "0"
- "font" "Cerbetica11"
- "font_minmode" "Cerbetica8"
+ "font" "ItemFontAttribLarge"
}
"ItemEffectMeter"
@@ -43,10 +43,10 @@
"fieldName" "ItemEffectMeter"
"font" "Default"
"xpos" "0"
- "xpos_minmode" "10"
"ypos" "0"
"zpos" "2"
"wide" "120"
+ "wide_minmode" "110"
"tall" "8"
"tall_minmode" "5"
"autoResize" "0"
diff --git a/resource/ui/huditemeffectmeter_cleaver.res b/resource/ui/huditemeffectmeter_cleaver.res
index 6276f58..e819cb4 100644
--- a/resource/ui/huditemeffectmeter_cleaver.res
+++ b/resource/ui/huditemeffectmeter_cleaver.res
@@ -5,6 +5,6 @@
"HudItemEffectMeter"
{
"ypos" "c93"
- "ypos_minmode" "c53"
+ "ypos_minmode" "c54"
}
} \ No newline at end of file
diff --git a/resource/ui/huditemeffectmeter_demoman.res b/resource/ui/huditemeffectmeter_demoman.res
index 8cd931d..6560156 100644
--- a/resource/ui/huditemeffectmeter_demoman.res
+++ b/resource/ui/huditemeffectmeter_demoman.res
@@ -33,8 +33,8 @@
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
- "font" "Cerbetica11"
- "font_minmode" "Cerbetica8"
+ "font" "ItemFontAttribLarge"
+ "font_minmode" "Default"
}
"ItemEffectMeter"
@@ -74,8 +74,8 @@
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
- "font" "CerbeticaBold28"
- "font_minmode" "CerbeticaBold16"
+ "font" "Cerbetica28"
+ "font_minmode" "Cerbetica16"
}
"ItemEffectMeterCountShadow"
@@ -95,8 +95,8 @@
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
- "font" "CerbeticaBold28"
- "font_minmode" "CerbeticaBold16"
+ "font" "Cerbetica28"
+ "font_minmode" "Cerbetica16"
"fgcolor" "TransparentBlack"
"pin_to_sibling" "ItemEffectMeterCount"
diff --git a/resource/ui/huditemeffectmeter_heavy.res b/resource/ui/huditemeffectmeter_heavy.res
index d47ab7d..f45179b 100644
--- a/resource/ui/huditemeffectmeter_heavy.res
+++ b/resource/ui/huditemeffectmeter_heavy.res
@@ -5,6 +5,6 @@
"HudItemEffectMeter"
{
"ypos" "c93"
- "ypos_minmode" "c53"
+ "ypos_minmode" "c54"
}
} \ No newline at end of file
diff --git a/resource/ui/huditemeffectmeter_kartcharge.res b/resource/ui/huditemeffectmeter_kartcharge.res
index dceb120..e05d2b6 100644
--- a/resource/ui/huditemeffectmeter_kartcharge.res
+++ b/resource/ui/huditemeffectmeter_kartcharge.res
@@ -2,16 +2,16 @@
{
HudItemEffectMeter
{
- "fieldName" "HudItemEffectMeter"
- "visible" "1"
- "enabled" "1"
- "xpos" "c-75"
- "ypos" "c156"
- "ypos_minmode" "c23"
- "wide" "500"
- "tall" "500"
- "MeterFG" "White"
- "MeterBG" "Gray"
+ "fieldName" "HudItemEffectMeter"
+ "visible" "1"
+ "enabled" "1"
+ "xpos" "c-75"
+ "ypos" "c156"
+ "ypos_minmode" "c23"
+ "wide" "500"
+ "tall" "500"
+ "MeterFG" "White"
+ "MeterBG" "Gray"
}
"ItemEffectMeterLabel"
@@ -35,7 +35,7 @@
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
- "font" "Cerbetica12"
+ "font" "HudFontSmallest"
"fgcolor_override" "150 150 150 255"
}
@@ -79,8 +79,8 @@
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
- "font" "CerbeticaBold28"
- "font_minmode" "CerbeticaBold20"
+ "font" "Cerbetica28"
+ "font_minmode" "Cerbetica20"
}
"ItemEffectMeterCountShadow"
@@ -100,9 +100,9 @@
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
- "font" "CerbeticaBold28"
- "font_minmode" "CerbeticaBold20"
- "fgcolor_override" "TransparentBlack"
+ "font" "Cerbetica28"
+ "font_minmode" "Cerbetica20"
+ "fgcolor" "TransparentBlack"
"pin_to_sibling" "ItemEffectMeterCount"
"pin_corner_to_sibling" "PIN_TOPLEFT"
diff --git a/resource/ui/huditemeffectmeter_particlecannon.res b/resource/ui/huditemeffectmeter_particlecannon.res
index 0d26c56..d832ac3 100644
--- a/resource/ui/huditemeffectmeter_particlecannon.res
+++ b/resource/ui/huditemeffectmeter_particlecannon.res
@@ -5,6 +5,6 @@
"HudItemEffectMeter"
{
"ypos" "c93"
- "ypos_minmode" "c53"
+ "ypos_minmode" "c54"
}
} \ No newline at end of file
diff --git a/resource/ui/huditemeffectmeter_pomson.res b/resource/ui/huditemeffectmeter_pomson.res
index 0819f70..f2515e8 100644
--- a/resource/ui/huditemeffectmeter_pomson.res
+++ b/resource/ui/huditemeffectmeter_pomson.res
@@ -5,6 +5,6 @@
"HudItemEffectMeter"
{
"ypos" "c93"
- "ypos_minmode" "c46"
+ "ypos_minmode" "c54"
}
} \ No newline at end of file
diff --git a/resource/ui/huditemeffectmeter_powerupbottle.res b/resource/ui/huditemeffectmeter_powerupbottle.res
index caf00e8..6fc06f4 100644
--- a/resource/ui/huditemeffectmeter_powerupbottle.res
+++ b/resource/ui/huditemeffectmeter_powerupbottle.res
@@ -5,7 +5,7 @@
"fieldName" "HudItemEffectMeter"
"visible" "1"
"enabled" "1"
- "xpos" "c-327"
+ "xpos" "c-267"
"xpos_minmode" "c-250"
"ypos" "r72"
"ypos_minmode" "r146"
@@ -26,7 +26,7 @@
"tall" "20"
"visible" "1"
"enabled" "1"
- "bgcolor_override" "0 0 0 200"
+ "bgcolor_override" "TransparentBlack"
"PaintBackgroundType" "2"
}
@@ -64,14 +64,14 @@
"centerwrap" "1"
"dulltext" "0"
"brighttext" "0"
- "font" "Cerbetica12"
+ "font" "HudFontSmallest"
}
"CanteenLabel"
{
"ControlName" "CExLabel"
"fieldName" "CanteenLabel"
- "font" "Cerbetica14"
+ "font" "HudFontSmall"
"fgcolor" "TanLight"
"xpos" "5"
"ypos" "0"
@@ -120,6 +120,6 @@
"textAlignment" "east"
"dulltext" "0"
"brighttext" "0"
- "font" "Cerbetica16"
+ "font" "HudFontSmallishBold"
}
} \ No newline at end of file
diff --git a/resource/ui/huditemeffectmeter_pyro.res b/resource/ui/huditemeffectmeter_pyro.res
index 811c3de..33d3999 100644
--- a/resource/ui/huditemeffectmeter_pyro.res
+++ b/resource/ui/huditemeffectmeter_pyro.res
@@ -5,5 +5,6 @@
"HudItemEffectMeter"
{
"ypos" "c93"
+ "ypos_minmode" "c54"
}
} \ No newline at end of file
diff --git a/resource/ui/huditemeffectmeter_sapper.res b/resource/ui/huditemeffectmeter_sapper.res
index aef6ae4..9e3aeb8 100644
--- a/resource/ui/huditemeffectmeter_sapper.res
+++ b/resource/ui/huditemeffectmeter_sapper.res
@@ -5,6 +5,6 @@
"HudItemEffectMeter"
{
"ypos" "c83"
- "ypos_minmode" "c46"
+ "ypos_minmode" "c60"
}
} \ No newline at end of file
diff --git a/resource/ui/huditemeffectmeter_scout.res b/resource/ui/huditemeffectmeter_scout.res
index d47ab7d..f45179b 100644
--- a/resource/ui/huditemeffectmeter_scout.res
+++ b/resource/ui/huditemeffectmeter_scout.res
@@ -5,6 +5,6 @@
"HudItemEffectMeter"
{
"ypos" "c93"
- "ypos_minmode" "c53"
+ "ypos_minmode" "c54"
}
} \ No newline at end of file
diff --git a/resource/ui/huditemeffectmeter_sniperfocus.res b/resource/ui/huditemeffectmeter_sniperfocus.res
index a88ce04..4ea7364 100644
--- a/resource/ui/huditemeffectmeter_sniperfocus.res
+++ b/resource/ui/huditemeffectmeter_sniperfocus.res
@@ -5,6 +5,6 @@
"HudItemEffectMeter"
{
"ypos" "c93"
- "ypos_minmode" "c46"
+ "ypos_minmode" "c54"
}
} \ No newline at end of file
diff --git a/resource/ui/huditemeffectmeter_sodapopper.res b/resource/ui/huditemeffectmeter_sodapopper.res
index d5b1523..ce68c9b 100644
--- a/resource/ui/huditemeffectmeter_sodapopper.res
+++ b/resource/ui/huditemeffectmeter_sodapopper.res
@@ -5,6 +5,6 @@
"HudItemEffectMeter"
{
"ypos" "c83"
- "ypos_minmode" "c46"
+ "ypos_minmode" "c60"
}
} \ No newline at end of file
diff --git a/resource/ui/huditemeffectmeter_spyknife.res b/resource/ui/huditemeffectmeter_spyknife.res
index 4b700c1..3ef775d 100644
--- a/resource/ui/huditemeffectmeter_spyknife.res
+++ b/resource/ui/huditemeffectmeter_spyknife.res
@@ -5,6 +5,6 @@
"HudItemEffectMeter"
{
"ypos" "c93"
- "ypos_minmode" "c53"
+ "ypos_minmode" "c54"
}
} \ No newline at end of file
diff --git a/resource/ui/hudkillstreaknotice.res b/resource/ui/hudkillstreaknotice.res
index f254922..cca6602 100644
--- a/resource/ui/hudkillstreaknotice.res
+++ b/resource/ui/hudkillstreaknotice.res
@@ -12,15 +12,15 @@
"autoResize" "0"
"visible" "1"
"enabled" "1"
- "PaintBackgroundType" "0"
- "bgcolor_override" "HudBlack"
+ "PaintBackgroundType" "2"
+ "bgcolor_override" "TransparentBlack"
}
"SplashLabel"
{
"ControlName" "CExLabel"
"fieldName" "SplashLabel"
- "font_override" "Cerbetica12"
+ "font" "ScoreboardSmall"
"labelText" ""
"textAlignment" "center"
"xpos" "c-250"
diff --git a/resource/ui/hudmannvsmachinestatus.res b/resource/ui/hudmannvsmachinestatus.res
index 3b8f1cb..d89c4a6 100644
--- a/resource/ui/hudmannvsmachinestatus.res
+++ b/resource/ui/hudmannvsmachinestatus.res
@@ -47,7 +47,7 @@
{
"ControlName" "CCurrencyStatusPanel"
"fieldName" "CurrencyStatusPanel"
- "xpos" "c-327"
+ "xpos" "c-267"
"xpos_minmode" "c-250"
"ypos" "r114"
"ypos_minmode" "r190"
@@ -61,7 +61,7 @@
{
"ControlName" "CInWorldCurrencyStatus"
"fieldName" "InWorldCurrencyPanel"
- "xpos" "c-327"
+ "xpos" "c-267"
"xpos_minmode" "c-250"
"ypos" "r93"
"ypos_minmode" "r168"
@@ -183,6 +183,7 @@
"fieldName" "VictorySplash"
"xpos" "0"
"ypos" "0"
+ //"zpos" "102"
"wide" "f0"
"tall" "480"
"visible" "0"
diff --git a/resource/ui/hudmatchstatus.res b/resource/ui/hudmatchstatus.res
index 00a3408..400c293 100644
--- a/resource/ui/hudmatchstatus.res
+++ b/resource/ui/hudmatchstatus.res
@@ -203,6 +203,7 @@
"zpos" "0"
"wide" "365"
"tall" "28"
+ "visible" "0"
"proportionaltoaparent" "1"
"border" "NoBorder"
}
@@ -341,8 +342,8 @@
"tall" "50"
"zpos" "1"
- "color_portrait_bg_red" "119 62 61 255"
- "color_portrait_bg_blue" "62 81 101 255"
+ "color_portrait_bg_red" "Red"
+ "color_portrait_bg_blue" "Blue"
"color_portrait_bg_red_dead" "79 54 52 255"
"color_portrait_bg_blue_dead" "44 49 51 255"
"color_bar_health_high" "84 191 58 255"
@@ -494,7 +495,7 @@
{
"ControlName" "CExLabel"
"fieldName" "respawntime"
- "font" "Cerbetica8"
+ "font" "HudFontSmallest"
"xpos" "cs-0.5"
"ypos" "0"
"zpos" "5"
@@ -680,7 +681,7 @@
"enabled" "1"
"tabPosition" "0"
"autoresize" "3"
- "linespacing" "26"
+ "linespacing" "25"
"linegap" "4"
//"show_columns" "1"
@@ -818,7 +819,7 @@
"enabled" "1"
"tabPosition" "0"
"autoresize" "3"
- "linespacing" "26"
+ "linespacing" "25"
"linegap" "4"
//"show_columns" "1"
diff --git a/resource/ui/hudmatchsummary.res b/resource/ui/hudmatchsummary.res
index e0dbce4..9b076a9 100644
--- a/resource/ui/hudmatchsummary.res
+++ b/resource/ui/hudmatchsummary.res
@@ -36,7 +36,8 @@
"AnimRedTeamLabel12v12YPos" "47"
"AnimStatsContainer12v12YPos" "-10"
- if_large {
+ if_large
+ {
"AnimBlueMedalsYPos" "50"
"AnimRedMedalsYPos" "50"
}
@@ -56,7 +57,8 @@
"border" "MainMenuBGBorder"
"proportionaltoparent" "1"
- if_uses_xp {
+ if_uses_xp
+ {
"visible" "1"
}
}
@@ -78,7 +80,8 @@
"show_sources_when_hidden" "1"
"instantly_update" "0"
- if_uses_placement {
+ if_uses_placement
+ {
"show_model" "0"
}
}
@@ -99,7 +102,8 @@
"show_progress" "0"
"instantly_update" "0"
- if_uses_xp {
+ if_uses_xp
+ {
"visible" "0"
}
}
@@ -251,9 +255,10 @@
"visible" "1"
"enabled" "1"
"border" "DarkBlueTeamBorder"
- "bgcolor_override" "70 130 180 153"
+ "bgcolor_override" "Blue"
- if_large {
+ if_large
+ {
"ypos" "39"
}
}
@@ -274,7 +279,8 @@
"visible" "1"
"enabled" "1"
- if_large {
+ if_large
+ {
"ypos" "41"
}
@@ -297,7 +303,8 @@
"visible" "1"
"enabled" "1"
- if_large {
+ if_large
+ {
"ypos" "43"
}
}
@@ -318,7 +325,8 @@
"visible" "1"
"enabled" "1"
- if_large {
+ if_large
+ {
"ypos" "41"
}
}
@@ -344,7 +352,8 @@
"pin_corner_to_sibling" "PIN_TOPLEFT"
"pin_to_sibling_corner" "PIN_TOPLEFT"
- if_large {
+ if_large
+ {
"ypos" "42"
}
}
@@ -362,7 +371,8 @@
"image" "../hud/team_blue"
"scaleImage" "1"
- if_large {
+ if_large
+ {
"ypos" "29"
}
}
@@ -398,7 +408,8 @@
"scaleImage" "1"
"color_outline" "HudTimerProgressInActive"
- if_large {
+ if_large
+ {
"ypos" "40"
}
}
@@ -415,7 +426,8 @@
"PaintBackgroundType" "2"
"bgcolor_override" "TextColor"
- if_large {
+ if_large
+ {
"ypos" "38"
}
}
@@ -431,7 +443,8 @@
"visible" "1"
"enabled" "1"
- if_large {
+ if_large
+ {
"ypos" "77"
"tall" "340"
}
@@ -462,7 +475,8 @@
"stats_width" "s.08"
"horiz_inset" "0"
- if_large {
+ if_large
+ {
"tall" "340"
"linegap" "0"
}
@@ -483,7 +497,8 @@
"enabled" "1"
"border" "TFFatLineBorderClearBG"
- if_large {
+ if_large
+ {
"ypos" "57"
"tall" "360"
}
@@ -515,7 +530,7 @@
"visible" "1"
"enabled" "1"
"border" "DarkRedTeamBorder"
- "bgcolor_override" "205 50 50 153"
+ "bgcolor_override" "Red"
if_large
{
@@ -539,7 +554,8 @@
"visible" "1"
"enabled" "1"
- if_large {
+ if_large
+ {
"ypos" "41"
}
}
@@ -583,7 +599,8 @@
"visible" "1"
"enabled" "1"
- if_large {
+ if_large
+ {
"ypos" "41"
}
}
@@ -623,7 +640,8 @@
"image" "../hud/team_red"
"scaleImage" "1"
- if_large {
+ if_large
+ {
"ypos" "20"
}
}
@@ -659,7 +677,8 @@
"scaleImage" "1"
"color_outline" "HudTimerProgressInActive"
- if_large {
+ if_large
+ {
"ypos" "40"
}
}
@@ -676,7 +695,8 @@
"PaintBackgroundType" "2"
"bgcolor_override" "TextColor"
- if_large {
+ if_large
+ {
"ypos" "38"
}
}
@@ -692,7 +712,8 @@
"visible" "1"
"enabled" "1"
- if_large {
+ if_large
+ {
"ypos" "77"
"tall" "340"
}
@@ -723,7 +744,8 @@
"stats_width" "s.08"
"horiz_inset" "0"
- if_large {
+ if_large
+ {
"tall" "340"
"linegap" "0"
}
@@ -744,7 +766,8 @@
"enabled" "1"
"border" "TFFatLineBorderClearBG"
- if_large {
+ if_large
+ {
"ypos" "57"
"tall" "360"
}
@@ -762,7 +785,8 @@
"visible" "1"
"enabled" "1"
- if_large {
+ if_large
+ {
"visible" "0"
}
@@ -872,7 +896,8 @@
"visible" "1"
"enabled" "1"
- if_large {
+ if_large
+ {
"visible" "0"
}
diff --git a/resource/ui/hudmediccharge.res b/resource/ui/hudmediccharge.res
index f1a6c5a..d7fb932 100644
--- a/resource/ui/hudmediccharge.res
+++ b/resource/ui/hudmediccharge.res
@@ -21,7 +21,7 @@
{
"ControlName" "CExLabel"
"fieldName" "ChargeLabel"
- "xpos" "150"
+ "xpos" "165"
"ypos" "35"
"xpos_minmode" "106"
"ypos_minmode" "-5"
@@ -37,34 +37,58 @@
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
- "font" "CerbeticaBoldOutline56"
- "font_minmode" "CerbeticaBoldOutline32"
+ "font" "Cerbetica56"
+ "font_minmode" "Cerbetica32"
"fgcolor" "Ammo In Clip"
}
- "IndividualChargesLabel"
+ "ChargeLabelShadow"
{
"ControlName" "CExLabel"
- "fieldName" "IndividualChargesLabel"
- "xpos" "150"
- "ypos" "35"
- "xpos_minmode" "106"
- "ypos_minmode" "-5"
- "zpos" "2"
+ "fieldName" "ChargeLabelShadow"
+ "xpos" "-2"
+ "ypos" "-2"
+ "zpos" "1"
"wide" "120"
- "tall" "0"
+ "tall" "72"
"autoResize" "1"
"pinCorner" "2"
"visible" "1"
"enabled" "1"
"tabPosition" "0"
- "labelText" "#TF_IndividualUberchargesMinHUD"
+ "labelText" "#TF_UberchargeMinHUD"
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
- "font" "CerbeticaBoldOutline56"
- "font_minmode" "CerbeticaBoldOutline32"
- "fgcolor" "Ammo In Clip"
+ "font" "Cerbetica56"
+ "font_minmode" "Cerbetica32"
+ "fgcolor" "TransparentBlack"
+
+ "pin_to_sibling" "ChargeLabel"
+ "pin_corner_to_sibling" "PIN_TOPLEFT"
+ "pin_to_sibling_corner" "PIN_TOPLEFT"
+ }
+
+ "IndividualChargesLabel"
+ {
+ "ControlName" "CExImageButton"
+ "fieldName" "IndividualChargesLabel"
+ "xpos" "160"
+ "ypos" "55"
+ "zpos" "2"
+ "wide" "122"
+ "tall" "35"
+ "xpos_minmode" "140"
+ "ypos_minmode" "23"
+ "wide_minmode" "102"
+ "tall_minmode" "20"
+ "autoResize" "0"
+ "pinCorner" "0"
+ "visible" "1"
+ "enabled" "1"
+ "defaultbgcolor_override" "25 25 25 255"
+ "PaintBackgroundType" "0"
+ "textinsety" "99"
}
"ChargeMeterLabel"
@@ -86,7 +110,7 @@
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
- "font" "Cerbetica12"
+ "font" "HudFontSmallest"
"fgcolor" "TanLight"
}
@@ -120,15 +144,12 @@
"ControlName" "ContinuousProgressBar"
"fieldName" "ChargeMeter1"
"font" "Default"
- "xpos" "0"
- "ypos" "70"
+ "xpos" "-5"
+ "ypos" "-5"
"zpos" "3"
- "xpos_minmode" "15"
- "ypos_minmode" "30"
- "zpos_minmode" "4"
- "wide" "36"
- "tall" "20"
- "wide_minmode" "27"
+ "wide" "27"
+ "tall" "25"
+ "wide_minmode" "22"
"tall_minmode" "10"
"autoResize" "0"
"pinCorner" "0"
@@ -138,6 +159,10 @@
"dulltext" "0"
"brighttext" "0"
"fgcolor_override" "Uber Bar Color"
+
+ "pin_to_sibling" "IndividualChargesLabel"
+ "pin_corner_to_sibling" "PIN_TOPLEFT"
+ "pin_to_sibling_corner" "PIN_TOPLEFT"
}
"ChargeMeter2"
@@ -148,9 +173,9 @@
"xpos" "2"
"ypos" "0"
"zpos" "4"
- "wide" "36"
- "tall" "20"
- "wide_minmode" "27"
+ "wide" "27"
+ "tall" "25"
+ "wide_minmode" "22"
"tall_minmode" "10"
"autoResize" "0"
"pinCorner" "0"
@@ -174,9 +199,9 @@
"xpos" "2"
"ypos" "0"
"zpos" "4"
- "wide" "36"
- "tall" "20"
- "wide_minmode" "27"
+ "wide" "27"
+ "tall" "25"
+ "wide_minmode" "22"
"tall_minmode" "10"
"autoResize" "0"
"pinCorner" "0"
@@ -200,9 +225,9 @@
"xpos" "2"
"ypos" "0"
"zpos" "4"
- "wide" "36"
- "tall" "20"
- "wide_minmode" "27"
+ "wide" "27"
+ "tall" "25"
+ "wide_minmode" "22"
"tall_minmode" "10"
"autoResize" "0"
"pinCorner" "0"
@@ -218,16 +243,31 @@
"pin_to_sibling_corner" "PIN_TOPRIGHT"
}
+ "HealthClusterIcon"
+ {
+ "ControlName" "ImagePanel"
+ "fieldName" "HealthClusterIcon"
+ "xpos" "0"
+ "ypos" "0"
+ "wide" "25"
+ "tall" "25"
+ "visible" "0"
+ "enabled" "0"
+ "image" "../hud/ico_health_cluster"
+ "scaleImage" "1"
+ }
+
"ResistIconAnchor"
{
"ControlName" "EditablePanel"
"fieldName" "ResistIconAnchor"
"xpos" "160"
- "ypos" "57"
- "xpos_minmode" "136"
- "ypos_minmode" "18"
- "wide" "45"
- "tall" "45"
+ "ypos" "95"
+ "xpos_minmode" "210"
+ "ypos_minmode" "48"
+ "zpos" "2"
+ "wide" "30"
+ "tall" "30"
"visible" "1"
"enabled" "1"
}
@@ -238,8 +278,9 @@
"fieldName" "ResistIcon"
"xpos" "0"
"ypos" "0"
- "wide" "25"
- "tall" "25"
+ "zpos" "3"
+ "wide" "30"
+ "tall" "30"
"visible" "1"
"enabled" "1"
"image" "../HUD/defense_buff_bullet_blue"
diff --git a/resource/ui/hudmenutauntselection.res b/resource/ui/hudmenutauntselection.res
index 7b8c595..9d4ba80 100644
--- a/resource/ui/hudmenutauntselection.res
+++ b/resource/ui/hudmenutauntselection.res
@@ -34,7 +34,7 @@
{
"ControlName" "CExLabel"
"fieldName" "TitleLabel"
- "font" "CerbeticaBold32"
+ "font" "Cerbetica28"
"xpos" "10"
"ypos" "0"
"zpos" "3"
@@ -54,7 +54,7 @@
{
"ControlName" "CExLabel"
"fieldName" "TitleLabelDropshadow"
- "font" "CerbeticaBold32"
+ "font" "Cerbetica28"
"fgcolor" "TransparentBlack"
"xpos" "-2"
"ypos" "-2"
@@ -155,8 +155,8 @@
{
"ControlName" "CIconPanel"
"fieldName" "NumberBg1"
- "xpos" "34"
- "ypos" "140"
+ "xpos" "32"
+ "ypos" "100"
"zpos" "4"
"wide" "15"
"tall" "15"
@@ -171,10 +171,10 @@
{
"ControlName" "CExLabel"
"fieldName" "NumberLabel1"
- "font" "CerbeticaBold20"
+ "font" "Cerbetica20"
"fgcolor" "TanLight"
"xpos" "34"
- "ypos" "95"
+ "ypos" "87"
"zpos" "5"
"wide" "15"
"tall" "15"
@@ -188,11 +188,11 @@
"brighttext" "0"
}
- "NumberLabel1BG"
+ "NumberLabel1Shadow"
{
"ControlName" "CExLabel"
- "fieldName" "NumberLabel1BG"
- "font" "CerbeticaBold20"
+ "fieldName" "NumberLabel1Shadow"
+ "font" "Cerbetica20"
"fgcolor" "TransparentBlack"
"xpos" "-2"
"ypos" "-2"
@@ -254,7 +254,7 @@
"ControlName" "CIconPanel"
"fieldName" "NumberBg2"
"xpos" "87"
- "ypos" "140"
+ "ypos" "100"
"zpos" "4"
"wide" "15"
"tall" "15"
@@ -269,10 +269,10 @@
{
"ControlName" "CExLabel"
"fieldName" "NumberLabel2"
- "font" "CerbeticaBold20"
+ "font" "Cerbetica20"
"fgcolor" "TanLight"
"xpos" "89"
- "ypos" "95"
+ "ypos" "87"
"zpos" "5"
"wide" "15"
"tall" "15"
@@ -286,11 +286,11 @@
"brighttext" "0"
}
- "NumberLabel2BG"
+ "NumberLabel2Shadow"
{
"ControlName" "CExLabel"
- "fieldName" "NumberLabel2BG"
- "font" "CerbeticaBold20"
+ "fieldName" "NumberLabel2Shadow"
+ "font" "Cerbetica20"
"fgcolor" "TransparentBlack"
"xpos" "-2"
"ypos" "-2"
@@ -352,7 +352,7 @@
"ControlName" "CIconPanel"
"fieldName" "NumberBg3"
"xpos" "142"
- "ypos" "140"
+ "ypos" "100"
"zpos" "4"
"wide" "15"
"tall" "15"
@@ -367,10 +367,10 @@
{
"ControlName" "CExLabel"
"fieldName" "NumberLabel3"
- "font" "CerbeticaBold20"
+ "font" "Cerbetica20"
"fgcolor" "TanLight"
"xpos" "144"
- "ypos" "95"
+ "ypos" "87"
"zpos" "5"
"wide" "15"
"tall" "15"
@@ -384,11 +384,11 @@
"brighttext" "0"
}
- "NumberLabel3BG"
+ "NumberLabel3Shadow"
{
"ControlName" "CExLabel"
- "fieldName" "NumberLabel3BG"
- "font" "CerbeticaBold20"
+ "fieldName" "NumberLabel3Shadow"
+ "font" "Cerbetica20"
"fgcolor" "TransparentBlack"
"xpos" "-2"
"ypos" "-2"
@@ -450,7 +450,7 @@
"ControlName" "CIconPanel"
"fieldName" "NumberBg4"
"xpos" "197"
- "ypos" "140"
+ "ypos" "100"
"zpos" "4"
"wide" "15"
"tall" "15"
@@ -465,10 +465,10 @@
{
"ControlName" "CExLabel"
"fieldName" "NumberLabel4"
- "font" "CerbeticaBold20"
+ "font" "Cerbetica20"
"fgcolor" "TanLight"
"xpos" "200"
- "ypos" "95"
+ "ypos" "87"
"zpos" "5"
"wide" "15"
"tall" "15"
@@ -482,11 +482,11 @@
"brighttext" "0"
}
- "NumberLabel4BG"
+ "NumberLabel4Shadow"
{
"ControlName" "CExLabel"
- "fieldName" "NumberLabel4BG"
- "font" "CerbeticaBold20"
+ "fieldName" "NumberLabel4Shadow"
+ "font" "Cerbetica20"
"fgcolor" "TransparentBlack"
"xpos" "-2"
"ypos" "-2"
@@ -548,7 +548,7 @@
"ControlName" "CIconPanel"
"fieldName" "NumberBg5"
"xpos" "252"
- "ypos" "140"
+ "ypos" "100"
"zpos" "4"
"wide" "15"
"tall" "15"
@@ -563,10 +563,10 @@
{
"ControlName" "CExLabel"
"fieldName" "NumberLabel5"
- "font" "CerbeticaBold20"
+ "font" "Cerbetica20"
"fgcolor" "TanLight"
"xpos" "256"
- "ypos" "95"
+ "ypos" "87"
"zpos" "5"
"wide" "15"
"tall" "15"
@@ -580,11 +580,11 @@
"brighttext" "0"
}
- "NumberLabel5BG"
+ "NumberLabel5Shadow"
{
"ControlName" "CExLabel"
- "fieldName" "NumberLabel5BG"
- "font" "CerbeticaBold20"
+ "fieldName" "NumberLabel5Shadow"
+ "font" "Cerbetica20"
"fgcolor" "TransparentBlack"
"xpos" "-2"
"ypos" "-2"
@@ -646,7 +646,7 @@
"ControlName" "CIconPanel"
"fieldName" "NumberBg6"
"xpos" "307"
- "ypos" "140"
+ "ypos" "100"
"zpos" "4"
"wide" "15"
"tall" "15"
@@ -661,10 +661,10 @@
{
"ControlName" "CExLabel"
"fieldName" "NumberLabel6"
- "font" "CerbeticaBold20"
+ "font" "Cerbetica20"
"fgcolor" "TanLight"
"xpos" "310"
- "ypos" "95"
+ "ypos" "87"
"zpos" "5"
"wide" "15"
"tall" "15"
@@ -678,11 +678,11 @@
"brighttext" "0"
}
- "NumberLabel6BG"
+ "NumberLabel6Shadow"
{
"ControlName" "CExLabel"
- "fieldName" "NumberLabel6BG"
- "font" "CerbeticaBold20"
+ "fieldName" "NumberLabel6Shadow"
+ "font" "Cerbetica20"
"fgcolor" "TransparentBlack"
"xpos" "-2"
"ypos" "-2"
@@ -744,7 +744,7 @@
"ControlName" "CIconPanel"
"fieldName" "NumberBg7"
"xpos" "362"
- "ypos" "140"
+ "ypos" "100"
"zpos" "4"
"wide" "15"
"tall" "15"
@@ -759,10 +759,10 @@
{
"ControlName" "CExLabel"
"fieldName" "NumberLabel7"
- "font" "CerbeticaBold20"
+ "font" "Cerbetica20"
"fgcolor" "TanLight"
"xpos" "364"
- "ypos" "95"
+ "ypos" "87"
"zpos" "5"
"wide" "15"
"tall" "15"
@@ -776,11 +776,11 @@
"brighttext" "0"
}
- "NumberLabel7BG"
+ "NumberLabel7Shadow"
{
"ControlName" "CExLabel"
- "fieldName" "NumberLabel7BG"
- "font" "CerbeticaBold20"
+ "fieldName" "NumberLabel7Shadow"
+ "font" "Cerbetica20"
"fgcolor" "TransparentBlack"
"ypos" "-2"
"xpos" "-2"
@@ -842,7 +842,7 @@
"ControlName" "CIconPanel"
"fieldName" "NumberBg8"
"xpos" "417"
- "ypos" "140"
+ "ypos" "100"
"zpos" "4"
"wide" "15"
"tall" "15"
@@ -857,10 +857,10 @@
{
"ControlName" "CExLabel"
"fieldName" "NumberLabel8"
- "font" "CerbeticaBold20"
+ "font" "Cerbetica20"
"fgcolor" "TanLight"
"xpos" "420"
- "ypos" "95"
+ "ypos" "87"
"zpos" "5"
"wide" "15"
"tall" "15"
@@ -874,11 +874,11 @@
"brighttext" "0"
}
- "NumberLabel8BG"
+ "NumberLabel8Shadow"
{
"ControlName" "CExLabel"
- "fieldName" "NumberLabel8BG"
- "font" "CerbeticaBold20"
+ "fieldName" "NumberLabel8Shadow"
+ "font" "Cerbetica20"
"fgcolor" "TransparentBlack"
"xpos" "-2"
"ypos" "-2"
diff --git a/resource/ui/hudminigame_base.res b/resource/ui/hudminigame_base.res
index 2b05acc..4290172 100644
--- a/resource/ui/hudminigame_base.res
+++ b/resource/ui/hudminigame_base.res
@@ -76,7 +76,7 @@
"textAlignment" "east"
"labelText" "%bluescore%"
"font" "Cerbetica40"
- "fgcolor" "Black"
+ "fgcolor" "TransparentBlack"
}
"RedScore"
@@ -110,7 +110,7 @@
"textAlignment" "west"
"labelText" "%redscore%"
"font" "Cerbetica40"
- "fgcolor" "Black"
+ "fgcolor" "TransparentBlack"
}
"PlayingTo"
@@ -128,7 +128,7 @@
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
- "font" "Cerbetica14"
+ "font" "HudFontSmall"
"fgcolor" "TanLight"
}
diff --git a/resource/ui/hudobjectiveflagpanel.res b/resource/ui/hudobjectiveflagpanel.res
index 533bd44..ce2e021 100644
--- a/resource/ui/hudobjectiveflagpanel.res
+++ b/resource/ui/hudobjectiveflagpanel.res
@@ -12,7 +12,8 @@
"visible" "1"
"enabled" "1"
- "if_hybrid" {
+ "if_hybrid"
+ {
"zpos" "-1"
}
}
@@ -31,15 +32,18 @@
"fillcolor" "70 130 180 153"
"scaleImage" "1"
- "if_hybrid" {
+ "if_hybrid"
+ {
"visible" "0"
}
- "if_mvm" {
+ "if_mvm"
+ {
"visible" "0"
}
- "if_specialdelivery" {
+ "if_specialdelivery"
+ {
"visible" "0"
}
}
@@ -58,15 +62,18 @@
"fillcolor" "205 50 50 153"
"scaleImage" "1"
- "if_hybrid" {
+ "if_hybrid"
+ {
"visible" "0"
}
- "if_mvm" {
+ "if_mvm"
+ {
"visible" "0"
}
- "if_specialdelivery" {
+ "if_specialdelivery"
+ {
"visible" "0"
}
}
@@ -251,7 +258,7 @@
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
- "font" "Cerbetica14"
+ "font" "HudFontSmall"
"fgcolor" "TanLight"
"if_hybrid"
diff --git a/resource/ui/hudobjectivekothtimepanel.res b/resource/ui/hudobjectivekothtimepanel.res
index 583864a..683af2d 100644
--- a/resource/ui/hudobjectivekothtimepanel.res
+++ b/resource/ui/hudobjectivekothtimepanel.res
@@ -10,7 +10,7 @@
"BlueTimer"
{
- "ControlName" "ImagePanel"
+ "ControlName" "CTFHudTimeStatus"
"fieldName" "BlueTimer"
"xpos" "0"
"ypos" "0"
@@ -24,7 +24,7 @@
{
"proportionaltoparent" "1"
"xpos" "cs-.7"
- "ypos" "4"
+ "ypos" "5"
"delta_item_x" "10"
"delta_item_start_y" "12"
"delta_item_end_y" "50"
@@ -38,7 +38,7 @@
{
"ControlName" "CExLabel"
"fieldName" "TimePanelValue"
- "font" "Cerbetica22"
+ "font" "HudFontMedium"
"fgcolor" "TanLight"
"xpos" "25"
"ypos" "0"
@@ -64,7 +64,7 @@
"RedTimer"
{
- "ControlName" "ImagePanel"
+ "ControlName" "CTFHudTimeStatus"
"fieldName" "RedTimer"
"xpos" "50"
"ypos" "0"
@@ -78,7 +78,7 @@
{
"proportionaltoparent" "1"
"xpos" "cs-0.77"
- "ypos" "4"
+ "ypos" "5"
"delta_item_x" "50"
"delta_item_start_y" "12"
"delta_item_end_y" "50"
@@ -92,7 +92,7 @@
{
"ControlName" "CExLabel"
"fieldName" "TimePanelValue"
- "font" "Cerbetica22"
+ "font" "HudFontMedium"
"fgcolor" "TanLight"
"xpos" "25"
"ypos" "0"
@@ -118,7 +118,7 @@
"ActiveTimerBG"
{
- "ControlName" "ImagePanel"
+ "ControlName" "EditablePanel"
"fieldName" "ActiveTimerBG"
"xpos" "15"
"ypos" "25"
@@ -127,6 +127,7 @@
"tall" "3"
"visible" "0"
"enabled" "1"
- "fillcolor" "TanLight"
+ "bgcolor_override" "TanLight"
+ "PaintBackgroundType" "0"
}
} \ No newline at end of file
diff --git a/resource/ui/hudobjectivetimepanel.res b/resource/ui/hudobjectivetimepanel.res
index 6cb80f9..e4daef3 100644
--- a/resource/ui/hudobjectivetimepanel.res
+++ b/resource/ui/hudobjectivetimepanel.res
@@ -2,7 +2,7 @@
{
"TimePanelBG"
{
- "ControlName" "ImagePanel"
+ "ControlName" "EditablePanel"
"fieldName" "TimePanelBG"
"xpos" "25"
"ypos" "0"
@@ -11,14 +11,11 @@
"tall" "24"
"visible" "1"
"enabled" "1"
- "fillcolor" "HudBlack"
- "scaleImage" "1"
- "src_corner_height" "3"
- "src_corner_width" "3"
- "draw_corner_width" "0"
- "draw_corner_height" "0"
+ "bgcolor_override" "TransparentBlack"
+ "PaintBackgroundType" "0"
- if_match {
+ if_match
+ {
"visible" "0"
}
}
@@ -40,7 +37,8 @@
"color_warning" "TimerProgress.Warning"
"percent_warning" "0.75"
- if_match {
+ if_match
+ {
"visible" "0"
}
}
@@ -61,7 +59,7 @@
"dulltext" "0"
"brighttext" "0"
"wrap" "0"
- "font" "Cerbetica12"
+ "font" "HudFontSmall"
if_match
{
@@ -80,7 +78,7 @@
"ControlName" "CExLabel"
"fieldName" "OvertimeLabel"
"xpos" "25"
- "ypos" "20"
+ "ypos" "32"
"zpos" "5"
"wide" "50"
"tall" "24"
@@ -91,7 +89,7 @@
"dulltext" "0"
"brighttext" "0"
"wrap" "0"
- "font" "Cerbetica12"
+ "font" "HudFontSmall"
if_match
{
@@ -121,7 +119,7 @@
"dulltext" "0"
"brighttext" "0"
"wrap" "0"
- "font" "Cerbetica12"
+ "font" "HudFontSmall"
if_match
{
@@ -151,7 +149,7 @@
"dulltext" "0"
"brighttext" "0"
"wrap" "0"
- "font" "Cerbetica12"
+ "font" "HudFontSmall"
if_match
{
@@ -181,12 +179,17 @@
"dulltext" "0"
"brighttext" "0"
"wrap" "0"
- "font" "Cerbetica12"
+ "font" "HudFontSmallest"
if_match
{
"xpos" "30"
}
+
+ if_mvm
+ {
+ "visible" "0"
+ }
}
"ServerTimeLimitLabelBG"
diff --git a/resource/ui/hudrocketpack.res b/resource/ui/hudrocketpack.res
index 25877e7..e67f658 100644
--- a/resource/ui/hudrocketpack.res
+++ b/resource/ui/hudrocketpack.res
@@ -4,9 +4,6 @@
{
HudItemEffectMeter
{
- "ypos" "c103"
- "ypos_minmode" "c60"
- "wide" "180"
"tall" "20"
}
@@ -35,20 +32,14 @@
"ItemEffectMeterLabel"
{
- "xpos" "32"
- "ypos" "12"
- "wide" "90"
- "tall" "15"
"visible" "0"
"labelText" "#TF_RocketPack_Disabled"
- "font" "HudFontSmallest"
}
"ItemEffectMeter"
{
- "xpos_minmode" "10"
"wide" "60"
- "wide_minmode" "57"
+ "wide_minmode" "55"
}
"ItemEffectMeter2"
@@ -57,12 +48,12 @@
"fieldName" "ItemEffectMeter2"
"font" "Default"
"xpos" "60"
- "xpos_minmode" "67"
+ "xpos_minmode" "55"
"ypos" "0"
"zpos" "2"
"wide" "60"
"tall" "8"
- "wide_minmode" "57"
+ "wide_minmode" "55"
"tall_minmode" "5"
"autoResize" "0"
"pinCorner" "0"
diff --git a/resource/ui/hudroundcounter.res b/resource/ui/hudroundcounter.res
index 350ee33..a697fe3 100644
--- a/resource/ui/hudroundcounter.res
+++ b/resource/ui/hudroundcounter.res
@@ -101,7 +101,7 @@
"tall" "16"
"visible" "1"
"enabled" "1"
- "fillcolor" "0 0 0 100"
+ "fillcolor" "TransparentBlack"
"proportionaltoparent" "1"
}
} \ No newline at end of file
diff --git a/resource/ui/hudspellselection.res b/resource/ui/hudspellselection.res
index b7567c2..f940d09 100644
--- a/resource/ui/hudspellselection.res
+++ b/resource/ui/hudspellselection.res
@@ -18,7 +18,7 @@
{
"ControlName" "ImagePanel"
"fieldName" "SpellIcon"
- "xpos" "0"
+ "xpos" "25"
"ypos" "0"
"zpos" "7"
"wide" "20"
@@ -64,15 +64,14 @@
{
"ControlName" "CExLabel"
"fieldName" "CountText"
- "font" "CerbeticaBold28"
- "font_minmode" "CerbeticaBold16"
+ "font" "Cerbetica28"
+ "font_minmode" "Cerbetica16"
"labelText" "%counttext%"
"textAlignment" "center"
"xpos" "0"
- "ypos" "22"
+ "ypos" "0"
"zpos" "1"
- "xpos_minmode" "0"
- "ypos_minmode" "20"
+ "xpos_minmode" "5"
"wide" "20"
"tall" "20"
"fgcolor" "TanLight"
@@ -82,8 +81,8 @@
{
"ControlName" "CExLabel"
"fieldName" "CountTextShadow"
- "font" "CerbeticaBold28"
- "font_minmode" "CerbeticaBold16"
+ "font" "Cerbetica28"
+ "font_minmode" "Cerbetica16"
"labelText" "%counttext%"
"textAlignment" "center"
"xpos" "-2"
diff --git a/resource/ui/hudstopwatch.res b/resource/ui/hudstopwatch.res
index cf357ba..98e32f0 100644
--- a/resource/ui/hudstopwatch.res
+++ b/resource/ui/hudstopwatch.res
@@ -11,7 +11,7 @@
"tall" "15"
"visible" "1"
"enabled" "1"
- "bgcolor_override" "0 0 0 150"
+ "bgcolor_override" "TransparentBlack"
"PaintBackgroundType" "2"
}
@@ -46,7 +46,7 @@
{
"ControlName" "CExLabel"
"fieldName" "TimePanelValue"
- "font" "Cerbetica12"
+ "font" "HudFontSmallest"
"fgcolor" "TanLight"
"xpos" "0"
"ypos" "0"
@@ -63,7 +63,7 @@
{
"ControlName" "CExLabel"
"fieldName" "StopWatchScoreToBeat"
- "font" "Cerbetica12"
+ "font" "HudFontSmallest"
"labelText" "%scoretobeat%"
"textAlignment" "center"
"xpos" "0"
@@ -81,7 +81,7 @@
{
"ControlName" "CExLabel"
"fieldName" "StopWatchPointsLabel"
- "font" "Cerbetica12"
+ "font" "HudFontSmallest"
"labelText" "points in"
"textAlignment" "center"
"xpos" "15"
@@ -100,12 +100,12 @@
{
"ControlName" "CExLabel"
"fieldName" "StopWatchLabel"
- "font" "Cerbetica10"
+ "font" "HudFontSmallest"
"labelText" "%stopwatchlabel%"
"textAlignment" "center"
"xpos" "0"
"ypos" "0"
- "zpos" "4"
+ "zpos" "1"
"wide" "80"
"tall" "15"
"autoResize" "0"
diff --git a/resource/ui/hudteamgoaltournament.res b/resource/ui/hudteamgoaltournament.res
index 118424f..483ba66 100644
--- a/resource/ui/hudteamgoaltournament.res
+++ b/resource/ui/hudteamgoaltournament.res
@@ -5,10 +5,10 @@
"ControlName" "EditablePanel"
"fieldName" "HudStopWatchObjective"
"xpos" "9999"
- "ypos" "9999"
+ "ypos" "105"
"zpos" "1"
"wide" "275"
- "tall" "190"
+ "tall" "130"
"visible" "0"
"enabled" "1"
@@ -20,7 +20,7 @@
"ypos" "0"
"zpos" "-1"
"wide" "275"
- "tall" "170"
+ "tall" "130"
"autoResize" "0"
"pinCorner" "0"
"visible" "1"
@@ -40,7 +40,7 @@
"ypos" "0"
"zpos" "-1"
"wide" "275"
- "tall" "100"
+ "tall" "80"
"autoResize" "0"
"pinCorner" "0"
"visible" "0"
@@ -114,7 +114,7 @@
"xpos" "25"
"ypos" "75"
"wide" "225"
- "tall" "165"
+ "tall" "150"
"wrap" "1"
"autoResize" "1"
"pinCorner" "1"
diff --git a/resource/ui/hudteamswitch.res b/resource/ui/hudteamswitch.res
new file mode 100644
index 0000000..fdbf642
--- /dev/null
+++ b/resource/ui/hudteamswitch.res
@@ -0,0 +1,83 @@
+"Resource/UI/HudTeamSwitch.res"
+{
+ "HudTeamSwitchBG"
+ {
+ "ControlName" "CTFImagePanel"
+ "fieldName" "HudTeamSwitchBG"
+ "xpos" "0"
+ "ypos" "0"
+ "zpos" "-1"
+ "wide" "246"
+ "tall" "31"
+ "autoResize" "0"
+ "pinCorner" "0"
+ "visible" "1"
+ "enabled" "1"
+ "image" "../hud/death_panel_blue_bg"
+ "scaleImage" "1"
+ "teambg_2" "../hud/death_panel_red_bg"
+ "teambg_3" "../hud/death_panel_blue_bg"
+ "paintborder" "1"
+ "border" "NoBorder"
+ "src_corner_height" "23"
+ "src_corner_width" "23"
+ "draw_corner_width" "0"
+ "draw_corner_height" "0"
+ }
+ "SwitchLabel"
+ {
+ "ControlName" "Label"
+ "fieldName" "SwitchLabel"
+ "font" "HudFontSmallest"
+ "xpos" "31"
+ "ypos" "3"
+ "zpos" "1"
+ "wide" "212"
+ "tall" "10"
+ "autoResize" "0"
+ "pinCorner" "0"
+ "visible" "1"
+ "enabled" "1"
+ "wrap" "1"
+ "labelText" "#TF_teambalanced"
+ "textAlignment" "North"
+ "fgcolor_override" "White"
+ "textinsetx" "5"
+ }
+ "BalanceLabel"
+ {
+ "ControlName" "Label"
+ "fieldName" "BalanceLabel"
+ "font" "HudFontSmallest"
+ "xpos" "31"
+ "ypos" "13"
+ "zpos" "1"
+ "wide" "212"
+ "tall" "40"
+ "autoResize" "0"
+ "pinCorner" "0"
+ "visible" "1"
+ "enabled" "1"
+ "wrap" "1"
+ "labelText" ""
+ "textAlignment" "North"
+ "fgcolor_override" "White"
+ "textinsetx" "5"
+ }
+ "SwitchImage"
+ {
+ "ControlName" "CTFImagePanel"
+ "fieldName" "SwitchImage"
+ "xpos" "3"
+ "ypos" "3"
+ "zpos" "1"
+ "wide" "25"
+ "tall" "25"
+ "autoResize" "0"
+ "pinCorner" "0"
+ "visible" "1"
+ "enabled" "1"
+ "image" "../hud/ico_teambalance"
+ "scaleImage" "1"
+ }
+} \ No newline at end of file
diff --git a/resource/ui/hudtournament.res b/resource/ui/hudtournament.res
index 53a3236..018bebe 100644
--- a/resource/ui/hudtournament.res
+++ b/resource/ui/hudtournament.res
@@ -5,9 +5,10 @@
"ControlName" "EditablePanel"
"fieldName" "HudTournament"
"xpos" "0"
- "ypos" "-10"
+ "ypos" "25"
"wide" "f0"
"tall" "480"
+ "proportionaltoparent" "1"
"team1_player_base_offset_x" "-75"
"team1_player_base_y" "0"
@@ -24,12 +25,49 @@
"name_width" "57"
"horiz_inset" "2"
+ if_mvm
+ {
+ "xpos" "0"
+ "ypos" "0"
+ "wide" "f0"
+ "tall" "480"
+
+ "team1_player_base_y" "66"
+ "team2_player_base_y" "66"
+ "team2_player_delta_x" "52"
+ }
+
+ if_competitive
+ {
+ "xpos" "0"
+ "ypos" "25"
+ "wide" "f0"
+ "tall" "480"
+
+ "team1_player_base_y" "66"
+ "team2_player_base_y" "66"
+ "team2_player_base_offset_x" "5"
+ }
+
+ if_readymode
+ {
+ "xpos" "0"
+ "ypos" "25"
+ "wide" "f0"
+ "tall" "480"
+
+ "team1_player_base_y" "66"
+ "team2_player_base_y" "66"
+ "team2_player_delta_x" "52"
+ "team2_player_base_offset_x" "5"
+ }
+
"ModeImage"
{
"ControlName" "ImagePanel"
"fieldName" "ModeImage"
"xpos" "cs-0.5"
- "ypos" "60"
+ "ypos" "50"
"zpos" "0"
"wide" "60"
"tall" "60"
@@ -49,70 +87,63 @@
"playerpanels_kv"
{
"visible" "0"
- "wide" "40"
- "tall" "33"
+ "wide" "50"
+ "tall" "35"
"zpos" "1"
- "tabPosition" "0"
"color_ready" "0 255 0 220"
- "color_notready" "0 0 0 220"
+ "color_notready" "TransparentBlack"
+
+ if_competitive
+ {
+ "wide" "40"
+ "tall" "29"
+ }
"PanelBG"
{
"ControlName" "ImagePanel"
"fieldName" "PanelBG"
- "xpos" "0"
- "ypos" "0"
- "zpos" "0"
- "wide" "55"
- "tall" "35"
+ "xpos" "1"
+ "ypos" "1"
+ "zpos" "2"
+ "wide" "48"
+ "tall" "24"
"autoResize" "0"
"pinCorner" "0"
- "visible" "0"
- "enabled" "0"
- "fillcolor" "ColorBlack"
+ "visible" "1"
+ "enabled" "1"
+ "fillcolor" "TransparentBlack"
+
+ if_competitive
+ {
+ "wide" "38"
+ "tall" "20"
+ }
}
"playername"
{
"ControlName" "CExLabel"
"fieldName" "playername"
- "font" "DefaultVerySmall"
- "xpos" "5"
- "ypos" "24"
+ "font" "Default"
+ "xpos" "1"
+ "ypos" "25"
"zpos" "5"
- "wide" "50"
- "tall" "9"
+ "wide" "48"
+ "tall" "10"
"autoResize" "0"
"pinCorner" "0"
"visible" "1"
"labelText" "%playername%"
- "textAlignment" "north-west"
-
- if_mvm
- {
- "xpos" "1"
- "ypos" "26"
- "wide" "38"
- "font" "Cerbetica8"
- "textAlignment" "center"
- }
+ "textAlignment" "center"
if_competitive
{
"xpos" "1"
- "ypos" "26"
- "wide" "38"
- "font" "Cerbetica8"
- "textAlignment" "center"
- }
-
- if_readymode
- {
- "xpos" "1"
- "ypos" "26"
- "wide" "38"
- "font" "Cerbetica8"
- "textAlignment" "center"
+ "ypos" "20"
+ "wide" "39"
+ "tall" "10"
+ "font" "DefaultVerySmall"
}
}
@@ -120,11 +151,11 @@
{
"ControlName" "CTFClassImage"
"fieldName" "classimage"
- "xpos" "2"
- "ypos" "2"
- "zpos" "2"
- "wide" "22"
- "tall" "22"
+ "xpos" "1"
+ "ypos" "1"
+ "zpos" "3"
+ "wide" "24"
+ "tall" "24"
"visible" "1"
"enabled" "1"
"image" "../hud/class_scoutred"
@@ -132,28 +163,18 @@
if_mvm
{
- "xpos" "7"
- "ypos" "0"
- "wide" "26"
- "tall" "26"
"image" "../vgui/hud_connecting"
}
if_competitive
{
- "xpos" "7"
- "ypos" "1"
- "wide" "26"
- "tall" "26"
+ "wide" "20"
+ "tall" "20"
"image" "../vgui/hud_connecting"
}
if_readymode
{
- "xpos" "7"
- "ypos" "1"
- "wide" "26"
- "tall" "26"
"image" "../vgui/hud_connecting"
}
}
@@ -162,13 +183,14 @@
{
"ControlName" "Panel"
"fieldName" "classimagebg"
- "xpos" "8"
- "ypos" "-2"
- "wide" "25"
- "tall" "28"
+ "xpos" "1"
+ "ypos" "1"
+ "zpos" "3"
+ "wide" "24"
+ "tall" "24"
"visible" "0"
"enabled" "1"
- "bgcolor_override" "0 0 0 100"
+ "bgcolor_override" "TransparentBlack"
"PaintBackgroundType" "0"
if_mvm
@@ -178,6 +200,8 @@
if_competitive
{
+ "wide" "20"
+ "tall" "20"
"visible" "1"
}
@@ -191,33 +215,38 @@
{
"ControlName" "EditablePanel"
"fieldName" "HealthIcon"
- "xpos" "8"
- "ypos" "6"
+ "xpos" "22"
+ "ypos" "-3"
"zpos" "3"
- "wide" "0"
- "tall" "0"
- "visible" "0"
- "enabled" "0"
+ "wide" "32"
+ "tall" "32"
+ "visible" "1"
+ "enabled" "1"
"HealthBonusPosAdj" "10"
"HealthDeathWarning" "0.49"
"TFFont" "HudFontSmallest"
"HealthDeathWarningColor" "HUDDeathWarning"
"TextColor" "HudOffWhite"
+
+ if_readymode
+ {
+ "xpos" "9999"
+ }
}
"ReadyBG"
{
"ControlName" "ScalableImagePanel"
"fieldName" "ReadyBG"
- "xpos" "0"
- "ypos" "0"
- "zpos" "2"
- "wide" "55"
- "tall" "26"
+ "xpos" "29"
+ "ypos" "5"
+ "zpos" "3"
+ "wide" "16"
+ "tall" "16"
"autoResize" "0"
"pinCorner" "0"
"visible" "0"
- "enabled" "1"
+ "enabled" "0"
"image" "../HUD/tournament_panel_brown"
"src_corner_height" "22" // pixels inside the image
@@ -229,19 +258,16 @@
if_mvm
{
"visible" "1"
- "zpos" "-2"
}
if_competitive
{
"visible" "1"
- "zpos" "-2"
}
if_readymode
{
"visible" "1"
- "zpos" "-2"
}
}
@@ -249,17 +275,16 @@
{
"ControlName" "ImagePanel"
"fieldName" "ReadyImage"
- "xpos" "0"
- "ypos" "0"
- "zpos" "1"
- "wide" "9999"
- "tall" "26"
+ "xpos" "31"
+ "ypos" "7"
+ "zpos" "4"
+ "wide" "12"
+ "tall" "12"
"autoResize" "0"
"pinCorner" "0"
"visible" "0"
"enabled" "1"
"image" "hud/checkmark"
- "fillcolor" "15 165 165 255"
"scaleImage" "1"
if_mvm
@@ -336,61 +361,26 @@
"textAlignment" "north-west"
//"fgcolor" "TanLight"
}
-
- if_mvm
- {
- "wide" "40"
- "tall" "35"
- }
-
- if_competitive
- {
- "wide" "40"
- "tall" "35"
- }
-
- if_readymode
- {
- "wide" "40"
- "tall" "35"
- }
- }
-
- if_mvm
- {
- "xpos" "0"
- "ypos" "0"
- "wide" "f0"
- "tall" "480"
-
- "team1_player_base_y" "68"
- "team2_player_delta_x" "42"
}
+ }
- if_competitive
- {
- "xpos" "0"
- "ypos" "0"
- "wide" "f0"
- "tall" "480"
-
- "team1_player_base_y" "72"
- "team2_player_base_y" "72"
- "team2_player_delta_x" "42"
- "team2_player_base_offset_x" "5"
- }
+ "MainBG"
+ {
+ "ControlName" "ImagePanel"
+ "fieldName" "MainBG"
+ "xpos" "c-125"
+ "ypos" "16"
+ "zpos" "-1"
+ "wide" "250"
+ "tall" "14"
+ "pinCorner" "0"
+ "visible" "1"
+ "enabled" "1"
+ "fillcolor" "TransparentBlack"
- if_readymode
+ if_mvm
{
- "xpos" "0"
- "ypos" "0"
- "wide" "f0"
- "tall" "480"
-
- "team1_player_base_y" "72"
- "team2_player_base_y" "72"
- "team2_player_delta_x" "42"
- "team2_player_base_offset_x" "5"
+ "visible" "0"
}
}
@@ -413,7 +403,7 @@
"ControlName" "ScalableImagePanel"
"fieldName" "HudTournamentBLUEBG"
"xpos" "c-125"
- "ypos" "10"
+ "ypos" "0"
"zpos" "-1"
"wide" "125"
"tall" "16"
@@ -446,12 +436,12 @@
{
"ControlName" "Label"
"fieldName" "TournamentBLUELabel"
- "font" "Cerbetica16"
- "xpos" "c-121"
- "ypos" "10"
+ "font" "HudFontSmall"
+ "xpos" "-5"
+ "ypos" "0"
"zpos" "1"
"wide" "65"
- "tall" "15"
+ "tall" "16"
"autoResize" "0"
"pinCorner" "0"
"visible" "1"
@@ -460,6 +450,10 @@
"labelText" "%bluenamelabel%"
"textAlignment" "west"
+ "pin_to_sibling" "HudTournamentBLUEBG"
+ "pin_corner_to_sibling" "PIN_TOPLEFT"
+ "pin_to_sibling_corner" "PIN_TOPLEFT"
+
if_mvm
{
"visible" "0"
@@ -480,12 +474,12 @@
{
"ControlName" "Label"
"fieldName" "TournamentBLUEStateLabel"
- "font" "Cerbetica16"
- "xpos" "c-69"
- "ypos" "10"
+ "font" "HudFontSmallest"
+ "xpos" "-5"
+ "ypos" "0"
"zpos" "1"
"wide" "65"
- "tall" "15"
+ "tall" "16"
"autoResize" "0"
"pinCorner" "0"
"visible" "1"
@@ -494,6 +488,10 @@
"labelText" "%bluestate%"
"textAlignment" "east"
+ "pin_to_sibling" "HudTournamentBLUEBG"
+ "pin_corner_to_sibling" "PIN_TOPRIGHT"
+ "pin_to_sibling_corner" "PIN_TOPRIGHT"
+
if_mvm
{
"visible" "0"
@@ -515,7 +513,7 @@
"ControlName" "ScalableImagePanel"
"fieldName" "HudTournamentREDBG"
"xpos" "c0"
- "ypos" "10"
+ "ypos" "0"
"zpos" "-1"
"wide" "125"
"tall" "16"
@@ -548,12 +546,12 @@
{
"ControlName" "Label"
"fieldName" "TournamentREDLabel"
- "font" "Cerbetica16"
- "xpos" "c55"
- "ypos" "10"
+ "font" "HudFontSmall"
+ "xpos" "-5"
+ "ypos" "0"
"zpos" "1"
"wide" "65"
- "tall" "15"
+ "tall" "16"
"autoResize" "0"
"pinCorner" "0"
"visible" "1"
@@ -562,6 +560,10 @@
"labelText" "%rednamelabel%"
"textAlignment" "east"
+ "pin_to_sibling" "HudTournamentREDBG"
+ "pin_corner_to_sibling" "PIN_TOPRIGHT"
+ "pin_to_sibling_corner" "PIN_TOPRIGHT"
+
if_mvm
{
"visible" "0"
@@ -582,12 +584,12 @@
{
"ControlName" "Label"
"fieldName" "TournamentREDStateLabel"
- "font" "Cerbetica16"
- "xpos" "c5"
- "ypos" "10"
+ "font" "HudFontSmallest"
+ "xpos" "-5"
+ "ypos" "0"
"zpos" "1"
"wide" "65"
- "tall" "15"
+ "tall" "16"
"autoResize" "0"
"pinCorner" "0"
"visible" "1"
@@ -596,6 +598,10 @@
"labelText" "%redstate%"
"textAlignment" "west"
+ "pin_to_sibling" "HudTournamentREDBG"
+ "pin_corner_to_sibling" "PIN_TOPLEFT"
+ "pin_to_sibling_corner" "PIN_TOPLEFT"
+
if_mvm
{
"visible" "0"
@@ -616,13 +622,13 @@
{
"ControlName" "CExLabel"
"fieldName" "TournamentConditionLabel"
- "font" "Cerbetica14"
+ "font" "HudFontSmallest"
"fgcolor" "TanLight"
"xpos" "c-125"
"ypos" "16"
"zpos" "1"
"wide" "250"
- "tall" "37"
+ "tall" "14"
"autoResize" "0"
"pinCorner" "0"
"visible" "1"
@@ -638,44 +644,7 @@
if_competitive
{
- "wide" "f0"
- "xpos" "0"
- "ypos" "24"
- }
- }
-
- "TournamentConditionLabelShadow"
- {
- "ControlName" "CExLabel"
- "fieldName" "TournamentConditionLabelShadow"
- "font" "Cerbetica14"
- "fgcolor" "TransparentBlack"
- "xpos" "c-125"
- "ypos" "16"
- "zpos" "0"
- "wide" "250"
- "tall" "37"
- "autoResize" "0"
- "pinCorner" "0"
- "visible" "0"
- "enabled" "0"
- "wrap" "0"
- "labelText" "%winconditions%"
- "textAlignment" "center"
-
- if_mvm
- {
- "visible" "0"
- }
-
- if_competitive
- {
- "visible" "0"
- }
-
- if_readymode
- {
- "visible" "0"
+ "ypos" "25"
}
}
@@ -690,11 +659,11 @@
{
"ControlName" "CExLabel"
"fieldName" "TournamentInstructionsLabel"
- "font" "Cerbetica11"
+ "font" "HudFontSmallest"
"xpos" "c-125"
- "ypos" "42"
+ "ypos" "30"
"wide" "250"
- "tall" "13"
+ "tall" "12"
"zpos" "1"
"autoResize" "0"
"pinCorner" "0"
@@ -706,59 +675,21 @@
if_mvm
{
- "font" "Cerbetica14"
- "xpos" "0"
- "ypos" "105"
- "wide" "f0"
- "tall" "16"
- "zpos" "3"
- }
-
- if_readymode
- {
- "xpos" "0"
- "wide" "f0"
+ "ypos" "105"
+ "visible" "1"
}
if_competitive
{
- "xpos" "0"
- "wide" "f0"
- "ypos" "118"
- "font" "Cerbetica14"
- "tall" "16"
+ "ypos" "36"
}
}
- "InstructionsBackground"
+ "TournamentReadyHintIcon"
{
- "ControlName" "ImagePanel"
- "fieldName" "InstructionBackground"
- "xpos" "c-125"
- "ypos" "26"
- "zpos" "-1"
- "wide" "250"
- "tall" "30"
- "pinCorner" "0"
- "visible" "1"
- "enabled" "1"
- "fillcolor" "DarkGrey"
-
- if_mvm {
- "visible" "0"
- }
-
- if_readymode
- {
- "xpos" "c-125"
- }
-
- if_competitive
- {
- "xpos" "195"
- "enabled" "0"
- "visible" "0"
- }
+ "ControlName" "CExLabel"
+ "fieldName" "TournamentReadyHintIcon"
+ "wide" "0"
}
"CountdownBG"
@@ -772,12 +703,12 @@
{
"ControlName" "CExLabel"
"fieldName" "CountdownLabel"
- "font" "Cerbetica24"
+ "font" "HudFontMedium"
"xpos" "230"
"ypos" "r55"
"wide" "40"
"tall" "40"
- "zpos" "2"
+ "zpos" "4"
"autoResize" "0"
"pinCorner" "0"
"visible" "0"
@@ -785,28 +716,23 @@
"wrap" "0"
"labelText" "%tournamentstatelabel%"
"textAlignment" "center"
+ "proportionaltoparent" "1"
if_mvm
{
- "visible" "1"
- "enabled" "1"
- "xpos" "c-80"
- "wide" "140"
+ "xpos" "c-20"
}
if_competitive
{
- "xpos" "c-20"
- "ypos" "130"
- "tall" "40"
- "zpos" "11"
+ "xpos" "cs-0.5"
+ "ypos" "cs-0.1"
}
if_readymode
{
"xpos" "c-20"
"ypos" "130"
- "tall" "20"
}
}
@@ -814,12 +740,12 @@
{
"ControlName" "CExLabel"
"fieldName" "CountdownLabelShadow"
- "font" "Cerbetica24"
+ "font" "HudFontMedium"
"xpos" "229"
- "ypos" "r53"
+ "ypos" "r54"
"wide" "40"
"tall" "40"
- "zpos" "1"
+ "zpos" "3"
"autoResize" "0"
"pinCorner" "0"
"visible" "0"
@@ -827,29 +753,24 @@
"wrap" "0"
"labelText" "%tournamentstatelabel%"
"textAlignment" "center"
- "fgcolor" "Black"
+ "fgcolor" "TransparentBlack"
+ "proportionaltoparent" "1"
if_mvm
{
- "visible" "1"
- "enabled" "1"
- "xpos" "c-78"
- "wide" "140"
+ "xpos" "c-19"
}
if_competitive
{
- "xpos" "c-19"
- "ypos" "130"
- "tall" "41"
- "zpos" "10"
+ "xpos" "cs-0.49"
+ "ypos" "cs-0.09"
}
if_readymode
{
- "xpos" "c-18"
- "ypos" "130"
- "tall" "22"
+ "xpos" "c-19"
+ "ypos" "129"
}
}
} \ No newline at end of file
diff --git a/resource/ui/hudtournamentsetup.res b/resource/ui/hudtournamentsetup.res
index fd78ec0..d60dc54 100644
--- a/resource/ui/hudtournamentsetup.res
+++ b/resource/ui/hudtournamentsetup.res
@@ -4,33 +4,29 @@
{
"ControlName" "ImagePanel"
"fieldName" "HudTournamentSetupBG"
- "xpos" "0"
+ "xpos" "30"
"ypos" "0"
"zpos" "-1"
- "wide" "180"
- "tall" "65"
+ "wide" "130"
+ "tall" "55"
"autoResize" "0"
"pinCorner" "0"
"visible" "1"
"enabled" "1"
- "fillcolor" "0 0 0 205"
-
- "src_corner_height" "20"
- "src_corner_width" "20"
- "draw_corner_width" "0"
- "draw_corner_height" "0"
+ "fillcolor" "TransparentBlack"
+ "border" "CyanBorder"
}
"TournamentSetupLabel"
{
"ControlName" "Label"
"fieldName" "TournamentLabel"
- "font" "Cerbetica16"
- "xpos" "0"
+ "font" "HudFontSmall"
+ "xpos" "30"
"ypos" "0"
"zpos" "1"
- "wide" "180"
- "tall" "35"
+ "wide" "130"
+ "tall" "20"
"autoResize" "0"
"pinCorner" "0"
"visible" "1"
@@ -44,11 +40,11 @@
{
"ControlName" "Label"
"fieldName" "TournamentTeamNameLabel"
- "font" "Cerbetica12"
- "xpos" "87"
- "ypos" "28"
+ "font" "HudFontSmallest"
+ "xpos" "35"
+ "ypos" "20"
"zpos" "1"
- "wide" "74"
+ "wide" "75"
"tall" "15"
"autoResize" "0"
"pinCorner" "0"
@@ -61,12 +57,12 @@
"TournamentNameEdit"
{
- "ControlName" "Label"
+ "ControlName" "TextEntry"
"fieldName" "TournamentNameEdit"
- "xpos" "30"
- "ypos" "27"
- "wide" "120"
- "tall" "16"
+ "xpos" "105"
+ "ypos" "20"
+ "wide" "45"
+ "tall" "15"
"autoResize" "0"
"pinCorner" "0"
"visible" "1"
@@ -82,7 +78,7 @@
"bgcolor_override" "Transparent"
"labelText" "%teamname%"
"textAlignment" "west"
- "font" "Cerbetica12"
+ "font" "HudFontSmallest"
}
"HudTournamentNameBG"
@@ -96,10 +92,10 @@
{
"ControlName" "CExButton"
"fieldName" "TournamentNotReadyButton"
- "xpos" "12"
- "ypos" "46"
- "wide" "70"
- "tall" "14"
+ "xpos" "90"
+ "ypos" "37"
+ "wide" "55"
+ "tall" "15"
"zpos" "0"
"autoResize" "0"
"pinCorner" "2"
@@ -111,25 +107,25 @@
"brighttext" "0"
"command" "teamnotready"
"default" "1"
- "font" "CerbeticaBold12"
- "fgcolor" "Red"
+ "font" "Cerbetica12"
+ "fgcolor" "ColorRed"
- "border_default" ""
- "border_armed" ""
- "paintbackground" "0"
- "defaultFgColor_override" "TanLight"
- "armedFgColor_override" "Button Color"
- "depressedFgColor_override" "Button Color"
+ "defaultBgColor_override" "Blank"
+ "defaultFgColor_override" "TanLight"
+ "armedBgColor_override" "Blank"
+ "armedFgColor_override" "ColorRed"
+ "depressedBgColor_override" "Blank"
+ "depressedFgColor_override" "ColorRed"
}
"TournamentReadyButton"
{
"ControlName" "CExButton"
"fieldName" "TournamentReadyButton"
- "xpos" "96"
- "ypos" "46"
- "wide" "70"
- "tall" "14"
+ "xpos" "35"
+ "ypos" "37"
+ "wide" "55"
+ "tall" "15"
"zpos" "0"
"autoResize" "0"
"pinCorner" "2"
@@ -142,14 +138,14 @@
"command" "teamready"
"paintborder" "0"
"default" "1"
- "font" "CerbeticaBold12"
- "fgcolor" "FooterBGBlack"
+ "font" "Cerbetica12"
+ "fgcolor" "ColorGreen"
- "border_default" ""
- "border_armed" ""
- "paintbackground" "0"
- "defaultFgColor_override" "TanLight"
- "armedFgColor_override" "Button Color"
- "depressedFgColor_override" "Button Color"
+ "defaultBgColor_override" "Blank"
+ "defaultFgColor_override" "TanLight"
+ "armedBgColor_override" "Blank"
+ "armedFgColor_override" "ColorGreen"
+ "depressedBgColor_override" "Blank"
+ "depressedFgColor_override" "ColorGreen"
}
} \ No newline at end of file
diff --git a/resource/ui/hudupgradepanel.res b/resource/ui/hudupgradepanel.res
index b6167d5..be3f0fb 100644
--- a/resource/ui/hudupgradepanel.res
+++ b/resource/ui/hudupgradepanel.res
@@ -618,7 +618,7 @@
{
"ControlName" "CExLabel"
"fieldName" "UpgradeItemStatsLabel"
- "font" "Cerbetica10"
+ "font" "HudFontSmallest"
"labelText" ""
"textAlignment" "north-west"
"xpos" "30"
@@ -637,7 +637,7 @@
{
"ControlName" "CExLabel"
"fieldName" "CreditsLabel"
- "font" "Cerbetica22"
+ "font" "HudFontMedium"
"labelText" "%credits%"
"textAlignment" "east"
"xpos" "0"
@@ -655,7 +655,7 @@
{
"ControlName" "CExLabel"
"fieldName" "CreditsTextLabel"
- "font" "Cerbetica10"
+ "font" "HudFontSmallest"
"labelText" "#TF_PVE_UpgradeAmount"
"textAlignment" "west"
"xpos" "250"
@@ -683,7 +683,7 @@
"enabled" "1"
"tabPosition" "0"
"labelText" "#TF_PVE_UpgradeCancel"
- "font" "Cerbetica10"
+ "font" "HudFontSmallest"
"textAlignment" "center"
"textinsetx" "50"
"dulltext" "0"
@@ -708,7 +708,7 @@
"enabled" "0"
"tabPosition" "0"
"labelText" "#TF_PVE_UpgradeDone"
- "font" "Cerbetica10"
+ "font" "HudFontSmallest"
"textAlignment" "center"
"textinsetx" "50"
"dulltext" "0"
@@ -733,7 +733,7 @@
"enabled" "0"
"tabPosition" "0"
"labelText" "#TF_PVE_UpgradeRespec"
- "font" "Cerbetica10"
+ "font" "HudFontSmallest"
"textAlignment" "center"
"textinsetx" "50"
"dulltext" "0"
diff --git a/resource/ui/itemoptionspanel.res b/resource/ui/itemoptionspanel.res
index b6783ea..c24929a 100644
--- a/resource/ui/itemoptionspanel.res
+++ b/resource/ui/itemoptionspanel.res
@@ -77,7 +77,7 @@
"enabled" "1"
"tabPosition" "0"
"labelText" "#TF_Item_SelectStyle"
- "font" "Cerbetica14"
+ "font" "HudFontSmall"
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
diff --git a/resource/ui/itemquickswitch.res b/resource/ui/itemquickswitch.res
index 149eec9..f3a1fd3 100644
--- a/resource/ui/itemquickswitch.res
+++ b/resource/ui/itemquickswitch.res
@@ -5,9 +5,9 @@
"ControlName" "EditablePanel"
"fieldName" "ItemQuickSwitchPanel"
"xpos" "c-135"
- "ypos" "330"
+ "ypos" "360"
"wide" "270"
- "tall" "140"
+ "tall" "115"
"autoResize" "0"
"pinCorner" "0"
"visible" "0"
@@ -62,13 +62,6 @@
"xpos" "9999"
}
- "NoItemsLabel"
- {
- "ControlName" "CExLabel"
- "fieldName" "NoItemsLabel"
- "xpos" "9999"
- }
-
"TopLine"
{
"ControlName" "ImagePanel"
@@ -129,12 +122,19 @@
}
}
+ "NoItemsLabel"
+ {
+ "ControlName" "CExLabel"
+ "fieldName" "NoItemsLabel"
+ "xpos" "9999"
+ }
+
"loadout_preset_panel"
{
"ControlName" "CLoadoutPresetPanel"
"FieldName" "loadout_preset_panel"
"xpos" "240"
- "ypos" "15"
+ "ypos" "5"
"zpos" "20"
"wide" "25"
"tall" "110"
diff --git a/resource/ui/itemrenameconfirmationdialog.res b/resource/ui/itemrenameconfirmationdialog.res
index 44b96a1..befe771 100644
--- a/resource/ui/itemrenameconfirmationdialog.res
+++ b/resource/ui/itemrenameconfirmationdialog.res
@@ -19,7 +19,7 @@
{
"ControlName" "CExLabel"
"fieldName" "TitleLabel"
- "font" "HudFontSmallBold"
+ "font" "HudFontMediumBold"
"labelText" "dynamic"
"textAlignment" "center"
"xpos" "100"
@@ -60,8 +60,8 @@
"xpos" "10"
"ypos" "10"
"zpos" "1"
- "wide" "200"
- "tall" "70"
+ "wide" "84"
+ "tall" "64"
"visible" "1"
"bgcolor_override" "Transparent"
"noitem_textcolor" "TextColor"
@@ -74,11 +74,13 @@
"text_ypos" "100" // Hide it off the bottom
"text_center" "1"
"name_only" "1"
+ "paint_icon_hide" "1"
"itemmodelpanel"
{
"use_item_rendertarget" "0"
"allow_rot" "0"
+ "inventory_image_type" "1"
}
}
"SubjectBG"
@@ -107,8 +109,8 @@
"xpos" "300"
"ypos" "10"
"zpos" "1"
- "wide" "90"
- "tall" "70"
+ "wide" "84"
+ "tall" "64"
"visible" "1"
"bgcolor_override" "Transparent"
"noitem_textcolor" "TextColor"
@@ -151,7 +153,7 @@
{
"ControlName" "CExLabel"
"fieldName" "GivenName"
- "font" "HudFontMediumSecondary"
+ "font" "HudFontSmall"
"labelText" "%name%"
"textAlignment" "center"
"xpos" "20"
@@ -194,14 +196,14 @@
"ypos" "200"
"zpos" "1"
"wide" "130"
- "tall" "25"
+ "tall" "20"
"autoResize" "0"
"pinCorner" "3"
"visible" "1"
"enabled" "1"
"tabPosition" "0"
"labelText" "#Cancel"
- "font" "HudFontSmallBold"
+ "font" "HudFontSmall"
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
@@ -219,14 +221,14 @@
"ypos" "200"
"zpos" "1"
"wide" "130"
- "tall" "25"
+ "tall" "20"
"autoResize" "0"
"pinCorner" "3"
"visible" "1"
"enabled" "1"
"tabPosition" "0"
"labelText" "#CraftNameConfirm"
- "font" "HudFontSmallBold"
+ "font" "HudFontSmall"
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
diff --git a/resource/ui/itemrenamedialog.res b/resource/ui/itemrenamedialog.res
index f8157c0..ec6c0a8 100644
--- a/resource/ui/itemrenamedialog.res
+++ b/resource/ui/itemrenamedialog.res
@@ -345,14 +345,14 @@
"ypos" "200"
"zpos" "1"
"wide" "130"
- "tall" "25"
+ "tall" "20"
"autoResize" "0"
"pinCorner" "3"
"visible" "1"
"enabled" "1"
"tabPosition" "0"
"labelText" "#Cancel"
- "font" "HudFontSmallBold"
+ "font" "HudFontSmall"
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
@@ -370,14 +370,14 @@
"ypos" "200"
"zpos" "1"
"wide" "130"
- "tall" "25"
+ "tall" "20"
"autoResize" "0"
"pinCorner" "3"
"visible" "1"
"enabled" "1"
"tabPosition" "0"
"labelText" "#CraftNameOk"
- "font" "HudFontSmallBold"
+ "font" "HudFontSmall"
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
diff --git a/resource/ui/itemrenameinvaliddialog.res b/resource/ui/itemrenameinvaliddialog.res
index 9cc6cc1..2c2ab6a 100644
--- a/resource/ui/itemrenameinvaliddialog.res
+++ b/resource/ui/itemrenameinvaliddialog.res
@@ -19,7 +19,7 @@
{
"ControlName" "CExLabel"
"fieldName" "TitleLabel"
- "font" "HudFontSmallBold"
+ "font" "HudFontMediumBold"
"labelText" "dynamic"
"textAlignment" "center"
"xpos" "100"
@@ -155,7 +155,7 @@
{
"ControlName" "CExLabel"
"fieldName" "GivenName"
- "font" "HudFontMediumSecondary"
+ "font" "HudFontSmall"
"labelText" "%name%"
"textAlignment" "center"
"xpos" "20"
@@ -197,14 +197,14 @@
"ypos" "200"
"zpos" "1"
"wide" "130"
- "tall" "25"
+ "tall" "20"
"autoResize" "0"
"pinCorner" "3"
"visible" "1"
"enabled" "1"
"tabPosition" "0"
"labelText" "#TF_OK"
- "font" "HudFontSmallBold"
+ "font" "HudFontSmall"
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
diff --git a/resource/ui/itemselectionpanel.res b/resource/ui/itemselectionpanel.res
index 8a49381..32360a0 100644
--- a/resource/ui/itemselectionpanel.res
+++ b/resource/ui/itemselectionpanel.res
@@ -91,7 +91,7 @@
{
"ControlName" "CExLabel"
"fieldName" "CaratLabel"
- "font" "Cerbetica16"
+ "font" "HudFontMediumSmallSecondary"
"labelText" ">>"
"textAlignment" "west"
"xpos" "c-290"
@@ -127,7 +127,7 @@
{
"ControlName" "CExLabel"
"fieldName" "NameFilterLabel"
- "font" "HudFontSmallestBold"
+ "font" "HudFontSmallest"
"labelText" "#Store_NameFilterLabel"
"textAlignment" "west"
"xpos" "c+175"
@@ -161,7 +161,7 @@
"editable" "1"
"unicode" "1"
"fgcolor_override" "TanLight"
- "bgcolor_override" "15 15 15 255"
+ "bgcolor_override" "DarkerGrey"
"paintbackgroundtype" "2"
}
@@ -218,11 +218,11 @@
{
"ControlName" "CExLabel"
"fieldName" "NoItemsLabel"
- "font" "HudFontSmallBold"
+ "font" "HudFontSmall"
"labelText" "#NoItemsToEquip"
"textAlignment" "center"
"xpos" "c-300"
- "ypos" "120"
+ "ypos" "150"
"zpos" "10"
"wide" "600"
"tall" "30"
@@ -241,7 +241,7 @@
"ypos" "400"
"zpos" "2"
"wide" "200"
- "tall" "25"
+ "tall" "20"
"autoResize" "0"
"pinCorner" "2"
"visible" "1"
@@ -262,10 +262,10 @@
"ControlName" "CheckButton"
"fieldName" "OnlyAllowUniqueQuality"
"labelText" "#OnlyAllowUniqueQuality"
- "font" "HudFontSmallestBold"
+ "font" "HudFontSmallest"
"textAlignment" "east"
- "xpos" "c-291"
- "ypos" "320"
+ "xpos" "c-306"
+ "ypos" "288"
"zpos" "1"
"wide" "290"
"tall" "25"
@@ -281,18 +281,18 @@
{
"ControlName" "CExButton"
"fieldName" "ShowBackpack"
- "xpos" "c-288"
+ "xpos" "c-20"
"ypos" "290"
"zpos" "20"
"wide" "200"
- "tall" "25"
+ "tall" "20"
"autoResize" "0"
"pinCorner" "0"
"visible" "1"
"enabled" "1"
"tabPosition" "0"
"labelText" "#Selection_ShowBackpack"
- "font" "HudFontSmallBold"
+ "font" "HudFontSmall"
"textAlignment" "center"
"textinsetx" "50"
"dulltext" "0"
@@ -305,18 +305,18 @@
{
"ControlName" "CExButton"
"fieldName" "ShowSelection"
- "xpos" "c-288"
+ "xpos" "c-20"
"ypos" "290"
"zpos" "20"
"wide" "200"
- "tall" "25"
+ "tall" "20"
"autoResize" "0"
"pinCorner" "0"
"visible" "1"
"enabled" "1"
"tabPosition" "0"
"labelText" "#Selection_ShowSelection"
- "font" "HudFontSmallBold"
+ "font" "HudFontSmall"
"textAlignment" "center"
"textinsetx" "50"
"dulltext" "0"
@@ -330,7 +330,7 @@
{
"ControlName" "CExButton"
"fieldName" "PrevPageButton"
- "xpos" "c205"
+ "xpos" "c195"
"ypos" "290"
"zpos" "1"
"wide" "20"
@@ -354,10 +354,10 @@
{
"ControlName" "CExLabel"
"fieldName" "CurPageLabel"
- "font" "HudFontSmallBold"
+ "font" "HudFontSmall"
"labelText" "%backpackpage%"
"textAlignment" "center"
- "xpos" "c230"
+ "xpos" "c220"
"ypos" "290"
"zpos" "1"
"wide" "40"
@@ -373,7 +373,7 @@
{
"ControlName" "CExButton"
"fieldName" "NextPageButton"
- "xpos" "c275"
+ "xpos" "c265"
"ypos" "290"
"zpos" "1"
"wide" "20"
@@ -407,6 +407,7 @@
"noitem_textcolor" "TextColor"
"PaintBackgroundType" "2"
"paintborder" "1"
+ "paintbackground" "0"
"text_ypos" "20"
"text_center" "1"
diff --git a/resource/ui/loadoutpresetpanel.res b/resource/ui/loadoutpresetpanel.res
index 079db57..bc0bc26 100644
--- a/resource/ui/loadoutpresetpanel.res
+++ b/resource/ui/loadoutpresetpanel.res
@@ -15,7 +15,7 @@
"visible" "0"
"enabled" "1"
"tabPosition" "0"
- "font" "CerbeticaBold28"
+ "font" "Cerbetica28"
"textAlignment" "center"
"textinsetx" "0"
"dulltext" "0"
diff --git a/resource/ui/mainmenuplaylistentry.res b/resource/ui/mainmenuplaylistentry.res
index 5ba9c86..4d34014 100644
--- a/resource/ui/mainmenuplaylistentry.res
+++ b/resource/ui/mainmenuplaylistentry.res
@@ -95,7 +95,7 @@
"textinsetx" "4"
"textinsety" "16"
"use_proportional_insets" "1"
- "font" "CerbeticaBold24"
+ "font" "Cerbetica24"
"textAlignment" "east"
"dulltext" "0"
"brighttext" "0"
diff --git a/resource/ui/mapinfomenu.res b/resource/ui/mapinfomenu.res
index f0b5d4d..a8a7206 100644
--- a/resource/ui/mapinfomenu.res
+++ b/resource/ui/mapinfomenu.res
@@ -28,7 +28,7 @@
"pinCorner" "0"
"visible" "0"
"enabled" "0"
- "fillcolor" "0 0 0 100"
+ "fillcolor" "TransparentBlack"
}
"MapInfoTitle"
@@ -36,7 +36,7 @@
"ControlName" "CExLabel"
"fieldName" "MapInfoTitle"
"xpos" "c-180"
- "ypos" "c-135"
+ "ypos" "c-116"
"zpos" "1"
"wide" "360"
"tall" "26"
@@ -46,7 +46,7 @@
"enabled" "1"
"labelText" "%mapname%"
"textAlignment" "center"
- "font" "Cerbetica24"
+ "font" "HudFontMedium"
"fgcolor" "TanLight"
}
@@ -55,9 +55,10 @@
"ControlName" "CExLabel"
"fieldName" "MapInfoType"
"xpos" "c-180"
- "ypos" "c-110"
+ "ypos" "c-140"
"zpos" "1"
"wide" "360"
+ "tall" "26"
"tall" "16"
"autoResize" "0"
"pinCorner" "0"
@@ -65,7 +66,7 @@
"enabled" "1"
"labelText" "%gamemode%"
"textAlignment" "center"
- "font" "Cerbetica16"
+ "font" "HudFontSmallishBold"
"fgcolor" "TanLight"
}
@@ -73,7 +74,7 @@
{
"ControlName" "CExRichText"
"fieldName" "MapInfoText"
- "font" "Cerbetica12"
+ "font" "HudFontSmall"
"xpos" "c-170"
"ypos" "c-90"
"zpos" "3"
@@ -107,13 +108,6 @@
{
"ControlName" "CExButton"
"fieldName" "MapInfoContinue"
- "xpos" "9999"
- }
-
- "MapInfoContinue2"
- {
- "ControlName" "CExButton"
- "fieldName" "MapInfoContinue2"
"xpos" "c-60"
"ypos" "c96"
"zpos" "6"
@@ -123,13 +117,13 @@
"pinCorner" "2"
"visible" "1"
"enabled" "1"
- "labelText" "CONTINUE (&E)"
+ "labelText" "#TF_Continue"
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
"command" "continue"
"default" "1"
- "font" "Cerbetica24"
+ "font" "HudFontMedium"
"paintbackground" "0"
"fgcolor" "TanLight"
@@ -164,7 +158,7 @@
"dulltext" "0"
"brighttext" "0"
"command" "back"
- "font" "Cerbetica24"
+ "font" "HudFontMedium"
"paintbackground" "0"
"fgcolor" "TanLight"
diff --git a/resource/ui/matchmakingcasualcriteria.res b/resource/ui/matchmakingcasualcriteria.res
index d93ef63..2cd0bc9 100644
--- a/resource/ui/matchmakingcasualcriteria.res
+++ b/resource/ui/matchmakingcasualcriteria.res
@@ -35,17 +35,18 @@
{
"ControlName" "CPvPRankPanel"
"fieldName" "RankPanel"
- "xpos" "35"
- "ypos" "-15"
+ "xpos" "0"
+ "ypos" "-68"
"zpos" "100"
"wide" "330"
- "tall" "92"
- "visible" "0"
+ "tall" "102"
+ "visible" "1"
"proportionaltoparent" "1"
"mouseinputenabled" "0"
"matchgroup" "MatchGroup_Casual_12v12"
"show_model" "0"
"show_name" "0"
+ "show_stats" "1"
}
"RestoreCasualSearchCriteria"
@@ -53,7 +54,7 @@
"ControlName" "CExImageButton"
"fieldName" "RestoreCasualSearchCriteria"
"xpos" "rs1-27"
- "ypos" "15"
+ "ypos" "38"
"zpos" "100"
"wide" "15"
"tall" "o1"
@@ -97,7 +98,7 @@
"ControlName" "CExImageButton"
"fieldName" "SaveCasualSearchCriteria"
"xpos" "rs1-7"
- "ypos" "15"
+ "ypos" "38"
"zpos" "100"
"wide" "15"
"tall" "o1"
@@ -151,14 +152,14 @@
"ControlName" "Label"
"fieldName" "Title"
"xpos" "10"
- "ypos" "15"
+ "ypos" "35"
"zpos" "0"
"wide" "f0"
"tall" "20"
"proportionaltoparent" "1"
"labeltext" "#TF_Casual_MapSelection"
"textAlignment" "west"
- "font" "CerbeticaBold15"
+ "font" "HudFontSmall"
"mouseinputenabled" "0"
}
@@ -166,8 +167,8 @@
{
"ControlName" "Label"
"fieldName" "SelectedCount"
- "xpos" "10"
- "ypos" "0"
+ "xpos" "100"
+ "ypos" "35"
"zpos" "0"
"wide" "f0"
"tall" "20"
@@ -184,7 +185,7 @@
"ControlName" "Label"
"fieldName" "QueueEstimation"
"xpos" "rs1-5"
- "ypos" "18"
+ "ypos" "38"
"zpos" "0"
"wide" "f0"
"tall" "20"
@@ -203,11 +204,11 @@
"ControlName" "EditablePanel"
"fieldName" "PlayListDropShadow"
"xpos" "cs-0.5"
- "ypos" "65"
+ "ypos" "55"
"zpos" "101"
"wide" "f15"
- "tall" "f65"
- "visible" "0"
+ "tall" "f63"
+ "visible" "1"
"PaintBackgroundType" "2"
"border" "InnerShadowBorder"
"proportionaltoparent" "1"
@@ -219,9 +220,9 @@
"ControlName" "CScrollableList"
"fieldName" "GameModesList"
"xpos" "cs-0.5"
- "ypos" "35"
+ "ypos" "55"
"wide" "f15"
- "tall" "f40"
+ "tall" "f63"
"visible" "1"
"proportionaltoparent" "1"
"restrict_width" "0"
diff --git a/resource/ui/matchmakingdashboard.res b/resource/ui/matchmakingdashboard.res
index 1b4c63a..fb0bce6 100644
--- a/resource/ui/matchmakingdashboard.res
+++ b/resource/ui/matchmakingdashboard.res
@@ -58,7 +58,7 @@
"zpos" "-1"
"wide" "p1.1"
"tall" "f5"
- "visible" "0"
+ "visible" "1"
"PaintBackgroundType" "2"
"border" "NoBorder"
"bgcolor_override" "DarkGrey"
@@ -74,7 +74,7 @@
"zpos" "-2"
"wide" "p1.1"
"tall" "p1"
- "visible" "0"
+ "visible" "1"
"PaintBackgroundType" "2"
"border" "OuterShadowBorder"
"proportionaltoparent" "1"
@@ -94,13 +94,13 @@
"visible" "1"
"enabled" "1"
"tabPosition" "0"
- "font" "HudFontSmallestBold"
+ "labeltext" "l"
+ "font" "CustomIcons"
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
"Command" "toggle_chat"
"proportionaltoparent" "1"
- "labeltext" ""
"mouseinputenabled" "1"
"keyboardinputenabled" "0"
"actionsignallevel" "2"
@@ -110,27 +110,11 @@
"sound_depressed" "UI/buttonclick.wav"
"sound_released" "UI/buttonclickrelease.wav"
- "image_drawcolor" "TanLight"
- "image_armedcolor" "72 255 255 255"
+ "defaultFgColor_override" "TanLight"
+ "armedFgColor_override" "ColorCyan"
"armedBgColor_override" "Transparent"
"defaultBgColor_override" "Transparent"
-
- "SubImage"
- {
- "ControlName" "ImagePanel"
- "fieldName" "SubImage"
- "xpos" "cs-0.5"
- "ypos" "rs1-2"
- "zpos" "1"
- "wide" "20"
- "tall" "20"
- "visible" "1"
- "enabled" "1"
- "scaleImage" "1"
- "proportionaltoparent" "1"
- "image" "replay/thumbnails/chat"
- }
}
"PartySlot0"
@@ -349,7 +333,7 @@
"tall" "f0"
"visible" "1"
"enabled" "1"
- "font" "HudFontSmallestBold"
+ "font" "HudFontSmall"
"fgcolor_override" "TanLight"
"textAlignment" "west"
"labelText" "%queue_state%"
@@ -412,7 +396,7 @@
"ControlName" "CExImageButton"
"fieldName" "CloseButton"
"xpos" "rs1-6"
- "ypos" "11"
+ "ypos" "12"
"zpos" "10"
"wide" "14"
"tall" "14"
@@ -653,6 +637,7 @@
"defaultFgColor_override" "TanLight"
"armedFgColor_override" "TanLight"
+
"image_drawcolor" "TanLight"
"image_armedcolor" "TanLight"
@@ -694,7 +679,7 @@
"brighttext" "0"
"Command" "resume_game"
"proportionaltoparent" "1"
- "labeltext" "Resume"
+ "labeltext" "#MMenu_ResumeGame"
"mouseinputenabled" "1"
"keyboardinputenabled" "0"
"actionsignallevel" "2"
@@ -702,7 +687,6 @@
"textinsety" "5"
"textinsetx" "22"
"use_proportional_insets" "1"
-
"sound_depressed" "UI/buttonclick.wav"
"sound_released" "UI/buttonclickrelease.wav"
@@ -760,7 +744,6 @@
"textinsetx" "25"
"textinsety" "5"
"use_proportional_insets" "1"
-
"sound_depressed" "UI/buttonclick.wav"
"sound_released" "UI/buttonclickrelease.wav"
diff --git a/resource/ui/matchmakingdashboardcasualcriteria.res b/resource/ui/matchmakingdashboardcasualcriteria.res
index 7f810b3..0d17296 100644
--- a/resource/ui/matchmakingdashboardcasualcriteria.res
+++ b/resource/ui/matchmakingdashboardcasualcriteria.res
@@ -26,7 +26,7 @@
"proportionaltoparent" "1"
"labeltext" "#TF_Matchmaking_HeaderCasual"
"textAlignment" "center"
- "font" "CerbeticaBold24"
+ "font" "HudFontMediumSecondary"
"fgcolor_override" "White"
"mouseinputenabled" "0"
}
@@ -39,16 +39,33 @@
"ypos" "40"
"zpos" "100"
"wide" "f0"
- "tall" "f73"
+ "tall" "f63"
"visible" "1"
"proportionaltoparent" "1"
}
+ "ToolTipButtonHack"
+ {
+ "ControlName" "EditablePanel"
+ "fieldName" "ToolTipButtonHack"
+ "xpos" "cs-0.5"
+ "ypos" "rs1-8"
+ "zpos" "101"
+ "wide" "f20"
+ "tall" "20"
+ "visible" "0"
+ "enabled" "1"
+ "mouseinputenabled" "1"
+ "eatmouseinput" "0"
+ "showtooltipswhenmousedisabled" "1"
+ "proportionaltoparent" "1"
+ }
+
"QueueButton"
{
"ControlName" "CExButton"
"fieldName" "QueueButton"
- "xpos" "cs-0.5"
+ "xpos" "cs-0.51"
"ypos" "rs1-8"
"zpos" "100"
"wide" "f20"
diff --git a/resource/ui/matchmakingdashboardcomp.res b/resource/ui/matchmakingdashboardcomp.res
index a73f46c..da967b3 100644
--- a/resource/ui/matchmakingdashboardcomp.res
+++ b/resource/ui/matchmakingdashboardcomp.res
@@ -26,8 +26,9 @@
"proportionaltoparent" "1"
"labeltext" "#TF_Matchmaking_HeaderCompetitive"
"textAlignment" "center"
- "font" "CerbeticaBold24"
+ "font" "HudFontMediumSecondary"
"fgcolor_override" "White"
+ "bgcolor_override" "DarkGrey"
"mouseinputenabled" "0"
}
@@ -83,7 +84,7 @@
"ypos" "40"
"zpos" "100"
"wide" "305"
- "tall" "f80"
+ "tall" "340"
"visible" "1"
"proportionaltoparent" "1"
}
@@ -109,7 +110,7 @@
{
"ControlName" "CExButton"
"fieldName" "QueueButton"
- "xpos" "cs-0.5"
+ "xpos" "cs-0.51"
"ypos" "rs1-8"
"zpos" "100"
"wide" "f20"
diff --git a/resource/ui/matchmakingdashboardmvmmodeselect.res b/resource/ui/matchmakingdashboardmvmmodeselect.res
index dd30655..92b64cd 100644
--- a/resource/ui/matchmakingdashboardmvmmodeselect.res
+++ b/resource/ui/matchmakingdashboardmvmmodeselect.res
@@ -42,7 +42,7 @@
"proportionaltoparent" "1"
"labeltext" "#TF_Matchmaking_HeaderMvM"
"textAlignment" "center"
- "font" "CerbeticaBold24"
+ "font" "Cerbetica24"
"fgcolor_override" "White"
"mouseinputenabled" "0"
}
@@ -141,8 +141,7 @@
"sound_depressed" "UI/buttonclick.wav"
"sound_released" "UI/buttonclickrelease.wav"
-
- "defaultBgColor_override" "HudBlack"
+ "defaultBgColor_override" "TransparentBlack"
}
"PlayForBraggingRightsExplanation"
@@ -259,8 +258,7 @@
"sound_depressed" "UI/buttonclick.wav"
"sound_released" "UI/buttonclickrelease.wav"
-
- "defaultBgColor_override" "HudBlack"
+ "defaultBgColor_override" "TransparentBlack"
}
"PlayOnCommunityServerExplanation"
diff --git a/resource/ui/matchmakingdashboardplaylist.res b/resource/ui/matchmakingdashboardplaylist.res
index 30a1c2c..0ae80d6 100644
--- a/resource/ui/matchmakingdashboardplaylist.res
+++ b/resource/ui/matchmakingdashboardplaylist.res
@@ -26,7 +26,7 @@
"proportionaltoparent" "1"
"labeltext" "#TF_Matchmaking_HeaderModeSelect"
"textAlignment" "center"
- "font" "CerbeticaBold24"
+ "font" "HudFontMediumSecondary"
"fgcolor_override" "White"
"mouseinputenabled" "0"
}
diff --git a/resource/ui/matchmakingdashboardpopup_newmatch.res b/resource/ui/matchmakingdashboardpopup_newmatch.res
index 23a8c44..becfea1 100644
--- a/resource/ui/matchmakingdashboardpopup_newmatch.res
+++ b/resource/ui/matchmakingdashboardpopup_newmatch.res
@@ -15,7 +15,7 @@
"mouseinputenabled" "1"
"collapsed_height" "0"
- "expanded_height" "30"
+ "expanded_height" "60"
"pinCorner" "2"
"autoResize" "1"
@@ -74,7 +74,7 @@
"fonts"
{
- "0" "CerbeticaBold12"
+ "0" "HudFontSmallest"
"1" "StorePromotionsTitle"
"2" "FontStorePrice"
}
@@ -91,7 +91,7 @@
"tall" "20"
"visible" "1"
"enabled" "1"
- "font" "Cerbetica12"
+ "font" "HudFontSmall"
"fgcolor_override" "TanLight"
"textAlignment" "center"
"labelText" "%auto_join%"
@@ -113,7 +113,7 @@
"visible" "1"
"enabled" "1"
"tabPosition" "0"
- "font" "CerbeticaBold12"
+ "font" "HudFontSmall"
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
@@ -150,7 +150,7 @@
"visible" "1"
"enabled" "1"
"tabPosition" "0"
- "font" "CerbeticaBold12"
+ "font" "HudFontSmall"
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
@@ -180,7 +180,7 @@
"visible" "1"
"enabled" "1"
"tabPosition" "0"
- "font" "CerbeticaBold12"
+ "font" "HudFontSmall"
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
@@ -206,7 +206,7 @@
"tall" "20"
"visible" "1"
"enabled" "1"
- "font" "CerbeticaBold12"
+ "font" "HudFontSmall"
"fgcolor_override" "TanLight"
"textAlignment" "east"
"labelText" "#TF_Matchmaking_RollingQueue_MatchReadyJoining"
diff --git a/resource/ui/matchmakingdashboardsidepanel.res b/resource/ui/matchmakingdashboardsidepanel.res
index 5e92123..b30a70a 100644
--- a/resource/ui/matchmakingdashboardsidepanel.res
+++ b/resource/ui/matchmakingdashboardsidepanel.res
@@ -97,7 +97,7 @@
"proportionaltoparent" "1"
"command" "nav_close"
"textAlignment" "east"
- "font" "Cerbetica14"
+ "font" "HudFontSmall"
"armedBgColor_override" "Transparent"
"defaultBgColor_override" "Transparent"
@@ -126,7 +126,7 @@
"command" "nav_to"
"labelText" "<"
"textAlignment" "west"
- "font" "Cerbetica14"
+ "font" "HudFontSmall"
"armedBgColor_override" "Transparent"
"defaultBgColor_override" "Transparent"
diff --git a/resource/ui/mvmcreditspendpanel.res b/resource/ui/mvmcreditspendpanel.res
index 50f8193..2c1e8cb 100644
--- a/resource/ui/mvmcreditspendpanel.res
+++ b/resource/ui/mvmcreditspendpanel.res
@@ -24,7 +24,7 @@
"wide" "190"
"tall" "42"
"visible" "1"
- "bgcolor_override" "20 20 20 200"
+ "bgcolor_override" "Transparent"
}
"UpgradesLabel"
@@ -34,9 +34,9 @@
"font" "HudFontSmall"
"labelText" "#TF_PVE_Upgrades"
"textAlignment" "north-west"
- "xpos" "10"
+ "xpos" "0"
"ypos" "15"
- "wide" "90"
+ "wide" "70"
"tall" "20"
"fgcolor" "TanLight"
}
@@ -48,7 +48,7 @@
"font" "HudFontSmall"
"labelText" "%upgrades%"
"textAlignment" "north-east"
- "xpos" "100"
+ "xpos" "75"
"ypos" "15"
"wide" "30"
"tall" "20"
@@ -62,9 +62,9 @@
"font" "HudFontSmall"
"labelText" "#TF_PVE_Buybacks"
"textAlignment" "north-west"
- "xpos" "10"
+ "xpos" "0"
"ypos" "27"
- "wide" "90"
+ "wide" "70"
"tall" "20"
"fgcolor" "TanLight"
}
@@ -76,7 +76,7 @@
"font" "HudFontSmall"
"labelText" "%buybacks%"
"textAlignment" "north-east"
- "xpos" "100"
+ "xpos" "75"
"ypos" "27"
"wide" "30"
"tall" "20"
@@ -90,9 +90,9 @@
"font" "HudFontSmall"
"labelText" "#TF_PVE_Bottles"
"textAlignment" "north-west"
- "xpos" "10"
+ "xpos" "0"
"ypos" "39"
- "wide" "90"
+ "wide" "70"
"tall" "20"
"fgcolor" "TanLight"
}
@@ -104,7 +104,7 @@
"font" "HudFontSmall"
"labelText" "%bottles%"
"textAlignment" "north-east"
- "xpos" "100"
+ "xpos" "75"
"ypos" "39"
"wide" "30"
"tall" "20"
diff --git a/resource/ui/mvmcreditsubpanel.res b/resource/ui/mvmcreditsubpanel.res
index 2f23c00..e36437f 100644
--- a/resource/ui/mvmcreditsubpanel.res
+++ b/resource/ui/mvmcreditsubpanel.res
@@ -24,7 +24,7 @@
"wide" "190"
"tall" "42"
"visible" "1"
- "bgcolor_override" "20 20 20 200"
+ "bgcolor_override" "Transparent"
}
"CreditCollectedTextLabel"
@@ -34,7 +34,7 @@
"font" "HudFontSmall"
"labelText" "#TF_PVE_Collected"
"textAlignment" "north-west"
- "xpos" "9"
+ "xpos" "0"
"ypos" "15"
"wide" "70"
"tall" "12"
@@ -48,7 +48,7 @@
"font" "HudFontSmall"
"labelText" "%creditscollected%"
"textAlignment" "north-east"
- "xpos" "100"
+ "xpos" "75"
"ypos" "15"
"wide" "30"
"tall" "12"
@@ -62,7 +62,7 @@
"font" "HudFontSmall"
"labelText" "#TF_PVE_Missed"
"textAlignment" "north-west"
- "xpos" "10"
+ "xpos" "0"
"ypos" "27"
"wide" "70"
"tall" "12"
@@ -76,7 +76,7 @@
"font" "HudFontSmall"
"labelText" "%creditsmissed%"
"textAlignment" "north-east"
- "xpos" "100"
+ "xpos" "75"
"ypos" "27"
"wide" "30"
"tall" "12"
@@ -90,7 +90,7 @@
"font" "HudFontSmall"
"labelText" "#TF_PVE_Bonus"
"textAlignment" "north-west"
- "xpos" "10"
+ "xpos" "0"
"ypos" "39"
"wide" "70"
"tall" "12"
@@ -104,7 +104,7 @@
"font" "HudFontSmall"
"labelText" "%creditbonus%"
"textAlignment" "north-east"
- "xpos" "100"
+ "xpos" "75"
"ypos" "39"
"wide" "30"
"tall" "12"
@@ -118,8 +118,8 @@
"font" "HudFontMediumBold"
"labelText" "%rating%"
"textAlignment" "center"
- "xpos" "125"
- "ypos" "25"
+ "xpos" "66"
+ "ypos" "-3"
"zpos" "1"
"wide" "70"
"tall" "20"
diff --git a/resource/ui/mvminworldcurrency.res b/resource/ui/mvminworldcurrency.res
index 7373fad..22ee96f 100644
--- a/resource/ui/mvminworldcurrency.res
+++ b/resource/ui/mvminworldcurrency.res
@@ -11,7 +11,7 @@
"tall" "20"
"visible" "1"
"enabled" "1"
- "bgcolor_override" "0 0 0 200"
+ "bgcolor_override" "TransparentBlack"
"PaintBackgroundType" "2"
}
@@ -19,7 +19,7 @@
{
"ControlName" "CExLabel"
"fieldName" "CurrencyLabel"
- "font" "Cerbetica14"
+ "font" "HudFontSmall"
"fgcolor" "TanLight"
"xpos" "4"
"ypos" "0"
@@ -36,7 +36,7 @@
{
"ControlName" "CExLabel"
"fieldName" "CurrencyGood"
- "font" "Cerbetica14"
+ "font" "HudFontSmall"
"fgcolor" "CreditsGreen"
"xpos" "45"
"ypos" "0"
@@ -53,7 +53,7 @@
{
"ControlName" "CExLabel"
"fieldName" "CurrencyBad"
- "font" "Cerbetica14"
+ "font" "HudFontSmall"
"fgcolor" "225 30 30 255"
"xpos" "45"
"ypos" "0"
diff --git a/resource/ui/mvmscoreboard.res b/resource/ui/mvmscoreboard.res
index 00b6f7e..0ae5505 100644
--- a/resource/ui/mvmscoreboard.res
+++ b/resource/ui/mvmscoreboard.res
@@ -18,7 +18,7 @@
{
"ControlName" "CExLabel"
"fieldName" "PopFileLabel"
- "font" "Cerbetica24"
+ "font" "HudFontMedium"
"labelText" "%popfile%"
"textAlignment" "west"
"xpos" "c-265"
@@ -47,10 +47,10 @@
"draw_corner_height" "0"
}
- "ScoreboardBackground"
+ "PlayerListBG"
{
- "ControlName" "ImagePanel"
- "fieldName" "ScoreboardBackground"
+ "ControlName" "EditablePanel"
+ "fieldName" "PlayerListBG"
"xpos" "c-270"
"ypos" "244"
"zpos" "-1"
@@ -59,7 +59,8 @@
"pinCorner" "0"
"visible" "1"
"enabled" "1"
- "fillcolor" "0 0 0 200"
+ "bgcolor_override" "TransparentBlack"
+ "PaintBackgroundType" "0"
}
"MvMPlayerList"
@@ -77,7 +78,7 @@
"autoresize" "3"
"linespacing" "22"
"textcolor" "White"
- "font" "Cerbetica24"
+ "font" "HudFontMedium"
}
"CreditStatsContainer"
@@ -109,12 +110,27 @@
"draw_corner_width" "0"
"draw_corner_height" "0"
}
+ "CreditStatsBG"
+ {
+ "ControlName" "EditablePanel"
+ "fieldName" "CreditStatsBG"
+ "xpos" "0"
+ "ypos" "25"
+ "zpos" "-1"
+ "wide" "335"
+ "tall" "115"
+ "visible" "1"
+ "enabled" "1"
+ "bgcolor_override" "TransparentBlack"
+ "PaintBackgroundType" "2"
+
+ }
"CreditsLabel"
{
"ControlName" "CExLabel"
"fieldName" "CreditsLabel"
- "font" "Cerbetica16"
+ "font" "HudFontSmallishBold"
"labelText" "#TF_PVE_Currency"
"textAlignment" "center"
"xpos" "9999"
diff --git a/resource/ui/objectivestatusescort.res b/resource/ui/objectivestatusescort.res
index 4838e16..63c45a5 100644
--- a/resource/ui/objectivestatusescort.res
+++ b/resource/ui/objectivestatusescort.res
@@ -229,7 +229,7 @@
{
"ControlName" "CExLabel"
"fieldName" "RecedeTime"
- "font" "Cerbetica8"
+ "font" "Default"
"xpos" "27"
"ypos" "78"
"zpos" "2"
@@ -413,8 +413,6 @@
"if_multiple_trains"
{
"xpos" "9999"
- "wide" "5"
- "tall" "10"
}
"if_multiple_trains_top"
@@ -432,9 +430,9 @@
{
"ControlName" "CExLabel"
"fieldName" "CapNumPlayers"
- "font" "Cerbetica8"
- "xpos" "31"
- "ypos" "78"
+ "font" "CapPlayerFontSmall"
+ "xpos" "32"
+ "ypos" "79"
"zpos" "5"
"wide" "15"
"tall" "8"
@@ -486,41 +484,31 @@
"if_multiple_trains"
{
- "xpos" "22"
- "wide" "8"
- "tall" "8"
+ "xpos" "22"
}
"if_multiple_trains_top"
{
- "ypos" "46"
+ "ypos" "46"
}
"if_multiple_trains_bottom"
{
- "ypos" "83"
+ "ypos" "83"
}
}
"EscortTeardrop"
{
- "ControlName" "EditablePanel"
- "fieldName" "EscortTeardrop"
- "xpos" "9999"
- "ypos" "9999"
- "zpos" "10"
- "wide" "50"
- "tall" "42"
- "visible" "0"
- "enabled" "0"
-
- "if_multiple_trains"
- {
- "xpos" "9999"
- "ypos" "9999"
- "wide" "65"
- "tall" "42"
- }
+ "ControlName" "EditablePanel"
+ "fieldName" "EscortTeardrop"
+ "xpos" "9999"
+ "ypos" "9999"
+ "zpos" "10"
+ "wide" "50"
+ "tall" "42"
+ "visible" "0"
+ "enabled" "0"
"Teardrop"
{
@@ -531,15 +519,11 @@
"zpos" "0"
"wide" "34"
"tall" "41"
- "visible" "1"
+ "visible" "0"
"enabled" "1"
"scaleImage" "1"
"icon" "cappoint_progressbar_teardrop"
"iconColor" "White"
-
- "if_multiple_trains"
- {
- }
}
"ProgressText"
diff --git a/resource/ui/publishfiledialog.res b/resource/ui/publishfiledialog.res
index 8b3f8b0..0b8d8ee 100644
--- a/resource/ui/publishfiledialog.res
+++ b/resource/ui/publishfiledialog.res
@@ -83,7 +83,7 @@
"dulltext" "0"
"brighttext" "0"
"wrap" "0"
- "font" "CerbeticaBold22"
+ "font" "HudFontMedium"
}
"LabelPreview"
@@ -104,7 +104,7 @@
"dulltext" "0"
"brighttext" "0"
"wrap" "0"
- "font" "CerbeticaBold15"
+ "font" "HudFontSmall"
}
"PreviewImageBorder"
@@ -197,7 +197,7 @@
"dulltext" "0"
"brighttext" "0"
"wrap" "0"
- "font" "CerbeticaBold15"
+ "font" "HudFontSmall"
}
"FileTitle"
@@ -221,7 +221,7 @@
"fgcolor_override" "0 0 0 255"
"bgcolor_override" "235 226 202 255"
"paintbackgroundtype" "2"
- "font" "CerbeticaBold15"
+ "font" "HudFontSmall"
}
"LabelDesc"
@@ -242,7 +242,7 @@
"dulltext" "0"
"brighttext" "0"
"wrap" "0"
- "font" "CerbeticaBold15"
+ "font" "HudFontSmall"
}
"FileDesc"
{
@@ -251,7 +251,7 @@
"xpos" "175"
"ypos" "120"
"wide" "250"
- "tall" "125"
+ "tall" "185"
"autoResize" "0"
"pinCorner" "0"
"visible" "1"
@@ -265,15 +265,15 @@
"fgcolor_override" "0 0 0 255"
"bgcolor_override" "235 226 202 255"
"paintbackgroundtype" "2"
- "font" "CerbeticaBold15"
+ "font" "HudFontSmall"
}
"LabelSourceFile"
{
"ControlName" "Label"
"fieldName" "LabelSourceFile"
- "xpos" "175"
- "ypos" "250"
+ "xpos" "185"
+ "ypos" "310"
"wide" "250"
"tall" "25"
"autoResize" "0"
@@ -286,7 +286,7 @@
"dulltext" "0"
"brighttext" "0"
"wrap" "0"
- "font" "CerbeticaBold15"
+ "font" "HudFontSmall"
}
"SourceFile"
@@ -308,16 +308,16 @@
"maxchars" "256"
"NumericInputOnly" "0"
"unicode" "0"
- "font" "CerbeticaBold15"
+ "font" "HudFontSmall"
}
"ButtonSourceCosmetics"
{
"ControlName" "CExImageButton"
"fieldName" "ButtonSourceCosmetics"
- "xpos" "85"
- "ypos" "275"
- "wide" "140"
+ "xpos" "15"
+ "ypos" "250"
+ "wide" "150"
"tall" "25"
"autoResize" "0"
"pinCorner" "0"
@@ -351,9 +351,9 @@
{
"ControlName" "Button"
"fieldName" "ButtonSourceOther"
- "xpos" "230"
- "ypos" "275"
- "wide" "140"
+ "xpos" "15"
+ "ypos" "280"
+ "wide" "150"
"tall" "25"
"autoResize" "0"
"pinCorner" "0"
@@ -374,9 +374,9 @@
{
"ControlName" "CExImageButton"
"fieldName" "ButtonSourceMaps"
- "xpos" "375"
- "ypos" "275"
- "wide" "140"
+ "xpos" "15"
+ "ypos" "310"
+ "wide" "150"
"tall" "25"
"autoResize" "0"
"pinCorner" "0"
@@ -410,8 +410,8 @@
{
"ControlName" "Label"
"fieldName" "BrowseDescription"
- "xpos" "175"
- "ypos" "300"
+ "xpos" "330"
+ "ypos" "0"
"wide" "270"
"tall" "55"
"autoResize" "0"
@@ -420,12 +420,12 @@
"enabled" "1"
"tabPosition" "0"
"labelText" "#TF_PublishFile_BrowseDesc"
- "textAlignment" "center"
+ "textAlignment" "east"
"dulltext" "0"
"brighttext" "0"
"wrap" "1"
"font" "HudFontSmallest"
- "fgcolor_override" "TanDark"
+ "fgcolor_override" "TanLight"
}
"TagsTitle"
diff --git a/resource/ui/pvprankpanel.res b/resource/ui/pvprankpanel.res
index 1d75a7d..b76491c 100644
--- a/resource/ui/pvprankpanel.res
+++ b/resource/ui/pvprankpanel.res
@@ -87,7 +87,7 @@
if_mini
{
- "origin_x" "55"
+ "origin_x" "70"
}
"animation"
@@ -185,8 +185,8 @@
"xpos" "0"
"ypos" "0"
"zpos" "-1"
- "wide" "170"
- "tall" "f40"
+ "wide" "260"
+ "tall" "102"
"visible" "0"
"PaintBackgroundType" "0"
"border" "NoBorder"
@@ -243,17 +243,8 @@
if_mini
{
- "xpos" "67"
- "ypos" "4"
- "wide" "f0"
- "textAlignment" "north-west"
- }
-
- "fonts"
- {
- "0" "HudFontSmallestBold"
- "1" "StorePromotionsTitle"
- "2" "FontStorePrice"
+ "xpos" "50"
+ "ypos" "r35"
}
}
@@ -299,8 +290,8 @@
"ControlName" "EditablePanel"
"fieldName" "StatsContainer"
"xpos" "0"
- "ypos" "rs1-5"
- "wide" "170"
+ "ypos" "10"
+ "wide" "260"
"tall" "f0"
"proportionaltoparent" "1"
@@ -316,7 +307,7 @@
"Controlname" "EditablePanel"
"fieldName" "XPBar"
"xpos" "0"
- "ypos" "rs1-9"
+ "ypos" "rs1-63"
"wide" "170"
"tall" "35"
"proportionaltoparent" "1"
@@ -333,10 +324,10 @@
"ControlName" "Label"
"fieldName" "CurrentXPLabel"
"xpos" "35"
- "ypos" "rs1+5"
+ "ypos" "rs1"
"zpos" "0"
"wide" "50"
- "tall" "20"
+ "tall" "10"
"visible" "1"
"enabled" "1"
"font" "ItemFontAttribSmall"
@@ -347,15 +338,11 @@
if_mini
{
- "xpos" "0"
- "ypos" "rs1"
+ "xpos" "40"
"zpos" "0"
"wide" "100"
"tall" "20"
- "font" "ItemFontAttribSmall"
- "fgcolor_override" "TanLight"
"textAlignment" "south-west"
- "visible" "1"
}
}
@@ -364,10 +351,10 @@
"ControlName" "Label"
"fieldName" "NextLevelXPLabel"
"xpos" "85"
- "ypos" "rs1+5"
+ "ypos" "rs1"
"zpos" "0"
"wide" "50"
- "tall" "20"
+ "tall" "10"
"visible" "1"
"enabled" "1"
"font" "ItemFontAttribSmall"
@@ -375,11 +362,6 @@
"textAlignment" "east"
"labelText" "%next_level_xp%"
"proportionaltoparent" "1"
-
- if_mini
- {
- "visible" "1"
- }
}
"ProgressBarsContainer"
@@ -427,7 +409,6 @@
"progress" "0"
"fgcolor_override" "CreditsGreen"
- "bgcolor_override" "0 0 0 0"
}
"Frame"
@@ -439,6 +420,8 @@
"wide" "f0"
"tall" "f0"
"zpos" "5"
+ "visible" "0"
+ "enabled" "0"
"proportionaltoparent" "1"
"border" "InnerShadowBorderThin"
}
@@ -450,12 +433,13 @@
"ControlName" "EditablePanel"
"fieldName" "Stats"
"xpos" "0"
- "ypos" "5"
+ "ypos" "63"
"wide" "f0"
"tall" "p0.45"
- "visible" "0"
+ "visible" "1"
+ "enabled" "1"
"proportionaltoparent" "1"
- "bgcolor_override" "0 0 0 150"
+ "bgcolor_override" "Transparent"
"if_mini"
{
@@ -535,7 +519,7 @@
{
"ControlName" "Label"
"fieldName" "DamageLabel"
- "xpos" "c-20"
+ "xpos" "c-40"
"ypos" "0"
"zpos" "0"
"wide" "100"
@@ -553,7 +537,7 @@
{
"ControlName" "Label"
"fieldName" "HealingLabel"
- "xpos" "c-20"
+ "xpos" "c-40"
"ypos" "10"
"zpos" "0"
"wide" "100"
@@ -571,7 +555,7 @@
{
"ControlName" "Label"
"fieldName" "SupportLabel"
- "xpos" "c-20"
+ "xpos" "c-40"
"ypos" "20"
"zpos" "0"
"wide" "100"
@@ -590,9 +574,8 @@
{
"ControlName" "Label"
"fieldName" "ScoreLabel"
- "xpos" "rs1"
- "ypos" "0"
- "zpos" "0"
+ "xpos" "rs1+20"
+ "ypos" "20"
"wide" "100"
"tall" "20"
"visible" "1"
diff --git a/resource/ui/replaybrowser/basepage.res b/resource/ui/replaybrowser/basepage.res
index 995961d..4f7b93d 100644
--- a/resource/ui/replaybrowser/basepage.res
+++ b/resource/ui/replaybrowser/basepage.res
@@ -38,7 +38,7 @@
"tabPosition" "0"
"fgcolor_override" "White"
"bgcolor_override" "DarkerGrey"
- "Font" "CerbeticaBold14"
+ "Font" "Cerbetica14"
}
"ReplayList"
diff --git a/resource/ui/replaybrowser/mainpanel.res b/resource/ui/replaybrowser/mainpanel.res
index 6219a23..855ad68 100644
--- a/resource/ui/replaybrowser/mainpanel.res
+++ b/resource/ui/replaybrowser/mainpanel.res
@@ -134,7 +134,7 @@
{
"textinsetx" "25"
"textAlignment" "center"
- "font" "Cerbetica18"
+ "font" "HudFontSmall"
"selectedcolor" "TanLight"
"unselectedcolor" "TanDark"
"defaultBgColor_override" "25 25 25 255"
@@ -150,18 +150,18 @@
{
"ControlName" "CExButton"
"fieldName" "BackButton"
- "xpos" "c-295"
+ "xpos" "c-288"
"ypos" "437"
"zpos" "2"
"wide" "100"
- "tall" "25"
+ "tall" "20"
"autoResize" "0"
"pinCorner" "3"
"visible" "1"
"enabled" "1"
"tabPosition" "0"
"labelText" "Back (&Q)"
- "font" "HudFontSmallBold"
+ "font" "HudFontSmall"
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
diff --git a/resource/ui/replaybrowser/thumbnailcollection.res b/resource/ui/replaybrowser/thumbnailcollection.res
index 410419a..5d33167 100644
--- a/resource/ui/replaybrowser/thumbnailcollection.res
+++ b/resource/ui/replaybrowser/thumbnailcollection.res
@@ -24,7 +24,7 @@
"zpos" "5"
"visible" "0"
"enabled" "1"
- "font" "CerbeticaBold14"
+ "font" "Cerbetica14"
"textAlignment" "center"
"text" "#Replay_RenderAll"
"Command" "render_queued_replays"
@@ -36,7 +36,7 @@
{
"ControlName" "CExLabel"
"fieldName" "CaratLabel"
- "font" "CerbeticaBold14"
+ "font" "Cerbetica14"
"textAlignment" "west"
"labelText" ""
"auto_wide_tocontents" "1"
@@ -54,7 +54,7 @@
{
"ControlName" "CExLabel"
"fieldName" "TitleLabel"
- "font" "CerbeticaBold14"
+ "font" "Cerbetica14"
"labelText" "%titleandcount%"
"textAlignment" "west"
"zpos" "2"
@@ -70,7 +70,7 @@
{
"ControlName" "CExLabel"
"fieldName" "DateLabel"
- "font" "CerbeticaBold14"
+ "font" "Cerbetica14"
"textAlignment" "west"
"zpos" "2"
"autoResize" "0"
@@ -85,7 +85,7 @@
{
"ControlName" "CExLabel"
"fieldName" "WarningLabel"
- "font" "CerbeticaBold14"
+ "font" "Cerbetica14"
"textAlignment" "west"
"zpos" "1"
"autoResize" "0"
@@ -112,7 +112,7 @@
{
"ControlName" "CExLabel"
"fieldName" "CaratLabel"
- "font" "CerbeticaBold14"
+ "font" "Cerbetica14"
"textAlignment" "west"
"labelText" ""
"auto_wide_tocontents" "1"
@@ -142,7 +142,7 @@
{
"ControlName" "CExLabel"
"fieldName" "NoReplayItemsLabel"
- "font" "CerbeticaBold14"
+ "font" "Cerbetica14"
"wide" "400"
"tall" "40"
"zpos" "5"
diff --git a/resource/ui/spectator.res b/resource/ui/spectator.res
index cd49e19..d18efc5 100644
--- a/resource/ui/spectator.res
+++ b/resource/ui/spectator.res
@@ -70,7 +70,7 @@
"enabled" "1"
"labelText" "#game_respawntime_in_secs"
"textAlignment" "center"
- "font" "Cerbetica24"
+ "font" "HudFontMedium"
}
"BuyBackLabel"
@@ -87,9 +87,7 @@
"enabled" "1"
"labelText" "#TF_PVE_Buyback"
"textAlignment" "center"
- "wrap" "1"
- "centerwrap" "1"
- "font" "Cerbetica24"
+ "font" "HudFontMedium"
if_mvm
{
@@ -209,7 +207,7 @@
{
"ControlName" "Label"
"fieldName" "ItemLabel"
- "font" "Cerbetica12"
+ "font" "HudFontSmallest"
"xpos" "10"
"ypos" "3"
"zpos" "1"
diff --git a/resource/ui/spectatorguihealth.res b/resource/ui/spectatorguihealth.res
index 2a09454..4a12c68 100644
--- a/resource/ui/spectatorguihealth.res
+++ b/resource/ui/spectatorguihealth.res
@@ -31,51 +31,51 @@
{
"ControlName" "ImagePanel"
"fieldName" "PlayerStatusHealthBonusImage"
- "xpos" "11"
- "ypos" "13"
+ "xpos" "13"
+ "ypos" "15"
"zpos" "3"
- "wide" "22"
- "tall" "23"
+ "wide" "18"
+ "tall" "19"
"visible" "0"
"enabled" "1"
"image" "../hud/health_over_bg"
"scaleImage" "1"
}
- "PlayerStatusHealthValue"
+ "GuiPlayerHealth"
{
"ControlName" "CExLabel"
- "fieldName" "PlayerStatusHealthValue"
+ "fieldName" "GuiPlayerHealth"
"xpos" "2"
- "ypos" "19"
+ "ypos" "16"
"zpos" "5"
"wide" "40"
- "tall" "10"
+ "tall" "15"
"visible" "1"
"enabled" "1"
"labelText" "%Health%"
"textAlignment" "center"
- "font" "CerbeticaBold16"
+ "font" "Cerbetica18"
"fgcolor" "Health Normal"
}
- "PlayerStatusHealthValueShadow"
+ "GuiPlayerHealthShadow"
{
"ControlName" "CExLabel"
- "fieldName" "PlayerStatusHealthValueShadow"
+ "fieldName" "GuiPlayerHealthShadow"
"xpos" "-1"
- "ypos" "-1"
+ "ypos" "-2"
"zpos" "5"
"wide" "40"
- "tall" "10"
+ "tall" "15"
"visible" "1"
"enabled" "1"
"labelText" "%Health%"
"textAlignment" "center"
- "font" "CerbeticaBold16"
+ "font" "Cerbetica18"
"fgcolor" "TransparentBlack"
- "pin_to_sibling" "PlayerStatusHealthValue"
+ "pin_to_sibling" "GuiPlayerHealth"
"pin_corner_to_sibling" "PIN_TOPLEFT"
"pin_to_sibling_corner" "PIN_TOPLEFT"
}
diff --git a/resource/ui/spectatortournament.res b/resource/ui/spectatortournament.res
index 51be4c4..43284eb 100644
--- a/resource/ui/spectatortournament.res
+++ b/resource/ui/spectatortournament.res
@@ -2,13 +2,13 @@
{
"specgui"
{
- "ControlName" "Frame"
- "fieldName" "specgui"
- "wide" "f0"
- "tall" "480"
- "autoResize" "0"
- "pinCorner" "0"
- "enabled" "1"
+ "ControlName" "Frame"
+ "fieldName" "specgui"
+ "wide" "f0"
+ "tall" "480"
+ "autoResize" "0"
+ "pinCorner" "0"
+ "enabled" "1"
"team1_player_base_offset_x" "0"
"team1_player_base_y" "255"
@@ -32,182 +32,216 @@
"classimage"
{
- "ControlName" "CTFClassImage"
- "fieldName" "classimage"
- "xpos" "27"
- "ypos" "0"
- "zpos" "2"
- "wide" "18"
- "tall" "18"
- "visible" "1"
- "enabled" "1"
- "team1_image" "../hud/class_scoutred"
- "scaleImage" "1"
+ "ControlName" "CTFClassImage"
+ "fieldName" "classimage"
+ "xpos" "27"
+ "ypos" "0"
+ "zpos" "2"
+ "wide" "18"
+ "tall" "18"
+ "visible" "1"
+ "enabled" "1"
+ "image" "../hud/class_scoutred"
+ "scaleImage" "1"
}
"classimagebg"
{
- "ControlName" "Panel"
- "fieldName" "classimagebg"
- "xpos" "9999"
- "ypos" "9999"
- "zpos" "2"
- "wide" "9999"
- "tall" "9999"
- "visible" "0"
- "enabled" "1"
- "bgcolor_override" "Black"
+ "ControlName" "Panel"
+ "fieldName" "classimagebg"
+ "xpos" "9999"
+ "ypos" "9999"
+ "zpos" "2"
+ "wide" "9999"
+ "tall" "9999"
+ "visible" "0"
+ "enabled" "1"
+ "bgcolor_override" "Black"
"PaintBackgroundType" "0"
}
- "PanelBackground"
- {
- "ControlName" "ImagePanel"
- "fieldName" "PanelBackground"
- "xpos" "0"
- "ypos" "0"
- "zpos" "-1"
- "wide" "160"
- "tall" "0"
- "autoResize" "0"
- "pinCorner" "0"
- "visible" "1"
- "enabled" "1"
- "fillcolor" "15 15 15 50"
- }
-
"PanelLeftFringe"
{
- "ControlName" "ImagePanel"
- "fieldName" "PanelLeftFringe"
- "xpos" "0"
- "ypos" "0"
- "zpos" "-1"
- "wide" "52"
- "tall" "18"
- "autoResize" "0"
- "pinCorner" "0"
- "visible" "1"
- "enabled" "1"
- "fillcolor" "15 15 15 64"
+ "ControlName" "ImagePanel"
+ "fieldName" "PanelLeftFringe"
+ "xpos" "0"
+ "ypos" "0"
+ "zpos" "-1"
+ "wide" "52"
+ "tall" "18"
+ "autoResize" "0"
+ "pinCorner" "0"
+ "visible" "1"
+ "enabled" "1"
+ "fillcolor" "15 15 15 64"
}
"PanelLeftHalf"
{
- "ControlName" "ImagePanel"
- "fieldName" "PanelLeftHalf"
- "xpos" "0"
- "ypos" "0"
- "zpos" "-1"
- "wide" "49"
- "tall" "18"
- "autoResize" "0"
- "pinCorner" "0"
- "visible" "1"
- "enabled" "1"
- "fillcolor" "15 15 15 128"
+ "ControlName" "ImagePanel"
+ "fieldName" "PanelLeftHalf"
+ "xpos" "0"
+ "ypos" "0"
+ "zpos" "-1"
+ "wide" "49"
+ "tall" "18"
+ "autoResize" "0"
+ "pinCorner" "0"
+ "visible" "1"
+ "enabled" "1"
+ "fillcolor" "15 15 15 128"
}
"PanelLeftFull"
{
- "ControlName" "ImagePanel"
- "fieldName" "PanelLeftFull"
- "xpos" "0"
- "ypos" "0"
- "zpos" "-1"
- "wide" "26"
- "tall" "18"
- "autoResize" "0"
- "pinCorner" "0"
- "visible" "1"
- "enabled" "1"
- "fillcolor" "15 15 15 110"
+ "ControlName" "ImagePanel"
+ "fieldName" "PanelLeftFull"
+ "xpos" "0"
+ "ypos" "0"
+ "zpos" "-1"
+ "wide" "26"
+ "tall" "18"
+ "autoResize" "0"
+ "pinCorner" "0"
+ "visible" "1"
+ "enabled" "1"
+ "fillcolor" "15 15 15 110"
}
"PanelFull"
{
- "ControlName" "ImagePanel"
- "fieldName" "PanelFull"
- "xpos" "0"
- "ypos" "0"
- "zpos" "-1"
- "wide" "160"
- "tall" "18"
- "autoResize" "0"
- "pinCorner" "0"
- "visible" "1"
- "enabled" "1"
- "fillcolor" "15 15 15 100"
+ "ControlName" "ImagePanel"
+ "fieldName" "PanelFull"
+ "xpos" "0"
+ "ypos" "0"
+ "zpos" "-1"
+ "wide" "160"
+ "tall" "18"
+ "autoResize" "0"
+ "pinCorner" "0"
+ "visible" "1"
+ "enabled" "1"
+ "fillcolor" "15 15 15 100"
}
"PanelBottom"
{
- "ControlName" "ImagePanel"
- "fieldName" "PanelBottom"
- "xpos" "0"
- "ypos" "15"
- "zpos" "-1"
- "wide" "160"
- "tall" "4"
- "autoResize" "0"
- "pinCorner" "0"
- "visible" "0"
- "enabled" "0"
- "fillcolor" "15 15 15 255"
+ "ControlName" "ImagePanel"
+ "fieldName" "PanelBottom"
+ "xpos" "0"
+ "ypos" "15"
+ "zpos" "-1"
+ "wide" "160"
+ "tall" "4"
+ "autoResize" "0"
+ "pinCorner" "0"
+ "visible" "0"
+ "enabled" "0"
+ "fillcolor" "15 15 15 255"
}
"PanelRight"
{
- "ControlName" "ImagePanel"
- "fieldName" "PanelRight"
- "xpos" "157"
- "ypos" "0"
- "zpos" "-1"
- "wide" "4"
- "tall" "16"
- "autoResize" "0"
- "pinCorner" "0"
- "visible" "0"
- "enabled" "0"
- "fillcolor" "15 15 15 255"
+ "ControlName" "ImagePanel"
+ "fieldName" "PanelRight"
+ "xpos" "157"
+ "ypos" "0"
+ "zpos" "-1"
+ "wide" "4"
+ "tall" "16"
+ "autoResize" "0"
+ "pinCorner" "0"
+ "visible" "0"
+ "enabled" "0"
+ "fillcolor" "15 15 15 255"
}
"playername"
{
- "ControlName" "CExLabel"
- "fieldName" "playername"
- "font" "Cerbetica14"
- "xpos" "54"
- "ypos" "0"
- "zpos" "5"
- "wide" "80"
- "tall" "16"
- "autoResize" "0"
- "pinCorner" "0"
- "visible" "1"
- "labelText" "%playername%"
- "textAlignment" "west"
- "fgcolor" "TanLight"
+ "ControlName" "CExLabel"
+ "fieldName" "playername"
+ "font" "HudFontSmall"
+ "xpos" "54"
+ "ypos" "0"
+ "zpos" "5"
+ "wide" "80"
+ "tall" "16"
+ "autoResize" "0"
+ "pinCorner" "0"
+ "visible" "1"
+ "labelText" "%playername%"
+ "textAlignment" "west"
+ "fgcolor" "TanLight"
}
"HealthIcon"
{
- "ControlName" "EditablePanel"
- "fieldName" "HealthIcon"
- "xpos" "0"
- "ypos" "0"
- "zpos" "3"
- "wide" "26"
- "tall" "17"
- "visible" "1"
- "enabled" "1"
- "HealthBonusPosAdj" "10"
- "HealthDeathWarning" "0.49"
+ "ControlName" "EditablePanel"
+ "fieldName" "HealthIcon"
+ "xpos" "0"
+ "ypos" "0"
+ "zpos" "3"
+ "wide" "26"
+ "tall" "17"
+ "HealthBonusPosAdj" "10"
+ "HealthDeathWarning" "0.49"
+ "HealthDeathWarningColor" "HUDDeathWarning"
"TFFont" "HudFontSmallest"
- "HealthDeathWarningColor" "HUDDeathWarning"
"TextColor" "HudOffWhite"
}
+ "PanelBG"
+ {
+ "ControlName" "ImagePanel"
+ "fieldName" "PanelBG"
+ "xpos" "0"
+ "ypos" "0"
+ "zpos" "-1"
+ "wide" "160"
+ "tall" "0"
+ "autoResize" "0"
+ "pinCorner" "0"
+ "visible" "1"
+ "enabled" "1"
+ "fillcolor" "15 15 15 50"
+ }
+
+ "respawntime"
+ {
+ "ControlName" "CExLabel"
+ "fieldName" "respawntime"
+ "font" "HudFontSmallest"
+ "xpos" "5"
+ "ypos" "3"
+ "zpos" "5"
+ "wide" "23"
+ "tall" "10"
+ "autoResize" "0"
+ "pinCorner" "0"
+ "visible" "1"
+ "labelText" "%respawntime%"
+ "textAlignment" "west"
+ "fgcolor" "255 20 175 255"
+ }
+
+ "respawntimeBG"
+ {
+ "ControlName" "CExLabel"
+ "fieldName" "respawntimeBG"
+ "font" "HudFontSmallest"
+ "xpos" "6"
+ "ypos" "4"
+ "zpos" "5"
+ "wide" "23"
+ "tall" "10"
+ "autoResize" "0"
+ "pinCorner" "0"
+ "visible" "1"
+ "labelText" "%respawntime%"
+ "textAlignment" "west"
+ "fgcolor" "TransparentBlack"
+ }
+
"ReadyBG"
{
"ControlName" "ScalableImagePanel"
@@ -228,76 +262,40 @@
"visible" "0"
}
- "respawntime"
- {
- "ControlName" "CExLabel"
- "fieldName" "respawntime"
- "font" "Cerbetica12"
- "xpos" "5"
- "ypos" "3"
- "zpos" "5"
- "wide" "23"
- "tall" "10"
- "autoResize" "0"
- "pinCorner" "0"
- "visible" "1"
- "labelText" "%respawntime%"
- "textAlignment" "west"
- "fgcolor" "255 20 175 255"
- }
-
- "respawntimeBG"
- {
- "ControlName" "CExLabel"
- "fieldName" "respawntimeBG"
- "font" "Cerbetica12"
- "xpos" "6"
- "ypos" "4"
- "zpos" "5"
- "wide" "23"
- "tall" "10"
- "autoResize" "0"
- "pinCorner" "0"
- "visible" "1"
- "labelText" "%respawntime%"
- "textAlignment" "west"
- "fgcolor" "TransparentBlack"
- }
-
"chargeamount"
{
- "ControlName" "CExLabel"
- "fieldName" "chargeamount"
- "font" "Cerbetica12"
- "xpos" "126"
- "ypos" "2"
- "zpos" "6"
- "wide" "25"
- "tall" "13"
- "autoResize" "0"
- "pinCorner" "0"
- "visible" "1"
- "labelText" "%chargeamount%"
- "textAlignment" "east"
- "fgcolor" "0 255 255 255"
+ "ControlName" "CExLabel"
+ "fieldName" "chargeamount"
+ "font" "HudFontSmallest"
+ "xpos" "126"
+ "ypos" "2"
+ "zpos" "6"
+ "wide" "25"
+ "tall" "13"
+ "autoResize" "0"
+ "pinCorner" "0"
+ "visible" "1"
+ "labelText" "%chargeamount%"
+ "textAlignment" "east"
+ "fgcolor" "0 255 255 255"
}
"chargeamountBG"
{
- "ControlName" "CExLabel"
- "fieldName" "chargeamountBG"
- "font" "Cerbetica12"
- "xpos" "127"
- "ypos" "3"
- "zpos" "6"
- "wide" "25"
- "tall" "13"
- "autoResize" "0"
- "pinCorner" "0"
- "visible" "1"
- "labelText" "%chargeamount%"
- "textAlignment" "east"
- "fgcolor" "TransparentBlack"
+ "ControlName" "CExLabel"
+ "fieldName" "chargeamountBG"
+ "font" "HudFontSmallest"
+ "xpos" "127"
+ "ypos" "3"
+ "zpos" "6"
+ "wide" "25"
+ "tall" "13"
+ "autoResize" "0"
+ "pinCorner" "0"
+ "visible" "1"
+ "labelText" "%chargeamount%"
+ "textAlignment" "east"
+ "fgcolor" "TransparentBlack"
}
}
}
@@ -309,14 +307,6 @@
"visible" "0"
"tall" "0"
}
- "BottomBar"
- {
- "ControlName" "Frame"
- "fieldName" "BottomBar"
- "visible" "0"
- "ypos" "100"
- "tall" "0"
- }
"bottombarblank"
{
"ControlName" "Panel"
@@ -338,11 +328,7 @@
"enabled" "1"
"labelText" "#game_respawntime_in_secs"
"textAlignment" "center"
- "font" "Cerbetica24"
-
- if_mvm{
- "ypos" "82"
- }
+ "font" "HudFontMedium"
}
"BuyBackLabel"
{
@@ -358,7 +344,7 @@
"enabled" "1"
"labelText" "#TF_PVE_Buyback"
"textAlignment" "center"
- "font" "Cerbetica20"
+ "font" "HudFontMediumSecondary"
"wrap" "1"
"centerwrap" "1"
@@ -380,114 +366,52 @@
"fieldName" "ClassOrTeamLabel"
"visible" "0"
}
- "SwitchCamModeKeyLabel"
- {
- "ControlName" "CExLabel"
- "fieldName" "SwitchCamModeKeyLabel"
- "visible" "0"
-
- }
- "SwitchCamModeLabel"
- {
- "ControlName" "CExLabel"
- "fieldName" "SwitchCamModeLabel"
- "visible" "0"
- }
"CycleTargetFwdKeyLabel"
{
"ControlName" "CExLabel"
"fieldName" "CycleTargetFwdKeyLabel"
"visible" "0"
}
- "CycleTargetFwdLabel"
- {
- "ControlName" "CExLabel"
- "fieldName" "CycleTargetFwdLabel"
- "visible" "0"
- }
"CycleTargetRevKeyLabel"
{
"ControlName" "CExLabel"
"fieldName" "CycleTargetRevKeyLabel"
"visible" "0"
}
- "CycleTargetRevLabel"
- {
- "ControlName" "CExLabel"
- "fieldName" "CycleTargetRevLabel"
- "visible" "0"
- }
- "TipLabel"
- {
- "ControlName" "CExLabel"
- "fieldName" "TipLabel"
- "visible" "0"
- }
+
"itempanel"
{
- "ControlName" "CItemModelPanel"
- "fieldName" "itempanel"
- "xpos" "r249"
- "ypos" "c50"
- "zpos" "10"
- "wide" "240"
- "tall" "100"
- "visible" "0"
+ "ControlName" "CItemModelPanel"
+ "fieldName" "itempanel"
+ "xpos" "r249"
+ "ypos" "c50"
+ "zpos" "10"
+ "wide" "240"
+ "tall" "100"
+ "visible" "0"
"bgcolor_override" "255 255 255 0"
"PaintBackgroundType" "0"
- "model_ypos" "20"
- "model_center_x" "1"
- "model_wide" "90"
- "model_tall" "60"
+ "model_ypos" "20"
+ "model_center_x" "1"
+ "model_wide" "90"
+ "model_tall" "60"
- "text_xpos" "10"
- "text_ypos" "10"
- "text_wide" "220"
- "text_center" "1"
+ "text_xpos" "10"
+ "text_ypos" "10"
+ "text_wide" "220"
+ "text_center" "1"
- "max_text_height" "100"
- "padding_height" "10"
- "resize_to_text" "1"
- "text_forcesize" "2"
-
- "ItemBackground"
- {
- "ControlName" "ImagePanel"
- "fieldName" "ItemBackground"
- "xpos" "0"
- "ypos" "0"
- "zpos" "-1"
- "wide" "240"
- "tall" "900"
- "autoResize" "0"
- "pinCorner" "0"
- "visible" "1"
- "enabled" "1"
- "fillcolor" "0 0 0 100"
- }
-
- "TitleBackground"
- {
- "ControlName" "ImagePanel"
- "fieldName" "TitleBackground"
- "xpos" "4"
- "ypos" "4"
- "zpos" "-1"
- "wide" "232"
- "tall" "14"
- "autoResize" "0"
- "pinCorner" "0"
- "visible" "1"
- "enabled" "1"
- "fillcolor" "0 0 0 100"
- }
+ "max_text_height" "100"
+ "padding_height" "10"
+ "resize_to_text" "1"
+ "text_forcesize" "2"
"itemmodelpanel"
{
- "fieldName" "itemmodelpanel"
- "useparentbg" "1"
+ "fieldName" "itemmodelpanel"
"use_item_rendertarget" "0"
+ "useparentbg" "1"
"inventory_image_type" "1"
}
@@ -495,7 +419,7 @@
{
"ControlName" "Label"
"fieldName" "ItemLabel"
- "font" "Cerbetica12"
+ "font" "HudFontSmallest"
"xpos" "10"
"ypos" "3"
"zpos" "1"
@@ -511,18 +435,4 @@
"brighttext" "0"
}
}
-
- "spectator_extras"
- {
- "ControlName" "EditablePanel"
- "fieldName" "spectator_extras"
- "xpos" "0"
- "ypos" "0"
- "wide" "f0"
- "tall" "480"
- "autoResize" "0"
- "pinCorner" "0"
- "visible" "1"
- "enabled" "1"
- }
} \ No newline at end of file
diff --git a/resource/ui/spectatortournamentguihealth.res b/resource/ui/spectatortournamentguihealth.res
index 9fa2ee1..0a58663 100644
--- a/resource/ui/spectatortournamentguihealth.res
+++ b/resource/ui/spectatortournamentguihealth.res
@@ -38,10 +38,10 @@
"image" ""
}
- "PlayerStatusHealthValueSpectator"
+ "GuiPlayerHealth"
{
"ControlName" "CExLabel"
- "fieldName" "PlayerStatusHealthValueSpectator"
+ "fieldName" "GuiPlayerHealth"
"xpos" "0"
"ypos" "0"
"zpos" "5"
@@ -51,16 +51,16 @@
"enabled" "1"
"labelText" "%Health%"
"textAlignment" "center"
- "font" "CerbeticaBold16"
+ "font" "Cerbetica16"
"fgcolor" "Spec Health Normal"
}
- "PlayerStatusHealthValueSpectatorBG"
+ "GuiPlayerHealthShadow"
{
"ControlName" "CExLabel"
- "fieldName" "PlayerStatusHealthValueSpectatorBG"
- "xpos" "2"
- "ypos" "2"
+ "fieldName" "GuiPlayerHealthShadow"
+ "xpos" "-1"
+ "ypos" "-2"
"zpos" "4"
"wide" "25"
"tall" "16"
@@ -68,7 +68,11 @@
"enabled" "1"
"labelText" "%Health%"
"textAlignment" "center"
- "font" "CerbeticaBold16"
- "fgcolor" "0 0 0 100"
+ "font" "Cerbetica16"
+ "fgcolor" "TransparentBlack"
+
+ "pin_to_sibling" "GuiPlayerHealth"
+ "pin_corner_to_sibling" "PIN_TOPLEFT"
+ "pin_to_sibling_corner" "PIN_TOPLEFT"
}
} \ No newline at end of file
diff --git a/resource/ui/stampdonationadd.res b/resource/ui/stampdonationadd.res
index c2b422f..445cad8 100644
--- a/resource/ui/stampdonationadd.res
+++ b/resource/ui/stampdonationadd.res
@@ -17,7 +17,7 @@
"PaintBackgroundType" "0"
"paintbackground" "1"
"paintborder" "1"
- "border" "CyanBorderThick"
+ "border" "CyanBorder"
"bgcolor_override" "DarkGrey"
}
@@ -116,7 +116,7 @@
"ControlName" "CExButton"
"fieldName" "Nope"
"xpos" "40"
- "ypos" "210"
+ "ypos" "214"
"zpos" "20"
"wide" "175"
"tall" "25"
diff --git a/resource/ui/statsummary.res b/resource/ui/statsummary.res
index b9f3bc8..f4b4f27 100644
--- a/resource/ui/statsummary.res
+++ b/resource/ui/statsummary.res
@@ -142,7 +142,7 @@
{
"ControlName" "CExLabel"
"fieldName" "OnYourWayLabel"
- "font" "CerbeticaBold24"
+ "font" "Cerbetica24"
"labelText" "#LoadingMap"
"textAlignment" "west"
"xpos" "5"
@@ -160,7 +160,7 @@
{
"ControlName" "CExLabel"
"fieldName" "LoadingLabel"
- "font" "Cerbetica32"
+ "font" "HudFontBiggerBold"
"labelText" "Loading..."
"textAlignment" "west"
"xpos" "5"
@@ -178,7 +178,7 @@
{
"ControlName" "CExLabel"
"fieldName" "MapLabel"
- "font" "Cerbetica72"
+ "font" "HudFontGiantBold"
"labelText" "%maplabel%"
"textAlignment" "west"
"xpos" "5"
@@ -196,7 +196,7 @@
{
"ControlName" "CExLabel"
"fieldName" "MapType"
- "font" "Cerbetica24"
+ "font" "HudFontMedium"
"labelText" "%maptype%"
"textAlignment" "west"
"xpos" "6"
@@ -216,12 +216,12 @@
"ControlName" "EditablePanel"
"fieldName" "StatData"
"xpos" "0"
- "ypos" "0"
+ "ypos" "-130"
"zpos" "1"
"wide" "0"
- "tall" "0"
- "visible" "0"
- "enabled" "0"
+ "tall" "480"
+ "visible" "1"
+ "enabled" "1"
"NonInteractiveHeaders"
{
@@ -239,7 +239,7 @@
{
"ControlName" "Label"
"fieldName" "BarChartLabelA"
- "font" "CerbeticaBold12"
+ "font" "Cerbetica12"
"labelText" "#StatSummary_StatTitle_MostPoints"
"textAlignment" "east"
"xpos" "c-282"
@@ -256,7 +256,7 @@
{
"ControlName" "Label"
"fieldName" "BarChartLabelB"
- "font" "CerbeticaBold12"
+ "font" "Cerbetica12"
"labelText" "#StatSummary_StatTitle_TotalPlaytime"
"textAlignment" "west"
"xpos" "c-127"
@@ -273,7 +273,7 @@
{
"ControlName" "Label"
"fieldName" "OverallRecordLabel"
- "font" "CerbeticaBold12"
+ "font" "Cerbetica12"
"labelText" "#StatSummary_Label_AsAnyClass"
"textAlignment" "west"
"xpos" "c+130"
@@ -300,7 +300,7 @@
"pinCorner" "0"
"visible" "1"
"enabled" "1"
- "bgcolor_override" "HudBlack"
+ "bgcolor_override" "15 15 15 255"
}
"AveragesLabel"
{
@@ -310,7 +310,7 @@
"labelText" "#StatSummary_Label_PerformanceReport"
"textAlignment" "west"
"xpos" "c-285"
- "ypos" "170"
+ "ypos" "185"
"wide" "300"
"tall" "20"
"autoResize" "0"
@@ -390,7 +390,7 @@
{
"ControlName" "Label"
"fieldName" "ClassBarLabel1A"
- "font" "CerbeticaBold12"
+ "font" "Cerbetica12"
"labelText" "%classbarlabel1A%"
"textAlignment" "west"
"xpos" "c-282"
@@ -407,7 +407,7 @@
{
"ControlName" "Label"
"fieldName" "ClassBarLabel1B"
- "font" "CerbeticaBold12"
+ "font" "Cerbetica12"
"labelText" "%classbarlabel1B%"
"textAlignment" "west"
"xpos" "c-127"
@@ -424,7 +424,7 @@
{
"ControlName" "Label"
"fieldName" "ClassLabel1"
- "font" "ScoreboardSmall"
+ "font" "Cerbetica12"
"labelText" "%class1%"
"textAlignment" "west"
"xpos" "c+34"
@@ -509,7 +509,7 @@
{
"ControlName" "Label"
"fieldName" "ClassBarLabel2A"
- "font" "CerbeticaBold12"
+ "font" "Cerbetica12"
"labelText" "%classbarlabel2A%"
"textAlignment" "west"
"xpos" "c-282"
@@ -526,7 +526,7 @@
{
"ControlName" "Label"
"fieldName" "ClassBarLabel2B"
- "font" "CerbeticaBold12"
+ "font" "Cerbetica12"
"labelText" "%classbarlabel2B%"
"textAlignment" "west"
"xpos" "c-127"
@@ -543,7 +543,7 @@
{
"ControlName" "Label"
"fieldName" "ClassLabel2"
- "font" "ScoreboardSmall"
+ "font" "Cerbetica12"
"labelText" "%class2%"
"textAlignment" "west"
"xpos" "c+34"
@@ -628,7 +628,7 @@
{
"ControlName" "Label"
"fieldName" "ClassBarLabel3A"
- "font" "CerbeticaBold12"
+ "font" "Cerbetica12"
"labelText" "%classbarlabel3A%"
"textAlignment" "west"
"xpos" "c-282"
@@ -645,7 +645,7 @@
{
"ControlName" "Label"
"fieldName" "ClassBarLabel3B"
- "font" "CerbeticaBold12"
+ "font" "Cerbetica12"
"labelText" "%classbarlabel3B%"
"textAlignment" "west"
"xpos" "c-127"
@@ -662,7 +662,7 @@
{
"ControlName" "Label"
"fieldName" "ClassLabel3"
- "font" "ScoreboardSmall"
+ "font" "Cerbetica12"
"labelText" "%class3%"
"textAlignment" "west"
"xpos" "c+34"
@@ -747,7 +747,7 @@
{
"ControlName" "Label"
"fieldName" "ClassBarLabel4A"
- "font" "CerbeticaBold12"
+ "font" "Cerbetica12"
"labelText" "%classbarlabel4A%"
"textAlignment" "west"
"xpos" "c-282"
@@ -764,7 +764,7 @@
{
"ControlName" "Label"
"fieldName" "ClassBarLabel4B"
- "font" "CerbeticaBold12"
+ "font" "Cerbetica12"
"labelText" "%classbarlabel4B%"
"textAlignment" "west"
"xpos" "c-127"
@@ -781,7 +781,7 @@
{
"ControlName" "Label"
"fieldName" "ClassLabel4"
- "font" "ScoreboardSmall"
+ "font" "Cerbetica12"
"labelText" "%class4%"
"textAlignment" "west"
"xpos" "c+34"
@@ -866,7 +866,7 @@
{
"ControlName" "Label"
"fieldName" "ClassBarLabel5A"
- "font" "CerbeticaBold12"
+ "font" "Cerbetica12"
"labelText" "%classbarlabel5A%"
"textAlignment" "west"
"xpos" "c-282"
@@ -883,7 +883,7 @@
{
"ControlName" "Label"
"fieldName" "ClassBarLabel5B"
- "font" "CerbeticaBold12"
+ "font" "Cerbetica12"
"labelText" "%classbarlabel5B%"
"textAlignment" "west"
"xpos" "c-127"
@@ -900,7 +900,7 @@
{
"ControlName" "Label"
"fieldName" "ClassLabel5"
- "font" "ScoreboardSmall"
+ "font" "Cerbetica12"
"labelText" "%class5%"
"textAlignment" "west"
"xpos" "c+34"
@@ -985,7 +985,7 @@
{
"ControlName" "Label"
"fieldName" "ClassBarLabel6A"
- "font" "CerbeticaBold12"
+ "font" "Cerbetica12"
"labelText" "%classbarlabel6A%"
"textAlignment" "west"
"xpos" "c-282"
@@ -1002,7 +1002,7 @@
{
"ControlName" "Label"
"fieldName" "ClassBarLabel6B"
- "font" "CerbeticaBold12"
+ "font" "Cerbetica12"
"labelText" "%classbarlabel6B%"
"textAlignment" "west"
"xpos" "c-127"
@@ -1019,7 +1019,7 @@
{
"ControlName" "Label"
"fieldName" "ClassLabel6"
- "font" "ScoreboardSmall"
+ "font" "Cerbetica12"
"labelText" "%class6%"
"textAlignment" "west"
"xpos" "c+34"
@@ -1104,7 +1104,7 @@
{
"ControlName" "Label"
"fieldName" "ClassBarLabel7A"
- "font" "CerbeticaBold12"
+ "font" "Cerbetica12"
"labelText" "%classbarlabel7A%"
"textAlignment" "west"
"xpos" "c-282"
@@ -1121,7 +1121,7 @@
{
"ControlName" "Label"
"fieldName" "ClassBarLabel7B"
- "font" "CerbeticaBold12"
+ "font" "Cerbetica12"
"labelText" "%classbarlabel7B%"
"textAlignment" "west"
"xpos" "c-127"
@@ -1138,7 +1138,7 @@
{
"ControlName" "Label"
"fieldName" "ClassLabel7"
- "font" "ScoreboardSmall"
+ "font" "Cerbetica12"
"labelText" "%class7%"
"textAlignment" "west"
"xpos" "c+34"
@@ -1223,7 +1223,7 @@
{
"ControlName" "Label"
"fieldName" "ClassBarLabel8A"
- "font" "CerbeticaBold12"
+ "font" "Cerbetica12"
"labelText" "%classbarlabel8A%"
"textAlignment" "west"
"xpos" "c-282"
@@ -1240,7 +1240,7 @@
{
"ControlName" "Label"
"fieldName" "ClassBarLabel8B"
- "font" "CerbeticaBold12"
+ "font" "Cerbetica12"
"labelText" "%classbarlabel8B%"
"textAlignment" "west"
"xpos" "c-127"
@@ -1257,7 +1257,7 @@
{
"ControlName" "Label"
"fieldName" "ClassLabel8"
- "font" "ScoreboardSmall"
+ "font" "Cerbetica12"
"labelText" "%class8%"
"textAlignment" "west"
"xpos" "c+34"
@@ -1342,7 +1342,7 @@
{
"ControlName" "Label"
"fieldName" "ClassBarLabel9A"
- "font" "CerbeticaBold12"
+ "font" "Cerbetica12"
"labelText" "%classbarlabel9A%"
"textAlignment" "west"
"xpos" "c-282"
@@ -1359,7 +1359,7 @@
{
"ControlName" "Label"
"fieldName" "ClassBarLabel9B"
- "font" "CerbeticaBold12"
+ "font" "Cerbetica12"
"labelText" "%classbarlabel9B%"
"textAlignment" "west"
"xpos" "c-127"
@@ -1376,7 +1376,7 @@
{
"ControlName" "Label"
"fieldName" "ClassLabel9"
- "font" "ScoreboardSmall"
+ "font" "Cerbetica12"
"labelText" "%class9%"
"textAlignment" "west"
"xpos" "c+34"
@@ -1401,7 +1401,7 @@
"pinCorner" "0"
"visible" "1"
"enabled" "1"
- "bgcolor_override" "15 15 15 150"
+ "bgcolor_override" "15 15 15 255"
}
"RecordsLabel1"
{
@@ -1457,11 +1457,11 @@
{
"ControlName" "Label"
"fieldName" "OverallRecord1Label"
- "font" "CerbeticaBold12"
+ "font" "HudFontSmallest"
"labelText" "%classrecord1label%"
"textAlignment" "west"
"xpos" "c+128"
- "ypos" "229"
+ "ypos" "230"
"zpos" "5"
"wide" "200"
"tall" "20"
@@ -1474,11 +1474,11 @@
{
"ControlName" "Label"
"fieldName" "OverallRecord1Value"
- "font" "ScoreboardVerySmall"
+ "font" "HudFontSmallest"
"labelText" "%classrecord1value%"
"textAlignment" "west"
"xpos" "c+210"
- "ypos" "229"
+ "ypos" "230"
"zpos" "5"
"wide" "200"
"tall" "20"
@@ -1491,11 +1491,11 @@
{
"ControlName" "Label"
"fieldName" "OverallRecord2Label"
- "font" "ScoreboardVerySmall"
+ "font" "HudFontSmallest"
"labelText" "%classrecord2label%"
"textAlignment" "west"
"xpos" "c+128"
- "ypos" "239"
+ "ypos" "242"
"zpos" "5"
"wide" "200"
"tall" "20"
@@ -1508,11 +1508,11 @@
{
"ControlName" "Label"
"fieldName" "OverallRecord2Value"
- "font" "ScoreboardVerySmall"
+ "font" "HudFontSmallest"
"labelText" "%classrecord2value%"
"textAlignment" "west"
"xpos" "c+210"
- "ypos" "239"
+ "ypos" "242"
"zpos" "5"
"wide" "200"
"tall" "20"
@@ -1525,11 +1525,11 @@
{
"ControlName" "Label"
"fieldName" "OverallRecord3Label"
- "font" "ScoreboardVerySmall"
+ "font" "HudFontSmallest"
"labelText" "%classrecord3label%"
"textAlignment" "west"
"xpos" "c+128"
- "ypos" "249"
+ "ypos" "254"
"zpos" "5"
"wide" "200"
"tall" "20"
@@ -1542,11 +1542,11 @@
{
"ControlName" "Label"
"fieldName" "OverallRecord3Value"
- "font" "ScoreboardVerySmall"
+ "font" "HudFontSmallest"
"labelText" "%classrecord3value%"
"textAlignment" "west"
"xpos" "c+210"
- "ypos" "249"
+ "ypos" "254"
"zpos" "5"
"wide" "200"
"tall" "20"
@@ -1559,11 +1559,11 @@
{
"ControlName" "Label"
"fieldName" "OverallRecord4Label"
- "font" "ScoreboardVerySmall"
+ "font" "HudFontSmallest"
"labelText" "%classrecord4label%"
"textAlignment" "west"
"xpos" "c+128"
- "ypos" "259"
+ "ypos" "266"
"zpos" "5"
"wide" "200"
"tall" "20"
@@ -1576,11 +1576,11 @@
{
"ControlName" "Label"
"fieldName" "OverallRecord4Value"
- "font" "ScoreboardVerySmall"
+ "font" "HudFontSmallest"
"labelText" "%classrecord4value%"
"textAlignment" "west"
"xpos" "c+210"
- "ypos" "259"
+ "ypos" "266"
"zpos" "5"
"wide" "200"
"tall" "20"
@@ -1593,11 +1593,11 @@
{
"ControlName" "Label"
"fieldName" "OverallRecord5Label"
- "font" "ScoreboardVerySmall"
+ "font" "HudFontSmallest"
"labelText" "%classrecord5label%"
"textAlignment" "west"
"xpos" "c+128"
- "ypos" "269"
+ "ypos" "278"
"zpos" "5"
"wide" "200"
"tall" "20"
@@ -1610,11 +1610,11 @@
{
"ControlName" "Label"
"fieldName" "OverallRecord5Value"
- "font" "ScoreboardVerySmall"
+ "font" "HudFontSmallest"
"labelText" "%classrecord5value%"
"textAlignment" "west"
"xpos" "c+210"
- "ypos" "269"
+ "ypos" "278"
"zpos" "5"
"wide" "200"
"tall" "20"
@@ -1627,11 +1627,11 @@
{
"ControlName" "Label"
"fieldName" "OverallRecord6Label"
- "font" "ScoreboardVerySmall"
+ "font" "HudFontSmallest"
"labelText" "%classrecord6label%"
"textAlignment" "west"
"xpos" "c+128"
- "ypos" "279"
+ "ypos" "290"
"zpos" "5"
"wide" "200"
"tall" "20"
@@ -1644,11 +1644,11 @@
{
"ControlName" "Label"
"fieldName" "OverallRecord6Value"
- "font" "ScoreboardVerySmall"
+ "font" "HudFontSmallest"
"labelText" "%classrecord6value%"
"textAlignment" "west"
"xpos" "c+210"
- "ypos" "279"
+ "ypos" "290"
"zpos" "5"
"wide" "200"
"tall" "20"
@@ -1661,11 +1661,11 @@
{
"ControlName" "Label"
"fieldName" "OverallRecord7Label"
- "font" "ScoreboardVerySmall"
+ "font" "HudFontSmallest"
"labelText" "%classrecord7label%"
"textAlignment" "west"
"xpos" "c+128"
- "ypos" "289"
+ "ypos" "302"
"zpos" "5"
"wide" "200"
"tall" "20"
@@ -1678,11 +1678,11 @@
{
"ControlName" "Label"
"fieldName" "OverallRecord7Value"
- "font" "ScoreboardVerySmall"
+ "font" "HudFontSmallest"
"labelText" "%classrecord7value%"
"textAlignment" "west"
"xpos" "c+210"
- "ypos" "289"
+ "ypos" "302"
"zpos" "5"
"wide" "200"
"tall" "20"
@@ -1695,11 +1695,11 @@
{
"ControlName" "Label"
"fieldName" "OverallRecord8Label"
- "font" "ScoreboardVerySmall"
+ "font" "HudFontSmallest"
"labelText" "%classrecord8label%"
"textAlignment" "west"
"xpos" "c+128"
- "ypos" "299"
+ "ypos" "314"
"zpos" "5"
"wide" "200"
"tall" "20"
@@ -1712,11 +1712,11 @@
{
"ControlName" "Label"
"fieldName" "OverallRecord8Value"
- "font" "ScoreboardVerySmall"
+ "font" "HudFontSmallest"
"labelText" "%classrecord8value%"
"textAlignment" "west"
"xpos" "c+210"
- "ypos" "299"
+ "ypos" "314"
"zpos" "5"
"wide" "200"
"tall" "20"
@@ -1729,11 +1729,11 @@
{
"ControlName" "Label"
"fieldName" "OverallRecord9Label"
- "font" "ScoreboardVerySmall"
+ "font" "HudFontSmallest"
"labelText" "%classrecord9label%"
"textAlignment" "west"
"xpos" "c+128"
- "ypos" "309"
+ "ypos" "326"
"zpos" "5"
"wide" "200"
"tall" "20"
@@ -1746,11 +1746,11 @@
{
"ControlName" "Label"
"fieldName" "OverallRecord9Value"
- "font" "ScoreboardVerySmall"
+ "font" "HudFontSmallest"
"labelText" "%classrecord9value%"
"textAlignment" "west"
"xpos" "c+210"
- "ypos" "309"
+ "ypos" "326"
"zpos" "5"
"wide" "200"
"tall" "20"
@@ -1763,11 +1763,11 @@
{
"ControlName" "Label"
"fieldName" "OverallRecord10Label"
- "font" "ScoreboardVerySmall"
+ "font" "HudFontSmallest"
"labelText" "%classrecord10label%"
"textAlignment" "west"
"xpos" "c+128"
- "ypos" "319"
+ "ypos" "338"
"zpos" "5"
"wide" "200"
"tall" "20"
@@ -1780,11 +1780,11 @@
{
"ControlName" "Label"
"fieldName" "OverallRecord10Value"
- "font" "ScoreboardVerySmall"
+ "font" "HudFontSmallest"
"labelText" "%classrecord10value%"
"textAlignment" "west"
"xpos" "c+210"
- "ypos" "319"
+ "ypos" "338"
"zpos" "5"
"wide" "200"
"tall" "20"
@@ -1797,11 +1797,11 @@
{
"ControlName" "Label"
"fieldName" "OverallRecord11Label"
- "font" "ScoreboardVerySmall"
+ "font" "HudFontSmallest"
"labelText" "%classrecord11label%"
"textAlignment" "west"
"xpos" "c+128"
- "ypos" "329"
+ "ypos" "350"
"zpos" "5"
"wide" "200"
"tall" "20"
@@ -1814,11 +1814,11 @@
{
"ControlName" "Label"
"fieldName" "OverallRecord11Value"
- "font" "ScoreboardVerySmall"
+ "font" "HudFontSmallest"
"labelText" "%classrecord11value%"
"textAlignment" "west"
"xpos" "c+210"
- "ypos" "329"
+ "ypos" "350"
"zpos" "5"
"wide" "200"
"tall" "20"
@@ -1831,11 +1831,11 @@
{
"ControlName" "Label"
"fieldName" "OverallRecord12Label"
- "font" "ScoreboardVerySmall"
+ "font" "HudFontSmallest"
"labelText" "%classrecord12label%"
"textAlignment" "west"
"xpos" "c+128"
- "ypos" "339"
+ "ypos" "362"
"zpos" "5"
"wide" "200"
"tall" "20"
@@ -1848,11 +1848,11 @@
{
"ControlName" "Label"
"fieldName" "OverallRecord12Value"
- "font" "ScoreboardVerySmall"
+ "font" "HudFontSmallest"
"labelText" "%classrecord12value%"
"textAlignment" "west"
"xpos" "c+210"
- "ypos" "339"
+ "ypos" "362"
"zpos" "5"
"wide" "200"
"tall" "20"
@@ -1865,11 +1865,11 @@
{
"ControlName" "Label"
"fieldName" "OverallRecord13Label"
- "font" "ScoreboardVerySmall"
+ "font" "HudFontSmallest"
"labelText" "%classrecord13label%"
"textAlignment" "west"
"xpos" "c+128"
- "ypos" "349"
+ "ypos" "374"
"zpos" "5"
"wide" "200"
"tall" "20"
@@ -1882,11 +1882,11 @@
{
"ControlName" "Label"
"fieldName" "OverallRecord13Value"
- "font" "ScoreboardVerySmall"
+ "font" "HudFontSmallest"
"labelText" "%classrecord13value%"
"textAlignment" "west"
"xpos" "c+210"
- "ypos" "349"
+ "ypos" "374"
"zpos" "5"
"wide" "200"
"tall" "20"
@@ -1899,11 +1899,11 @@
{
"ControlName" "Label"
"fieldName" "OverallRecord14Label"
- "font" "ScoreboardVerySmall"
+ "font" "HudFontSmallest"
"labelText" "%classrecord14label%"
"textAlignment" "west"
"xpos" "c+128"
- "ypos" "359"
+ "ypos" "386"
"zpos" "5"
"wide" "200"
"tall" "20"
@@ -1916,11 +1916,11 @@
{
"ControlName" "Label"
"fieldName" "OverallRecord14Value"
- "font" "ScoreboardVerySmall"
+ "font" "HudFontSmallest"
"labelText" "%classrecord14value%"
"textAlignment" "west"
"xpos" "c+210"
- "ypos" "359"
+ "ypos" "386"
"zpos" "5"
"wide" "200"
"tall" "20"
@@ -1933,11 +1933,11 @@
{
"ControlName" "Label"
"fieldName" "OverallRecord15Label"
- "font" "ScoreboardVerySmall"
+ "font" "HudFontSmallest"
"labelText" "%classrecord15label%"
"textAlignment" "west"
"xpos" "c+128"
- "ypos" "369"
+ "ypos" "398"
"zpos" "5"
"wide" "200"
"tall" "20"
@@ -1950,11 +1950,11 @@
{
"ControlName" "Label"
"fieldName" "OverallRecord15Value"
- "font" "ScoreboardVerySmall"
+ "font" "HudFontSmallest"
"labelText" "%classrecord15value%"
"textAlignment" "west"
"xpos" "c+210"
- "ypos" "369"
+ "ypos" "398"
"zpos" "5"
"wide" "200"
"tall" "20"
@@ -1970,12 +1970,12 @@
"ControlName" "CTFImagePanel"
"fieldName" "TipImage"
"xpos" "9999"
- "ypos" "9999"
+ "ypos" "270"
"zpos" "12"
"wide" "35"
"tall" "35"
"visible" "0"
- "enabled" "0"
+ "enabled" "1"
"image" ""
"scaleImage" "1"
}
@@ -1983,26 +1983,26 @@
{
"ControlName" "Label"
"fieldName" "TipText"
- "font" "ScoreboardVerySmall"
+ "font" "HudFontSmallest"
"labelText" "%tiptext%"
"textAlignment" "west"
"xpos" "9999"
- "ypos" "9999"
+ "ypos" "263"
"zpos" "12"
"wide" "350"
"tall" "48"
"autoResize" "0"
"pinCorner" "0"
- "visible" "0"
- "enabled" "0"
+ "visible" "1"
+ "enabled" "1"
"wrap" "1"
}
- "NextTipButton" [$WIN32]
+ "NextTipButton"
{
"ControlName" "Button"
"fieldName" "NextTipButton"
- "xpos" "c-248"
+ "xpos" "9999"
"ypos" "310"
"zpos" "6"
"wide" "90"
@@ -2017,14 +2017,16 @@
"dulltext" "0"
"brighttext" "0"
"Command" "nexttip"
+ "border_default" "ButtonHover"
+ "border_armed" "ButtonHover"
}
- "ResetStatsButton" [$WIN32]
+ "ResetStatsButton"
{
"ControlName" "Button"
"fieldName" "ResetStatsButton"
- "xpos" "c130"
- "ypos" "270"
+ "xpos" "9999"
+ "ypos" "290"
"zpos" "6"
"wide" "150"
"tall" "30"
@@ -2038,9 +2040,11 @@
"dulltext" "0"
"brighttext" "0"
"Command" "resetstatsbutton"
+ "border_default" "ButtonHover"
+ "border_armed" "ButtonHover"
}
- "CloseButton" [$WIN32]
+ "CloseButton"
{
"ControlName" "Button"
"fieldName" "CloseButton"
@@ -2052,12 +2056,14 @@
"autoResize" "0"
"pinCorner" "2"
"visible" "0"
- "enabled" "1"
+ "enabled" "0"
"tabPosition" "0"
"labelText" "#TF_Close"
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
"Command" "vguicancel"
+ "border_default" "ButtonHover"
+ "border_armed" "ButtonHover"
}
} \ No newline at end of file
diff --git a/resource/ui/statsummary_embedded.res b/resource/ui/statsummary_embedded.res
index a799ac0..b320e95 100644
--- a/resource/ui/statsummary_embedded.res
+++ b/resource/ui/statsummary_embedded.res
@@ -31,7 +31,7 @@
{
"ControlName" "CExLabel"
"fieldName" "OnYourWayLabel"
- "font" "CerbeticaBold24"
+ "font" "Cerbetica24"
"labelText" "#LoadingMap"
"textAlignment" "west"
"xpos" "0"
@@ -109,12 +109,13 @@
{
"ControlName" "Label"
"fieldName" "BarChartLabelA"
- "font" "CerbeticaBold12"
+ "font" "Cerbetica12"
"labelText" "#StatSummary_StatTitle_MostPoints"
"textAlignment" "east"
"xpos" "c-282"
"ypos" "212"
"zpos" "5"
+ "wide" "150"
"tall" "20"
"autoResize" "0"
"pinCorner" "0"
@@ -125,7 +126,7 @@
{
"ControlName" "Label"
"fieldName" "BarChartLabelB"
- "font" "CerbeticaBold12"
+ "font" "Cerbetica12"
"labelText" "#StatSummary_StatTitle_TotalPlaytime"
"textAlignment" "west"
"xpos" "c-127"
@@ -142,7 +143,7 @@
{
"ControlName" "Label"
"fieldName" "OverallRecordLabel"
- "font" "CerbeticaBold12"
+ "font" "Cerbetica12"
"labelText" "#StatSummary_Label_AsAnyClass"
"textAlignment" "west"
"xpos" "c+130"
@@ -170,61 +171,61 @@
"BarChartComboA"
{
- "ControlName" "ComboBox"
- "fieldName" "BarChartComboA"
- "xpos" "c-285"
- "ypos" "212"
- "zpos" "10"
- "wide" "154"
- "tall" "14"
- "autoResize" "0"
- "pinCorner" "0"
- "visible" "1"
- "enabled" "1"
- "tabPosition" "1"
- "textHidden" "0"
- "editable" "0"
- "maxchars" "-1"
+ "ControlName" "ComboBox"
+ "fieldName" "BarChartComboA"
+ "xpos" "c-285"
+ "ypos" "212"
+ "zpos" "10"
+ "wide" "154"
+ "tall" "14"
+ "autoResize" "0"
+ "pinCorner" "0"
+ "visible" "1"
+ "enabled" "1"
+ "tabPosition" "1"
+ "textHidden" "0"
+ "editable" "0"
+ "maxchars" "-1"
"NumericInputOnly" "0"
"unicode" "0"
}
"BarChartComboB"
{
- "ControlName" "ComboBox"
- "fieldName" "BarChartComboB"
- "xpos" "c-127"
- "ypos" "212"
- "zpos" "10"
- "wide" "154"
- "tall" "14"
- "autoResize" "0"
- "pinCorner" "0"
- "visible" "1"
- "enabled" "1"
- "tabPosition" "1"
- "textHidden" "0"
- "editable" "0"
- "maxchars" "-1"
+ "ControlName" "ComboBox"
+ "fieldName" "BarChartComboB"
+ "xpos" "c-127"
+ "ypos" "212"
+ "zpos" "10"
+ "wide" "154"
+ "tall" "14"
+ "autoResize" "0"
+ "pinCorner" "0"
+ "visible" "1"
+ "enabled" "1"
+ "tabPosition" "1"
+ "textHidden" "0"
+ "editable" "0"
+ "maxchars" "-1"
"NumericInputOnly" "0"
"unicode" "0"
}
"ClassCombo"
{
- "ControlName" "ComboBox"
- "fieldName" "ClassCombo"
- "xpos" "c+124"
- "ypos" "212"
- "zpos" "10"
- "wide" "167"
- "tall" "14"
- "autoResize" "0"
- "pinCorner" "0"
- "visible" "1"
- "enabled" "1"
- "tabPosition" "1"
- "textHidden" "0"
- "editable" "0"
- "maxchars" "-1"
+ "ControlName" "ComboBox"
+ "fieldName" "ClassCombo"
+ "xpos" "c+124"
+ "ypos" "212"
+ "zpos" "10"
+ "wide" "167"
+ "tall" "14"
+ "autoResize" "0"
+ "pinCorner" "0"
+ "visible" "1"
+ "enabled" "1"
+ "tabPosition" "1"
+ "textHidden" "0"
+ "editable" "0"
+ "maxchars" "-1"
"NumericInputOnly" "0"
"unicode" "0"
}
@@ -332,7 +333,7 @@
{
"ControlName" "Label"
"fieldName" "ClassBarLabel1A"
- "font" "CerbeticaBold12"
+ "font" "Cerbetica12"
"labelText" "%classbarlabel1A%"
"textAlignment" "west"
"xpos" "c-282"
@@ -349,7 +350,7 @@
{
"ControlName" "Label"
"fieldName" "ClassBarLabel1B"
- "font" "CerbeticaBold12"
+ "font" "Cerbetica12"
"labelText" "%classbarlabel1B%"
"textAlignment" "west"
"xpos" "c-127"
@@ -361,13 +362,12 @@
"pinCorner" "0"
"visible" "1"
"enabled" "1"
- "fgcolor_override" "TanLight"
}
"ClassLabel1"
{
"ControlName" "Label"
"fieldName" "ClassLabel1"
- "font" "CerbeticaBold12"
+ "font" "Cerbetica12"
"labelText" "%class1%"
"textAlignment" "west"
"xpos" "c+34"
@@ -452,7 +452,7 @@
{
"ControlName" "Label"
"fieldName" "ClassBarLabel2A"
- "font" "CerbeticaBold12"
+ "font" "Cerbetica12"
"labelText" "%classbarlabel2A%"
"textAlignment" "west"
"xpos" "c-282"
@@ -469,7 +469,7 @@
{
"ControlName" "Label"
"fieldName" "ClassBarLabel2B"
- "font" "CerbeticaBold12"
+ "font" "Cerbetica12"
"labelText" "%classbarlabel2B%"
"textAlignment" "west"
"xpos" "c-127"
@@ -486,7 +486,7 @@
{
"ControlName" "Label"
"fieldName" "ClassLabel2"
- "font" "CerbeticaBold12"
+ "font" "Cerbetica12"
"labelText" "%class2%"
"textAlignment" "west"
"xpos" "c+34"
@@ -571,7 +571,7 @@
{
"ControlName" "Label"
"fieldName" "ClassBarLabel3A"
- "font" "CerbeticaBold12"
+ "font" "Cerbetica12"
"labelText" "%classbarlabel3A%"
"textAlignment" "west"
"xpos" "c-282"
@@ -588,7 +588,7 @@
{
"ControlName" "Label"
"fieldName" "ClassBarLabel3B"
- "font" "CerbeticaBold12"
+ "font" "Cerbetica12"
"labelText" "%classbarlabel3B%"
"textAlignment" "west"
"xpos" "c-127"
@@ -605,7 +605,7 @@
{
"ControlName" "Label"
"fieldName" "ClassLabel3"
- "font" "CerbeticaBold12"
+ "font" "Cerbetica12"
"labelText" "%class3%"
"textAlignment" "west"
"xpos" "c+34"
@@ -690,7 +690,7 @@
{
"ControlName" "Label"
"fieldName" "ClassBarLabel4A"
- "font" "CerbeticaBold12"
+ "font" "Cerbetica12"
"labelText" "%classbarlabel4A%"
"textAlignment" "west"
"xpos" "c-282"
@@ -707,7 +707,7 @@
{
"ControlName" "Label"
"fieldName" "ClassBarLabel4B"
- "font" "CerbeticaBold12"
+ "font" "Cerbetica12"
"labelText" "%classbarlabel4B%"
"textAlignment" "west"
"xpos" "c-127"
@@ -724,7 +724,7 @@
{
"ControlName" "Label"
"fieldName" "ClassLabel4"
- "font" "CerbeticaBold12"
+ "font" "Cerbetica12"
"labelText" "%class4%"
"textAlignment" "west"
"xpos" "c+34"
@@ -809,7 +809,7 @@
{
"ControlName" "Label"
"fieldName" "ClassBarLabel5A"
- "font" "CerbeticaBold12"
+ "font" "Cerbetica12"
"labelText" "%classbarlabel5A%"
"textAlignment" "west"
"xpos" "c-282"
@@ -826,7 +826,7 @@
{
"ControlName" "Label"
"fieldName" "ClassBarLabel5B"
- "font" "CerbeticaBold12"
+ "font" "Cerbetica12"
"labelText" "%classbarlabel5B%"
"textAlignment" "west"
"xpos" "c-127"
@@ -843,7 +843,7 @@
{
"ControlName" "Label"
"fieldName" "ClassLabel5"
- "font" "CerbeticaBold12"
+ "font" "Cerbetica12"
"labelText" "%class5%"
"textAlignment" "west"
"xpos" "c+34"
@@ -928,7 +928,7 @@
{
"ControlName" "Label"
"fieldName" "ClassBarLabel6A"
- "font" "CerbeticaBold12"
+ "font" "Cerbetica12"
"labelText" "%classbarlabel6A%"
"textAlignment" "west"
"xpos" "c-282"
@@ -945,7 +945,7 @@
{
"ControlName" "Label"
"fieldName" "ClassBarLabel6B"
- "font" "CerbeticaBold12"
+ "font" "Cerbetica12"
"labelText" "%classbarlabel6B%"
"textAlignment" "west"
"xpos" "c-127"
@@ -962,7 +962,7 @@
{
"ControlName" "Label"
"fieldName" "ClassLabel6"
- "font" "CerbeticaBold12"
+ "font" "Cerbetica12"
"labelText" "%class6%"
"textAlignment" "west"
"xpos" "c+34"
@@ -1047,7 +1047,7 @@
{
"ControlName" "Label"
"fieldName" "ClassBarLabel7A"
- "font" "CerbeticaBold12"
+ "font" "Cerbetica12"
"labelText" "%classbarlabel7A%"
"textAlignment" "west"
"xpos" "c-282"
@@ -1064,7 +1064,7 @@
{
"ControlName" "Label"
"fieldName" "ClassBarLabel7B"
- "font" "CerbeticaBold12"
+ "font" "Cerbetica12"
"labelText" "%classbarlabel7B%"
"textAlignment" "west"
"xpos" "c-127"
@@ -1081,7 +1081,7 @@
{
"ControlName" "Label"
"fieldName" "ClassLabel7"
- "font" "CerbeticaBold12"
+ "font" "Cerbetica12"
"labelText" "%class7%"
"textAlignment" "west"
"xpos" "c+34"
@@ -1166,7 +1166,7 @@
{
"ControlName" "Label"
"fieldName" "ClassBarLabel8A"
- "font" "CerbeticaBold12"
+ "font" "Cerbetica12"
"labelText" "%classbarlabel8A%"
"textAlignment" "west"
"xpos" "c-282"
@@ -1183,7 +1183,7 @@
{
"ControlName" "Label"
"fieldName" "ClassBarLabel8B"
- "font" "CerbeticaBold12"
+ "font" "Cerbetica12"
"labelText" "%classbarlabel8B%"
"textAlignment" "west"
"xpos" "c-127"
@@ -1200,7 +1200,7 @@
{
"ControlName" "Label"
"fieldName" "ClassLabel8"
- "font" "CerbeticaBold12"
+ "font" "Cerbetica12"
"labelText" "%class8%"
"textAlignment" "west"
"xpos" "c+34"
@@ -1285,7 +1285,7 @@
{
"ControlName" "Label"
"fieldName" "ClassBarLabel9A"
- "font" "CerbeticaBold12"
+ "font" "Cerbetica12"
"labelText" "%classbarlabel9A%"
"textAlignment" "west"
"xpos" "c-282"
@@ -1302,7 +1302,7 @@
{
"ControlName" "Label"
"fieldName" "ClassBarLabel9B"
- "font" "CerbeticaBold12"
+ "font" "Cerbetica12"
"labelText" "%classbarlabel9B%"
"textAlignment" "west"
"xpos" "c-127"
@@ -1319,7 +1319,7 @@
{
"ControlName" "Label"
"fieldName" "ClassLabel9"
- "font" "CerbeticaBold12"
+ "font" "Cerbetica12"
"labelText" "%class9%"
"textAlignment" "west"
"xpos" "c+34"
@@ -1400,11 +1400,11 @@
{
"ControlName" "Label"
"fieldName" "OverallRecord1Label"
- "font" "ScoreboardVerySmall"
+ "font" "HudFontSmallest"
"labelText" "%classrecord1label%"
"textAlignment" "west"
"xpos" "c+128"
- "ypos" "229"
+ "ypos" "230"
"zpos" "5"
"wide" "200"
"tall" "20"
@@ -1417,11 +1417,11 @@
{
"ControlName" "Label"
"fieldName" "OverallRecord1Value"
- "font" "ScoreboardVerySmall"
+ "font" "HudFontSmallest"
"labelText" "%classrecord1value%"
"textAlignment" "west"
"xpos" "c+210"
- "ypos" "229"
+ "ypos" "230"
"zpos" "5"
"wide" "200"
"tall" "20"
@@ -1434,11 +1434,11 @@
{
"ControlName" "Label"
"fieldName" "OverallRecord2Label"
- "font" "ScoreboardVerySmall"
+ "font" "HudFontSmallest"
"labelText" "%classrecord2label%"
"textAlignment" "west"
"xpos" "c+128"
- "ypos" "239"
+ "ypos" "242"
"zpos" "5"
"wide" "200"
"tall" "20"
@@ -1451,11 +1451,11 @@
{
"ControlName" "Label"
"fieldName" "OverallRecord2Value"
- "font" "ScoreboardVerySmall"
+ "font" "HudFontSmallest"
"labelText" "%classrecord2value%"
"textAlignment" "west"
"xpos" "c+210"
- "ypos" "239"
+ "ypos" "242"
"zpos" "5"
"wide" "200"
"tall" "20"
@@ -1468,11 +1468,11 @@
{
"ControlName" "Label"
"fieldName" "OverallRecord3Label"
- "font" "ScoreboardVerySmall"
+ "font" "HudFontSmallest"
"labelText" "%classrecord3label%"
"textAlignment" "west"
"xpos" "c+128"
- "ypos" "249"
+ "ypos" "254"
"zpos" "5"
"wide" "200"
"tall" "20"
@@ -1485,11 +1485,11 @@
{
"ControlName" "Label"
"fieldName" "OverallRecord3Value"
- "font" "ScoreboardVerySmall"
+ "font" "HudFontSmallest"
"labelText" "%classrecord3value%"
"textAlignment" "west"
"xpos" "c+210"
- "ypos" "249"
+ "ypos" "254"
"zpos" "5"
"wide" "200"
"tall" "20"
@@ -1502,11 +1502,11 @@
{
"ControlName" "Label"
"fieldName" "OverallRecord4Label"
- "font" "ScoreboardVerySmall"
+ "font" "HudFontSmallest"
"labelText" "%classrecord4label%"
"textAlignment" "west"
"xpos" "c+128"
- "ypos" "259"
+ "ypos" "266"
"zpos" "5"
"wide" "200"
"tall" "20"
@@ -1519,11 +1519,11 @@
{
"ControlName" "Label"
"fieldName" "OverallRecord4Value"
- "font" "ScoreboardVerySmall"
+ "font" "HudFontSmallest"
"labelText" "%classrecord4value%"
"textAlignment" "west"
"xpos" "c+210"
- "ypos" "259"
+ "ypos" "266"
"zpos" "5"
"wide" "200"
"tall" "20"
@@ -1536,11 +1536,11 @@
{
"ControlName" "Label"
"fieldName" "OverallRecord5Label"
- "font" "ScoreboardVerySmall"
+ "font" "HudFontSmallest"
"labelText" "%classrecord5label%"
"textAlignment" "west"
"xpos" "c+128"
- "ypos" "269"
+ "ypos" "278"
"zpos" "5"
"wide" "200"
"tall" "20"
@@ -1553,11 +1553,11 @@
{
"ControlName" "Label"
"fieldName" "OverallRecord5Value"
- "font" "ScoreboardVerySmall"
+ "font" "HudFontSmallest"
"labelText" "%classrecord5value%"
"textAlignment" "west"
"xpos" "c+210"
- "ypos" "269"
+ "ypos" "278"
"zpos" "5"
"wide" "200"
"tall" "20"
@@ -1570,11 +1570,11 @@
{
"ControlName" "Label"
"fieldName" "OverallRecord6Label"
- "font" "ScoreboardVerySmall"
+ "font" "HudFontSmallest"
"labelText" "%classrecord6label%"
"textAlignment" "west"
"xpos" "c+128"
- "ypos" "279"
+ "ypos" "290"
"zpos" "5"
"wide" "200"
"tall" "20"
@@ -1587,11 +1587,11 @@
{
"ControlName" "Label"
"fieldName" "OverallRecord6Value"
- "font" "ScoreboardVerySmall"
+ "font" "HudFontSmallest"
"labelText" "%classrecord6value%"
"textAlignment" "west"
"xpos" "c+210"
- "ypos" "279"
+ "ypos" "290"
"zpos" "5"
"wide" "200"
"tall" "20"
@@ -1604,11 +1604,11 @@
{
"ControlName" "Label"
"fieldName" "OverallRecord7Label"
- "font" "ScoreboardVerySmall"
+ "font" "HudFontSmallest"
"labelText" "%classrecord7label%"
"textAlignment" "west"
"xpos" "c+128"
- "ypos" "289"
+ "ypos" "302"
"zpos" "5"
"wide" "200"
"tall" "20"
@@ -1621,11 +1621,11 @@
{
"ControlName" "Label"
"fieldName" "OverallRecord7Value"
- "font" "ScoreboardVerySmall"
+ "font" "HudFontSmallest"
"labelText" "%classrecord7value%"
"textAlignment" "west"
"xpos" "c+210"
- "ypos" "289"
+ "ypos" "302"
"zpos" "5"
"wide" "200"
"tall" "20"
@@ -1638,11 +1638,11 @@
{
"ControlName" "Label"
"fieldName" "OverallRecord8Label"
- "font" "ScoreboardVerySmall"
+ "font" "HudFontSmallest"
"labelText" "%classrecord8label%"
"textAlignment" "west"
"xpos" "c+128"
- "ypos" "299"
+ "ypos" "314"
"zpos" "5"
"wide" "200"
"tall" "20"
@@ -1655,11 +1655,11 @@
{
"ControlName" "Label"
"fieldName" "OverallRecord8Value"
- "font" "ScoreboardVerySmall"
+ "font" "HudFontSmallest"
"labelText" "%classrecord8value%"
"textAlignment" "west"
"xpos" "c+210"
- "ypos" "299"
+ "ypos" "314"
"zpos" "5"
"wide" "200"
"tall" "20"
@@ -1672,11 +1672,11 @@
{
"ControlName" "Label"
"fieldName" "OverallRecord9Label"
- "font" "ScoreboardVerySmall"
+ "font" "HudFontSmallest"
"labelText" "%classrecord9label%"
"textAlignment" "west"
"xpos" "c+128"
- "ypos" "309"
+ "ypos" "326"
"zpos" "5"
"wide" "200"
"tall" "20"
@@ -1689,11 +1689,11 @@
{
"ControlName" "Label"
"fieldName" "OverallRecord9Value"
- "font" "ScoreboardVerySmall"
+ "font" "HudFontSmallest"
"labelText" "%classrecord9value%"
"textAlignment" "west"
"xpos" "c+210"
- "ypos" "309"
+ "ypos" "326"
"zpos" "5"
"wide" "200"
"tall" "20"
@@ -1706,11 +1706,11 @@
{
"ControlName" "Label"
"fieldName" "OverallRecord10Label"
- "font" "ScoreboardVerySmall"
+ "font" "HudFontSmallest"
"labelText" "%classrecord10label%"
"textAlignment" "west"
"xpos" "c+128"
- "ypos" "319"
+ "ypos" "338"
"zpos" "5"
"wide" "200"
"tall" "20"
@@ -1723,11 +1723,11 @@
{
"ControlName" "Label"
"fieldName" "OverallRecord10Value"
- "font" "ScoreboardVerySmall"
+ "font" "HudFontSmallest"
"labelText" "%classrecord10value%"
"textAlignment" "west"
"xpos" "c+210"
- "ypos" "319"
+ "ypos" "338"
"zpos" "5"
"wide" "200"
"tall" "20"
@@ -1740,11 +1740,11 @@
{
"ControlName" "Label"
"fieldName" "OverallRecord11Label"
- "font" "ScoreboardVerySmall"
+ "font" "HudFontSmallest"
"labelText" "%classrecord11label%"
"textAlignment" "west"
"xpos" "c+128"
- "ypos" "329"
+ "ypos" "350"
"zpos" "5"
"wide" "200"
"tall" "20"
@@ -1757,11 +1757,11 @@
{
"ControlName" "Label"
"fieldName" "OverallRecord11Value"
- "font" "ScoreboardVerySmall"
+ "font" "HudFontSmallest"
"labelText" "%classrecord11value%"
"textAlignment" "west"
"xpos" "c+210"
- "ypos" "329"
+ "ypos" "350"
"zpos" "5"
"wide" "200"
"tall" "20"
@@ -1774,11 +1774,11 @@
{
"ControlName" "Label"
"fieldName" "OverallRecord12Label"
- "font" "ScoreboardVerySmall"
+ "font" "HudFontSmallest"
"labelText" "%classrecord12label%"
"textAlignment" "west"
"xpos" "c+128"
- "ypos" "339"
+ "ypos" "362"
"zpos" "5"
"wide" "200"
"tall" "20"
@@ -1791,11 +1791,11 @@
{
"ControlName" "Label"
"fieldName" "OverallRecord12Value"
- "font" "ScoreboardVerySmall"
+ "font" "HudFontSmallest"
"labelText" "%classrecord12value%"
"textAlignment" "west"
"xpos" "c+210"
- "ypos" "339"
+ "ypos" "362"
"zpos" "5"
"wide" "200"
"tall" "20"
@@ -1808,11 +1808,11 @@
{
"ControlName" "Label"
"fieldName" "OverallRecord13Label"
- "font" "ScoreboardVerySmall"
+ "font" "HudFontSmallest"
"labelText" "%classrecord13label%"
"textAlignment" "west"
"xpos" "c+128"
- "ypos" "349"
+ "ypos" "374"
"zpos" "5"
"wide" "200"
"tall" "20"
@@ -1825,11 +1825,11 @@
{
"ControlName" "Label"
"fieldName" "OverallRecord13Value"
- "font" "ScoreboardVerySmall"
+ "font" "HudFontSmallest"
"labelText" "%classrecord13value%"
"textAlignment" "west"
"xpos" "c+210"
- "ypos" "349"
+ "ypos" "374"
"zpos" "5"
"wide" "200"
"tall" "20"
@@ -1842,11 +1842,11 @@
{
"ControlName" "Label"
"fieldName" "OverallRecord14Label"
- "font" "ScoreboardVerySmall"
+ "font" "HudFontSmallest"
"labelText" "%classrecord14label%"
"textAlignment" "west"
"xpos" "c+128"
- "ypos" "359"
+ "ypos" "386"
"zpos" "5"
"wide" "200"
"tall" "20"
@@ -1859,11 +1859,11 @@
{
"ControlName" "Label"
"fieldName" "OverallRecord14Value"
- "font" "ScoreboardVerySmall"
+ "font" "HudFontSmallest"
"labelText" "%classrecord14value%"
"textAlignment" "west"
"xpos" "c+210"
- "ypos" "359"
+ "ypos" "386"
"zpos" "5"
"wide" "200"
"tall" "20"
@@ -1876,11 +1876,11 @@
{
"ControlName" "Label"
"fieldName" "OverallRecord15Label"
- "font" "ScoreboardVerySmall"
+ "font" "HudFontSmallest"
"labelText" "%classrecord15label%"
"textAlignment" "west"
"xpos" "c+128"
- "ypos" "369"
+ "ypos" "398"
"zpos" "5"
"wide" "200"
"tall" "20"
@@ -1893,11 +1893,11 @@
{
"ControlName" "Label"
"fieldName" "OverallRecord15Value"
- "font" "ScoreboardVerySmall"
+ "font" "HudFontSmallest"
"labelText" "%classrecord15value%"
"textAlignment" "west"
"xpos" "c+210"
- "ypos" "369"
+ "ypos" "398"
"zpos" "5"
"wide" "200"
"tall" "20"
@@ -1926,7 +1926,7 @@
{
"ControlName" "Label"
"fieldName" "TipText"
- "font" "Cerbetica12"
+ "font" "HudFontSmallest"
"labelText" "%tiptext%"
"textAlignment" "west"
"xpos" "c-285"
@@ -1960,12 +1960,8 @@
"dulltext" "0"
"brighttext" "0"
"Command" "nexttip"
- "defaultBgColor_override" "15 15 15 255"
- "armedBgColor_override" "25 25 25 255"
- "depressedBgColor_override" "25 25 25 255"
- "defaultFgColor_override" "TanLight"
- "armedFgColor_override" "TanLight"
- "depressedFgColor_override" "TanLight"
+ "border_default" "ButtonHover"
+ "border_armed" "ButtonHover"
}
"ResetStatsButton"
@@ -1973,7 +1969,7 @@
"ControlName" "Button"
"fieldName" "ResetStatsButton"
"xpos" "c130"
- "ypos" "270"
+ "ypos" "290"
"zpos" "6"
"wide" "150"
"tall" "30"
diff --git a/resource/ui/steamworkshopdialog.res b/resource/ui/steamworkshopdialog.res
index a204f33..06516ae 100644
--- a/resource/ui/steamworkshopdialog.res
+++ b/resource/ui/steamworkshopdialog.res
@@ -95,13 +95,13 @@
"tabPosition" "0"
"PaintBackgroundType" "0"
"paintbackground" "1"
- "border" "CyanBorderThick"
+ "border" "NoBorder"
"TitleLabel"
{
"ControlName" "CExLabel"
"fieldName" "TitleLabel"
- "font" "HudFontMediumBold"
+ "font" "HudFontSmall"
"labelText" "#TF_SteamWorkshop_Title"
"textAlignment" "center"
"xpos" "0"
@@ -151,11 +151,13 @@
"enabled" "1"
"tabPosition" "0"
"labelText" "#TF_SteamWorkshop_LearnHow"
- "font" "HudFontSmallBold"
+ "font" "HudFontSmall"
"textAlignment" "center"
"Command" "learn_more"
"sound_depressed" "UI/buttonclick.wav"
"sound_released" "UI/buttonclickrelease.wav"
+ "border_default" "NoBorder"
+ "border_armed" "NoBorder"
}
}
@@ -174,8 +176,9 @@
"enabled" "1"
"tabPosition" "0"
"PaintBackgroundType" "0"
- "paintbackground" "1"
- "border" "MainMenuHighlightBorder"
+ "paintbackground" "0"
+ "paintborder" "0"
+ "border" "NoBorder"
"TitleLabel"
{
@@ -193,7 +196,7 @@
"pinCorner" "0"
"visible" "1"
"enabled" "1"
- "fgcolor_override" "Black"
+ "fgcolor_override" "TanLight"
}
"SteamWorkshopItem0"
@@ -258,8 +261,8 @@
"visible" "1"
"enabled" "1"
"tabPosition" "0"
- "labelText" "&A"
- "font" "MenuArrows"
+ "labelText" "<"
+ "font" "HudFontSmall"
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
@@ -272,7 +275,7 @@
{
"ControlName" "CExLabel"
"fieldName" "CurPageLabel"
- "font" "HudFontSmallBold"
+ "font" "HudFontSmall"
"labelText" "%page%"
"textAlignment" "center"
"xpos" "460"
@@ -284,7 +287,7 @@
"pinCorner" "0"
"visible" "1"
"enabled" "1"
- "fgcolor_override" "Black"
+ "fgcolor_override" "ColorCyan"
}
"NextPageButton"
@@ -301,8 +304,8 @@
"visible" "1"
"enabled" "1"
"tabPosition" "0"
- "labelText" "&D"
- "font" "MenuArrows"
+ "labelText" ">"
+ "font" "HudFontSmall"
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
@@ -326,7 +329,7 @@
"enabled" "1"
"tabPosition" "0"
"labelText" "#TF_SteamWorkshop_ViewPublished"
- "font" "HudFontSmallBold"
+ "font" "HudFontSmall"
"textAlignment" "center"
"textinsetx" "50"
"dulltext" "0"
@@ -334,6 +337,7 @@
"Command" "view_files"
"sound_depressed" "UI/buttonclick.wav"
"sound_released" "UI/buttonclickrelease.wav"
+ "border_default" "NoBorder"
}
"EditButton"
@@ -351,7 +355,7 @@
"tabPosition" "0"
"textinsetx" "25"
"use_proportional_insets" "1"
- "font" "HudFontSmallBold"
+ "font" "HudFontSmall"
"textAlignment" "west"
"dulltext" "0"
"brighttext" "0"
@@ -360,6 +364,7 @@
"sound_released" "UI/buttonclickrelease.wav"
"labelText" "#TF_SteamWorkshop_Edit"
"command" "edit"
+ "border_default" "NoBorder"
"image_drawcolor" "TanLight"
"image_disabledcolor" "ColorBlack"
@@ -395,7 +400,7 @@
"tabPosition" "0"
"textinsetx" "25"
"use_proportional_insets" "1"
- "font" "HudFontSmallBold"
+ "font" "HudFontSmall"
"textAlignment" "west"
"dulltext" "0"
"brighttext" "0"
@@ -404,9 +409,10 @@
"sound_released" "UI/buttonclickrelease.wav"
"labelText" "#TF_SteamWorkshop_View"
"command" "view"
+ "border_default" "NoBorder"
- "image_drawcolor" "TanLight"
- "image_disabledcolor" "ColorBlack"
+ "image_drawcolor" "TanLight"
+ "image_disabledcolor" "ColorBlack"
"SubImage"
{
@@ -439,7 +445,7 @@
"tabPosition" "0"
"textinsetx" "25"
"use_proportional_insets" "1"
- "font" "HudFontSmallBold"
+ "font" "HudFontSmall"
"textAlignment" "west"
"dulltext" "0"
"brighttext" "0"
@@ -448,6 +454,7 @@
"sound_released" "UI/buttonclickrelease.wav"
"labelText" "#TF_SteamWorkshop_Delete"
"command" "delete_item"
+ "border_default" "NoBorder"
"image_drawcolor" "TanLight"
"image_disabledcolor" "ColorBlack"
@@ -484,11 +491,12 @@
"enabled" "1"
"tabPosition" "0"
"labelText" "#TF_SteamWorkshop_BrowseTheWorkshop"
- "font" "HudFontSmallestBold"
+ "font" "HudFontSmall"
"textAlignment" "center"
"Command" "browse"
"sound_depressed" "UI/buttonclick.wav"
"sound_released" "UI/buttonclickrelease.wav"
+ "border_default" "NoBorder"
}
"LoadTestMapButton"
@@ -506,11 +514,12 @@
"enabled" "1"
"tabPosition" "0"
"labelText" "#TF_SteamWorkshop_Test"
- "font" "HudFontSmallBold"
+ "font" "HudFontSmall"
"textAlignment" "center"
"Command" "itemtest"
"sound_depressed" "UI/buttonclick.wav"
"sound_released" "UI/buttonclickrelease.wav"
+ "border_default" "NoBorder"
}
"PublishButton"
@@ -528,11 +537,12 @@
"enabled" "1"
"tabPosition" "0"
"labelText" "#TF_SteamWorkshop_Publish"
- "font" "HudFontSmallBold"
+ "font" "HudFontSmall"
"textAlignment" "center"
"Command" "publish"
"sound_depressed" "UI/buttonclick.wav"
"sound_released" "UI/buttonclickrelease.wav"
+ "border_default" "NoBorder"
}
"LearnMore2Button"
@@ -550,11 +560,12 @@
"enabled" "1"
"tabPosition" "0"
"labelText" "#TF_SteamWorkshop_Instructions"
- "font" "HudFontSmallBold"
+ "font" "HudFontSmall"
"textAlignment" "center"
"Command" "learn_more"
"sound_depressed" "UI/buttonclick.wav"
"sound_released" "UI/buttonclickrelease.wav"
+ "border_default" "NoBorder"
}
"ViewLegalAgreementButton"
@@ -572,7 +583,7 @@
"enabled" "1"
"tabPosition" "0"
"labelText" "#TF_SteamWorkshop_Legal"
- "font" "HudFontSmallBold"
+ "font" "HudFontSmall"
"textAlignment" "center"
"textinsetx" "50"
"dulltext" "0"
@@ -580,6 +591,7 @@
"Command" "view_legal_agreement"
"sound_depressed" "UI/buttonclick.wav"
"sound_released" "UI/buttonclickrelease.wav"
+ "border_default" "NoBorder"
}
"CancelButton"
@@ -596,8 +608,8 @@
"visible" "1"
"enabled" "1"
"tabPosition" "0"
- "labelText" "#Store_CANCEL"
- "font" "HudFontSmallBold"
+ "labelText" "#TF_Close"
+ "font" "HudFontSmall"
"textAlignment" "center"
"textinsetx" "50"
"dulltext" "0"
@@ -605,6 +617,7 @@
"Command" "cancel"
"sound_depressed" "UI/buttonclick.wav"
"sound_released" "UI/buttonclickrelease.wav"
+ "border_default" "NoBorder"
}
}
} \ No newline at end of file
diff --git a/resource/ui/streamlistpanel.res b/resource/ui/streamlistpanel.res
index 89f978b..beddbe1 100644
--- a/resource/ui/streamlistpanel.res
+++ b/resource/ui/streamlistpanel.res
@@ -36,10 +36,10 @@
"ControlName" "CExImageButton"
"fieldName" "CloseButton"
"xpos" "282"
- "ypos" "4"
+ "ypos" "6"
"zpos" "10"
- "wide" "14"
- "tall" "14"
+ "wide" "12"
+ "tall" "12"
"autoResize" "0"
"pinCorner" "0"
"visible" "1"
@@ -74,8 +74,8 @@
"xpos" "0"
"ypos" "0"
"zpos" "1"
- "wide" "14"
- "tall" "14"
+ "wide" "12"
+ "tall" "12"
"visible" "1"
"enabled" "1"
"image" "replay/thumbnails/close"
diff --git a/resource/ui/streampanel.res b/resource/ui/streampanel.res
index db7ec24..71d284f 100644
--- a/resource/ui/streampanel.res
+++ b/resource/ui/streampanel.res
@@ -85,6 +85,7 @@
"textAlignment" "west"
"xpos" "90"
"ypos" "5"
+ "zpos" "3"
"wide" "205"
"tall" "12"
"autoResize" "0"
@@ -103,6 +104,7 @@
"textAlignment" "north-west"
"xpos" "90"
"ypos" "18"
+ "zpos" "3"
"wide" "205"
"tall" "12"
"autoResize" "0"
diff --git a/resource/ui/tankprogressbar.res b/resource/ui/tankprogressbar.res
index 3b3fecf..d5e9353 100644
--- a/resource/ui/tankprogressbar.res
+++ b/resource/ui/tankprogressbar.res
@@ -65,7 +65,7 @@
"src_corner_width" "22"
"draw_corner_width" "5" // screen size of the corners ( and sides ), proportional
- "draw_corner_height" "5"
+ "draw_corner_height" "5"
}
"ProgressBarBG2"
diff --git a/resource/ui/targetid.res b/resource/ui/targetid.res
index 2735424..de60c3c 100644
--- a/resource/ui/targetid.res
+++ b/resource/ui/targetid.res
@@ -8,27 +8,10 @@
"ypos" "29"
"zpos" "6"
"wide" "600"
- "tall" "14"
- "autoResize" "0"
- "pinCorner" "0"
+ "tall" "19"
"visible" "1"
"enabled" "1"
- "fillcolor" "0 0 0 220"
- }
-
- "TargetBackground2"
- {
- "ControlName" "ImagePanel"
- "fieldName" "TargetBackground2"
- "xpos" "0"
- "ypos" "15"
- "zpos" "6"
- "wide" "600"
- "tall" "15"
- "autoResize" "0"
- "pinCorner" "0"
- "visible" "1"
- "enabled" "1"
+ "fillcolor" "TransparentBlack"
}
"TargetIDBG"
@@ -54,56 +37,42 @@
"TargetIDBG_Spec_Blue"
{
- "ControlName" "ScalableImagePanel"
+ "ControlName" "ImagePanel"
"fieldName" "TargetIDBG_Spec_Blue"
"xpos" "0"
- "ypos" "43"
- "zpos" "6"
- "wide" "252"
- "tall" "10"
- "autoResize" "0"
- "pinCorner" "0"
+ "ypos" "47"
+ "zpos" "0"
+ "wide" "5"
+ "tall" "5"
"visible" "0"
"enabled" "1"
- "image" "../hud/color_panel_blu"
-
- "src_corner_height" "23"
- "src_corner_width" "23"
- "draw_corner_width" "0"
- "draw_corner_height" "0"
+ "fillcolor" "72 112 125 255"
}
"TargetIDBG_Spec_Red"
{
- "ControlName" "ScalableImagePanel"
+ "ControlName" "ImagePanel"
"fieldName" "TargetIDBG_Spec_Red"
"xpos" "0"
- "ypos" "43"
- "zpos" "6"
- "wide" "252"
- "tall" "10"
- "autoResize" "0"
- "pinCorner" "0"
+ "ypos" "47"
+ "zpos" "0"
+ "wide" "5"
+ "tall" "5"
"visible" "0"
"enabled" "1"
- "image" "../hud/color_panel_red"
-
- "src_corner_height" "23"
- "src_corner_width" "23"
- "draw_corner_width" "0"
- "draw_corner_height" "0"
+ "fillcolor" "158 64 61 255"
}
"TargetNameLabel"
{
"ControlName" "Label"
"fieldName" "TargetNameLabel"
- "font" "Cerbetica14"
+ "font" "HudFontMediumSmall"
"xpos" "45"
- "ypos" "28"
+ "ypos" "29"
"zpos" "7"
"wide" "300"
- "tall" "15"
+ "tall" "19"
"visible" "1"
"enabled" "1"
"labelText" "%targetname%"
@@ -114,12 +83,12 @@
{
"ControlName" "Label"
"fieldName" "TargetNameLabelShadow"
- "font" "Cerbetica14"
+ "font" "HudFontMediumSmall"
"xpos" "-1"
"ypos" "-1"
"zpos" "1"
"wide" "300"
- "tall" "15"
+ "tall" "19"
"visible" "1"
"enabled" "1"
"labelText" "%targetname%"
@@ -135,7 +104,7 @@
{
"ControlName" "Label"
"fieldName" "TargetDataLabel"
- "font" "Cerbetica12"
+ "font" "HudFontSmall"
"xpos" "15"
"ypos" "15"
"zpos" "6"
@@ -152,7 +121,7 @@
"ControlName" "EditablePanel"
"fieldName" "SpectatorGUIHealth"
"xpos" "-2"
- "ypos" "12"
+ "ypos" "14"
"zpos" "10"
"wide" "38"
"tall" "42"
@@ -207,8 +176,8 @@
"scaleImage" "1"
"pin_to_sibling" "KillStreakAnchor"
- "pin_corner_to_sibling" "1"
- "pin_to_sibling_corner" "1"
+ "pin_corner_to_sibling" "PIN_TOPRIGHT"
+ "pin_to_sibling_corner" "PIN_TOPRIGHT"
}
"MoveableSubPanel"
@@ -235,7 +204,7 @@
"visible" "1"
"enabled" "1"
"icon" "obj_status_alert_background_tall_nocolor"
- "iconColor" "65 65 65 255"
+ "iconColor" "TransparentBlack"
"scaleImage" "1"
}
@@ -270,31 +239,11 @@
"scaleImage" "1"
}
- "MoveableKeyText"
- {
- "ControlName" "CExLabel"
- "fieldName" "MoveableKeyText"
- "font_minmode" "Cerbetica12"
- "xpos" "0"
- "ypos" "0"
- "zpos" "6"
- "wide" "12"
- "tall" "0"
- "autoResize" "0"
- "pinCorner" "0"
- "visible" "1"
- "enabled" "1"
- "labelText" "Pick Up"
- "textAlignment" "center"
- "dulltext" "0"
- "brighttext" "0"
- }
-
"MoveableKeyLabel"
{
"ControlName" "Label"
"fieldName" "MoveableKeyLabel"
- "font" "Cerbetica12"
+ "font" "HudFontSmallest"
"xpos" "0"
"ypos" "29"
"zpos" "6"
@@ -304,7 +253,7 @@
"pinCorner" "0"
"visible" "1"
"enabled" "1"
- "labelText" "%movekey%"
+ "labelText" ""
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
diff --git a/resource/ui/testitemroot.res b/resource/ui/testitemroot.res
index 5253019..56ee3ba 100644
--- a/resource/ui/testitemroot.res
+++ b/resource/ui/testitemroot.res
@@ -20,7 +20,7 @@
{
"ControlName" "CExLabel"
"fieldName" "TitleLabel"
- "font" "HudFontMediumBold"
+ "font" "HudFontMedium"
"labelText" "#IT_Title"
"textAlignment" "north"
"xpos" "0"
@@ -70,7 +70,7 @@
"ControlName" "CheckButton"
"fieldName" "ClassCheckBox0"
"labelText" "#IT_Classes_All"
- "Font" "ItemFontAttribSmall"
+ "Font" "HudFontSmallest"
"textAlignment" "west"
"xpos" "45"
"ypos" "15"
@@ -83,14 +83,14 @@
"enabled" "1"
"dulltext" "0"
"brighttext" "0"
- "disabledfgcolor2_override" "TextColor"
+ "disabledfgcolor2_override" "ItemFlags"
}
"ClassCheckBox1"
{
"ControlName" "CheckButton"
"fieldName" "ClassCheckBox1"
"labelText" "#TF_Class_Name_Scout"
- "Font" "ItemFontAttribSmall"
+ "Font" "HudFontSmallest"
"textAlignment" "west"
"xpos" "145"
"ypos" "15"
@@ -103,14 +103,14 @@
"enabled" "1"
"dulltext" "0"
"brighttext" "0"
- "disabledfgcolor2_override" "TextColor"
+ "disabledfgcolor2_override" "ItemFlags"
}
"ClassCheckBox2"
{
"ControlName" "CheckButton"
"fieldName" "ClassCheckBox2"
"labelText" "#TF_Class_Name_Sniper"
- "Font" "ItemFontAttribSmall"
+ "Font" "HudFontSmallest"
"textAlignment" "west"
"xpos" "220"
"ypos" "15"
@@ -123,14 +123,14 @@
"enabled" "1"
"dulltext" "0"
"brighttext" "0"
- "disabledfgcolor2_override" "TextColor"
+ "disabledfgcolor2_override" "ItemFlags"
}
"ClassCheckBox3"
{
"ControlName" "CheckButton"
"fieldName" "ClassCheckBox3"
"labelText" "#TF_Class_Name_Soldier"
- "Font" "ItemFontAttribSmall"
+ "Font" "HudFontSmallest"
"textAlignment" "west"
"xpos" "295"
"ypos" "15"
@@ -150,7 +150,7 @@
"ControlName" "CheckButton"
"fieldName" "ClassCheckBox4"
"labelText" "#TF_Class_Name_Demoman"
- "Font" "ItemFontAttribSmall"
+ "Font" "HudFontSmallest"
"textAlignment" "west"
"xpos" "145"
"ypos" "40"
@@ -170,7 +170,7 @@
"ControlName" "CheckButton"
"fieldName" "ClassCheckBox5"
"labelText" "#TF_Class_Name_Medic"
- "Font" "ItemFontAttribSmall"
+ "Font" "HudFontSmallest"
"textAlignment" "west"
"xpos" "220"
"ypos" "40"
@@ -190,7 +190,7 @@
"ControlName" "CheckButton"
"fieldName" "ClassCheckBox6"
"labelText" "#TF_Class_Name_HWGuy"
- "Font" "ItemFontAttribSmall"
+ "Font" "HudFontSmallest"
"textAlignment" "west"
"xpos" "295"
"ypos" "40"
@@ -210,7 +210,7 @@
"ControlName" "CheckButton"
"fieldName" "ClassCheckBox7"
"labelText" "#TF_Class_Name_Pyro"
- "Font" "ItemFontAttribSmall"
+ "Font" "HudFontSmallest"
"textAlignment" "west"
"xpos" "145"
"ypos" "65"
@@ -230,7 +230,7 @@
"ControlName" "CheckButton"
"fieldName" "ClassCheckBox8"
"labelText" "#TF_Class_Name_Spy"
- "Font" "ItemFontAttribSmall"
+ "Font" "HudFontSmallest"
"textAlignment" "west"
"xpos" "220"
"ypos" "65"
@@ -250,7 +250,7 @@
"ControlName" "CheckButton"
"fieldName" "ClassCheckBox9"
"labelText" "#TF_Class_Name_Engineer"
- "Font" "ItemFontAttribSmall"
+ "Font" "HudFontSmallest"
"textAlignment" "west"
"xpos" "295"
"ypos" "65"
@@ -318,7 +318,7 @@
{
"ControlName" "CExLabel"
"fieldName" "TestItemEntry0"
- "font" "ItemFontAttribSmall"
+ "font" "HudFontSmallest"
"labelText" "#IT_TestingSlot_Empty"
"textAlignment" "center"
"xpos" "95"
@@ -330,7 +330,7 @@
"pinCorner" "0"
"visible" "1"
"enabled" "1"
- "fgcolor_override" "200 80 60 255"
+ "fgcolor_override" "LightRed"
"bgcolor_override" "24 24 24 128"
}
"TestItemButton0"
@@ -402,7 +402,7 @@
{
"ControlName" "CExLabel"
"fieldName" "TestItemEntry1"
- "font" "ItemFontAttribSmall"
+ "font" "HudFontSmallest"
"labelText" "#IT_TestingSlot_Empty"
"textAlignment" "center"
"xpos" "95"
@@ -414,7 +414,7 @@
"pinCorner" "0"
"visible" "1"
"enabled" "1"
- "fgcolor_override" "200 80 60 255"
+ "fgcolor_override" "LightRed"
"bgcolor_override" "24 24 24 128"
}
"TestItemButton1"
@@ -486,7 +486,7 @@
{
"ControlName" "CExLabel"
"fieldName" "TestItemEntry2"
- "font" "ItemFontAttribSmall"
+ "font" "HudFontSmallest"
"labelText" "#IT_TestingSlot_Empty"
"textAlignment" "center"
"xpos" "95"
@@ -498,7 +498,7 @@
"pinCorner" "0"
"visible" "1"
"enabled" "1"
- "fgcolor_override" "200 80 60 255"
+ "fgcolor_override" "LightRed"
"bgcolor_override" "24 24 24 128"
}
"TestItemButton2"
@@ -570,7 +570,7 @@
{
"ControlName" "CExLabel"
"fieldName" "TestItemEntry3"
- "font" "ItemFontAttribSmall"
+ "font" "HudFontSmallest"
"labelText" "#IT_TestingSlot_Empty"
"textAlignment" "center"
"xpos" "95"
@@ -582,7 +582,7 @@
"pinCorner" "0"
"visible" "1"
"enabled" "1"
- "fgcolor_override" "200 80 60 255"
+ "fgcolor_override" "LightRed"
"bgcolor_override" "24 24 24 128"
}
"TestItemButton3"
@@ -670,7 +670,7 @@
"ControlName" "CheckButton"
"fieldName" "AutoAddBotsCheckBox"
"labelText" "#IT_Bot_AutoAdd"
- "Font" "ItemFontAttribSmall"
+ "Font" "HudFontSmallest"
"textAlignment" "west"
"xpos" "10"
"ypos" "20"
@@ -691,7 +691,7 @@
"ControlName" "CheckButton"
"fieldName" "AutoAddBotsCheckBox"
"labelText" "#IT_Bot_BlueTeam"
- "Font" "ItemFontAttribSmall"
+ "Font" "HudFontSmallest"
"textAlignment" "west"
"xpos" "110"
"ypos" "20"
@@ -815,7 +815,7 @@
"enabled" "1"
"tabPosition" "0"
"labelText" "#IT_ExportLoadout"
- "font" "HudFontSmallBold"
+ "font" "HudFontSmall"
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
@@ -840,7 +840,7 @@
"enabled" "1"
"tabPosition" "0"
"labelText" "#IT_ImportLoadout"
- "font" "HudFontSmallBold"
+ "font" "HudFontSmall"
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
@@ -865,7 +865,7 @@
"enabled" "1"
"tabPosition" "0"
"labelText" "#IT_ImportLast"
- "font" "HudFontSmallBold"
+ "font" "HudFontSmall"
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
@@ -890,7 +890,7 @@
"enabled" "1"
"tabPosition" "0"
"labelText" "#Cancel"
- "font" "HudFontSmallBold"
+ "font" "HudFontSmall"
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
@@ -915,7 +915,7 @@
"enabled" "1"
"tabPosition" "0"
"labelText" "#IT_Ok"
- "font" "HudFontSmallBold"
+ "font" "HudFontSmall"
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
@@ -953,7 +953,7 @@
"textinsetx" "25"
"textalignment" "center"
"use_proportional_insets" "1"
- "font" "HudFontSmallBold"
+ "font" "HudFontSmall"
"textAlignment" "west"
"dulltext" "0"
"brighttext" "0"
@@ -1000,7 +1000,7 @@
"enabled" "1"
"tabPosition" "0"
"labelText" "R"
- "font" "HudFontSmallestBold"
+ "font" "HudFontSmall"
"textAlignment" "center"
"textinsetx" "50"
"dulltext" "0"
diff --git a/resource/ui/textwindow.res b/resource/ui/textwindow.res
index 3edb7f6..1b06204 100644
--- a/resource/ui/textwindow.res
+++ b/resource/ui/textwindow.res
@@ -49,7 +49,7 @@
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
- "font" "Cerbetica24"
+ "font" "HudFontMedium"
"fgcolor" "TanLight"
}
@@ -57,19 +57,20 @@
{
"ControlName" "TextEntry"
"fieldName" "TextMessage"
- "xpos" "9999"
+ "visible" "0"
+ "enabled" "0"
}
"TFTextMessage"
{
"ControlName" "CExRichText"
"fieldName" "TFTextMessage"
- "font" "Cerbetica12"
+ "font" "HudFontSmallest"
"xpos" "c-170"
"ypos" "c-90"
"zpos" "1"
"wide" "340"
- "tall" "181"
+ "tall" "180"
"autoResize" "3"
"pinCorner" "0"
"visible" "1"
@@ -110,14 +111,14 @@
"visible" "1"
"enabled" "1"
"tabPosition" "0"
- "labelText" "CONTINUE (&E)"
+ "labelText" "#TF_Continue"
"textAlignment" "center"
"dulltext" "0"
"brighttext" "0"
"wrap" "0"
"command" "okay"
"default" "1"
- "font" "Cerbetica24"
+ "font" "HudFontMedium"
"paintbackground" "0"
"fgcolor" "TanLight"
@@ -139,22 +140,13 @@
"ControlName" "ImagePanel"
"fieldName" "ShadedBar"
"xpos" "9999"
- "ypos" "9999"
- "zpos" "5"
- "wide" "f0"
- "tall" "50"
- "visible" "1"
- "enabled" "1"
- "tabPosition" "0"
- "image" "loadout_bottom_gradient"
- "tileImage" "1"
- "PaintBackgroundType" "0"
}
"MessageTitle"
{
"ControlName" "Label"
"fieldName" "MessageTitle"
- "xpos" "9999"
+ "visible" "0"
+ "enabled" "0"
}
} \ No newline at end of file
diff --git a/resource/ui/tfadvancedoptionsdialog.res b/resource/ui/tfadvancedoptionsdialog.res
index a4f6b00..def1f7c 100644
--- a/resource/ui/tfadvancedoptionsdialog.res
+++ b/resource/ui/tfadvancedoptionsdialog.res
@@ -30,7 +30,7 @@
{
"ControlName" "CExLabel"
"fieldName" "TitleLabel"
- "font" "CerbeticaBold24"
+ "font" "Cerbetica24"
"labelText" "#TF_AdvancedOptions"
"textAlignment" "center"
"xpos" "0"
diff --git a/resource/ui/votehud.res b/resource/ui/votehud.res
index a14dad3..c59599a 100644
--- a/resource/ui/votehud.res
+++ b/resource/ui/votehud.res
@@ -10,8 +10,10 @@
"tall" "67"
"visible" "0"
"enabled" "1"
+ "paintborder" "1"
"border" "CyanBorderThick"
"bgcolor_override" "DarkGrey"
+ "PaintBackgroundType" "2"
"PassedIcon"
{
@@ -77,8 +79,10 @@
"tall" "144"
"visible" "0"
"enabled" "1"
+ "paintborder" "1"
"border" "CyanBorderThick"
"bgcolor_override" "DarkGrey"
+ "PaintBackgroundType" "2"
"Header"
{
@@ -105,7 +109,7 @@
"fieldName" "Issue"
"xpos" "10"
"ypos" "22"
- "wide" "120"
+ "wide" "130"
"tall" "40"
"visible" "1"
"enabled" "1"
@@ -406,8 +410,10 @@
"tall" "67"
"visible" "0"
"enabled" "1"
+ "paintborder" "1"
"border" "CyanBorderThick"
"bgcolor_override" "DarkGrey"
+ "PaintBackgroundType" "2"
"FailedIcon"
{
@@ -473,8 +479,10 @@
"tall" "67"
"visible" "0"
"enabled" "1"
+ "paintborder" "1"
"border" "CyanBorderThick"
"bgcolor_override" "DarkGrey"
+ "PaintBackgroundType" "2"
"FailedIcon"
{
@@ -543,9 +551,11 @@
"enabled" "1"
"tabPosition" "0"
"settitlebarvisible" "0"
+ "paintborder" "1"
"border" "CyanBorderThick"
"bgcolor_override" "DarkGrey"
"PaintBackground" "1"
+ "PaintBackgroundType" "2"
"header_font" "ItemFontNameLarge"
"header_fgcolor" "Orange"
diff --git a/resource/ui/wavestatuspanel.res b/resource/ui/wavestatuspanel.res
index cb14130..0997b4a 100644
--- a/resource/ui/wavestatuspanel.res
+++ b/resource/ui/wavestatuspanel.res
@@ -25,7 +25,7 @@
{
"ControlName" "CExLabel"
"fieldName" "WaveCountLabel"
- "font" "CerbeticaBold16"
+ "font" "Cerbetica14"
"fgcolor" "TanLight"
"xpos" "140"
"ypos" "15"
@@ -43,10 +43,10 @@
{
"ControlName" "CExLabel"
"fieldName" "WaveCountLabelShadow"
- "font" "CerbeticaBold16"
+ "font" "Cerbetica14"
"fgcolor" "TransparentBlack"
- "xpos" "-2"
- "ypos" "-2"
+ "xpos" "-1"
+ "ypos" "-1"
"zpos" "3"
"wide" "200"
"tall" "15"
@@ -75,7 +75,8 @@
"PaintBackgroundType" "2"
"bgcolor_override" "TanLight"
- if_verbose {
+ if_verbose
+ {
"visible" "1"
}
}
@@ -84,7 +85,7 @@
{
"ControlName" "CExLabel"
"fieldName" "SupportLabel"
- "font" "CerbeticaBold14"
+ "font" "Cerbetica14"
"fgcolor" "TanLight"
"xpos" "55"
"ypos" "6"
@@ -96,7 +97,8 @@
"textAlignment" "west"
"labelText" "#TF_MVM_Support"
- if_verbose {
+ if_verbose
+ {
"visible" "1"
}
}
@@ -144,7 +146,6 @@
"fieldName" "ProgressBarBG"
"xpos" "210"
"ypos" "19"
- "ypos_minmode" "9"
"zpos" "3"
"wide" "180"
"tall" "12"
diff --git a/resource/ui/winpanel.res b/resource/ui/winpanel.res
index b7f8e1c..3eb76e8 100644
--- a/resource/ui/winpanel.res
+++ b/resource/ui/winpanel.res
@@ -46,12 +46,12 @@
{
"ControlName" "CExLabel"
"fieldName" "BlueTeamLabel"
- "font" "Cerbetica24"
+ "font" "HudFontMedium"
"labelText" "%blueteamname%"
"textAlignment" "west"
"xpos" "4"
"ypos" "13"
- "zpos" "10"
+ "zpos" "3"
"wide" "75"
"tall" "28"
"autoResize" "0"
@@ -64,7 +64,7 @@
{
"ControlName" "CExLabel"
"fieldName" "BlueTeamScore"
- "font" "Cerbetica48"
+ "font" "Cerbetica40"
"labelText" "%blueteamscore%"
"textAlignment" "east"
"xpos" "15"
@@ -81,7 +81,7 @@
{
"ControlName" "CExLabel"
"fieldName" "BlueTeamScoreDropshadow"
- "font" "Cerbetica48"
+ "font" "Cerbetica40"
"fgcolor" "TransparentBlack"
"labelText" "%blueteamscore%"
"textAlignment" "east"
@@ -120,12 +120,12 @@
{
"ControlName" "CExLabel"
"fieldName" "RedTeamLabel"
- "font" "Cerbetica24"
+ "font" "HudFontMedium"
"labelText" "%redteamname%"
"textAlignment" "east"
"xpos" "122"
"ypos" "13"
- "zpos" "1"
+ "zpos" "3"
"wide" "75"
"tall" "28"
"autoResize" "0"
@@ -138,7 +138,7 @@
{
"ControlName" "CExLabel"
"fieldName" "RedTeamScore"
- "font" "Cerbetica48"
+ "font" "Cerbetica40"
"labelText" "%redteamscore%"
"textAlignment" "west"
"xpos" "105"
@@ -155,7 +155,7 @@
{
"ControlName" "CExLabel"
"fieldName" "RedTeamScoreDropshadow"
- "font" "Cerbetica48"
+ "font" "Cerbetica40"
"fgcolor" "TransparentBlack"
"labelText" "%redteamscore%"
"textAlignment" "west"
@@ -195,12 +195,12 @@
{
"ControlName" "EditablePanel"
"fieldName" "WinPanelBGBorder"
- "xpos" "9999"
- "ypos" "9999"
+ "xpos" "cs-0.5"
+ "ypos" "70"
"zpos" "0"
- "wide" "500"
- "tall" "80"
- "visible" "1"
+ "wide" "p0.94"
+ "tall" "185"
+ "visible" "0"
"enabled" "1"
"scaleImage" "1"
"border" "TFFatLineBorderBlueBG"
@@ -208,27 +208,24 @@
}
"WinPanelBG2"
{
- "ControlName" "ImagePanel"
+ "ControlName" "EditablePanel"
"fieldName" "WinPanelBG2"
"xpos" "0"
"ypos" "55"
- "zpos" "0"
+ "zpos" "-3"
"wide" "300"
"tall" "152"
"visible" "1"
"enabled" "1"
- "scaleImage" "1"
- "fillcolor" "0 0 0 250"
- "src_corner_height" "3"
- "src_corner_width" "3"
- "draw_corner_width" "0"
- "draw_corner_height" "0"
+ "paintborder" "0"
+ "bgcolor_override" "TransparentBlack"
+ "PaintBackgroundType" "2"
}
"WinningTeamLabel"
{
"ControlName" "CExLabel"
"fieldName" "WinningTeamLabel"
- "font" "CerbeticaBold20"
+ "font" "Cerbetica20"
"xpos" "10"
"ypos" "54"
"zpos" "1"
@@ -247,7 +244,7 @@
{
"ControlName" "CExLabel"
"fieldName" "WinningTeamLabelDropshadow"
- "font" "CerbeticaBold20"
+ "font" "Cerbetica20"
"fgcolor" "TransparentBlack"
"xpos" "-1"
"ypos" "-1"
@@ -256,8 +253,8 @@
"tall" "40"
"autoResize" "0"
"pinCorner" "0"
- "visible" "1"
- "enabled" "1"
+ "visible" "0"
+ "enabled" "0"
"labelText" "%WinningTeamLabel%"
"textAlignment" "Center"
"dulltext" "0"
@@ -271,7 +268,7 @@
{
"ControlName" "CExLabel"
"fieldName" "AdvancingTeamLabel"
- "font" "CerbeticaBold20"
+ "font" "Cerbetica20"
"xpos" "10"
"ypos" "59"
"zpos" "1"
@@ -290,7 +287,7 @@
{
"ControlName" "CExLabel"
"fieldName" "AdvancingTeamLabelDropshadow"
- "font" "CerbeticaBold20"
+ "font" "Cerbetica20"
"fgcolor" "TransparentBlack"
"xpos" "-1"
"ypos" "-1"
@@ -321,7 +318,7 @@
{
"ControlName" "CExLabel"
"fieldName" "DetailsLabel"
- "font" "Cerbetica9"
+ "font" "ScoreboardVerySmall"
"xpos" "10"
"ypos" "82"
"zpos" "1"
@@ -347,7 +344,7 @@
{
"ControlName" "CExLabel"
"fieldName" "TopPlayerLabel"
- "font" "Cerbetica9"
+ "font" "ScoreboardVerySmall"
"xpos" "15"
"ypos" "100"
"zpos" "3"
@@ -366,7 +363,7 @@
{
"ControlName" "CExLabel"
"fieldName" "PointsThisRoundLabel"
- "font" "Cerbetica9"
+ "font" "ScoreboardVerySmall"
"xpos" "45"
"ypos" "100"
"zpos" "3"
@@ -655,7 +652,7 @@
{
"ControlName" "CExLabel"
"fieldName" "KillStreakLeaderLabel"
- "font" "Cerbetica9"
+ "font" "ScoreboardVerySmall"
"xpos" "15"
"ypos" "164"
"zpos" "3"
@@ -675,7 +672,7 @@
{
"ControlName" "CExLabel"
"fieldName" "KillStreakMaxCountLabel"
- "font" "Cerbetica9"
+ "font" "ScoreboardVerySmall"
"xpos" "116"
"ypos" "0"
"zpos" "3"