Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HUD Consistency and Overlap Fixes #46

Merged
merged 19 commits into from
Apr 3, 2022
Merged

HUD Consistency and Overlap Fixes #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
eb75ca8
HUD Element movement
DankMachine Apr 2, 2022
7397d94
Chat box
DankMachine Apr 2, 2022
0362c4c
Chat box
DankMachine Apr 2, 2022
853dd5d
Stickybomb Counter
DankMachine Apr 2, 2022
b923f18
Head Counter (and all subsequent counters)
DankMachine Apr 2, 2022
6ac6263
Update huditemeffectmeter_engineer.res
DankMachine Apr 2, 2022
f8b8ff8
Moved to atop the ammo counter.
DankMachine Apr 2, 2022
68ee112
Phlogistinator Consistency Fix
DankMachine Apr 2, 2022
4375fc3
Now exact same as Demoman
DankMachine Apr 2, 2022
a6fdd93
Realigned to be consistent with other counters.
DankMachine Apr 2, 2022
d550753
Moves Chat Box to not overlap Disguise Panel
DankMachine Apr 2, 2022
4adceed
Moves Chat Box to not overlap Disguise Panel
DankMachine Apr 2, 2022
c826117
Updated Chat Box
DankMachine Apr 2, 2022
7857e0b
Updated Chat Box
DankMachine Apr 2, 2022
236b600
Updated Chat Box
DankMachine Apr 2, 2022
50a8c45
Updated Stickybomb Counter
DankMachine Apr 2, 2022
704c873
Updated Stickybomb Counter
DankMachine Apr 2, 2022
4c4d464
Minor amendments to #46
CriticalFlaw Apr 3, 2022
76d0168
Removed files that did not need to be changed
CriticalFlaw Apr 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions resource/ui/huditemeffectmeter_demoman.res
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"fieldName" "HudItemEffectMeter"
"visible" "1"
"enabled" "1"
"xpos" "r162" [$WIN32]
"xpos" "r255" [$WIN32]
"ypos" "r52" [$WIN32]
"xpos_minmode" "r150" [$WIN32]
"ypos_minmode" "r38" [$WIN32]
Expand Down Expand Up @@ -99,4 +99,4 @@
"brighttext" "0"
"font" "HudFontMedium"
}
}
}
9 changes: 0 additions & 9 deletions resource/ui/huditemeffectmeter_engineer.res
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1 @@
#base "huditemeffectmeter_demoman.res"

"resource/ui/huditemeffectmeter_engineer.res"
{
HudItemEffectMeter
{
"x_offset" "45"
"x_offset_minmode" "20"
}
}
10 changes: 9 additions & 1 deletion resource/ui/huditemeffectmeter_pomson.res
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,9 @@
#base "huditemeffectmeter_cleaver.res"
#base "huditemeffectmeter_cleaver.res"

"resource/ui/huditemeffectmeter_pomson.res"
{
HudItemEffectMeter
{
"x_offset" "60"
}
}
4 changes: 2 additions & 2 deletions resource/ui/huditemeffectmeter_powerupbottle.res
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"visible" "1"
"enabled" "1"
"xpos" "r86" [$WIN32]
"ypos" "r142" [$WIN32]
"ypos" "r110" [$WIN32]
"xpos_minmode" "r70" [$WIN32]
"ypos_minmode" "r135" [$WIN32]
"wide" "100"
Expand Down Expand Up @@ -117,4 +117,4 @@
"font" "HudFontMedium"
"font_minmode" "HudFontMediumSmall"
}
}
}
1 change: 1 addition & 0 deletions resource/ui/huditemeffectmeter_pyro.res
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#base "huditemeffectmeter_cleaver.res"
9 changes: 0 additions & 9 deletions resource/ui/huditemeffectmeter_sniper.res
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1 @@
#base "huditemeffectmeter_demoman.res"

"resource/ui/huditemeffectmeter_sniper.res"
{
HudItemEffectMeter
{
"x_offset" "45"
"x_offset_minmode" "0"
}
}
5 changes: 2 additions & 3 deletions resource/ui/huditemeffectmeter_spy.res
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
{
HudItemEffectMeter
{
"x_offset" "135"
"x_offset_minmode" "0"
"x_offset" "60"
}
}
}
8 changes: 4 additions & 4 deletions scripts/hudlayout.res
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,9 +243,9 @@
CHudAccountPanel
{
"fieldName" "CHudAccountPanel"
"xpos" "r82" [$WIN32]
"xpos" "r160" [$WIN32]
"xpos_minmode" "r122" [$WIN32]
"ypos" "r192" [$WIN32]
"ypos" "r152" [$WIN32]
"ypos_minmode" "r134" [$WIN32]
"xpos" "r194" [$X360]
"ypos" "r174" [$X360]
Expand Down Expand Up @@ -1082,9 +1082,9 @@
"fieldName" "HudDemomanPipes"
"visible" "1"
"enabled" "1"
"xpos" "r85" [$WIN32]
"xpos" "r165" [$WIN32]
"xpos_minmode" "r110" [$WIN32]
"ypos" "r95" [$WIN32]
"ypos" "r52" [$WIN32]
"ypos_minmode" "r30" [$WIN32]
"xpos" "r194" [$X360]
"ypos" "r74" [$X360]
Expand Down