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.

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

Adding Crispy-Hud for Hexen and align Heretic Crispy-Hud #1236

Merged
merged 27 commits into from
Nov 21, 2024

Conversation

Noseey
Copy link

@Noseey Noseey commented Nov 8, 2024

Related Issues:
Closes #1235
Closes #656

Changes Summary

Adding Crispy-Hud for Hexen:

  • Added Screenblock 12 for new optional crispy hud.
  • Limit screenblock inputs to max. 11 for view sizes and draw sliders.
  • Modified DrawFullScreenstuff to distinguish based on screenblock if crispy-hud or vanilla fullscreen hud.
  • Implemented crispy-hud in DrawFullScreenstuff aligning with aspect ratio.
  • Dont' draw Weapon-Pieces and Mana when Gem1 is overlapping with Mana.
  • Fixing Item alignment inside the Item Bar to match Standard Hud, also adjusted PatchSELECTBOX to be correct.

Aligning Crispy-Hud Heretic with Hexen:

  • Use height for Item Selector Box based upon the fullscreen vanilla HUD, not the Standard-Hud (same as in Hexen).
  • Dont' draw Ammo and Jewels when Gem2 is overlapping with Jewels (same as in Hexen).
  • Fix Position of Gem2 to match Standard Hud.

Noseey added 24 commits October 26, 2024 10:34
Raw Version of Crispy Hud
Alignment Keys and Armor in Fullscreen Hud
Update Comment
Expanding Screenblocks to 12.
Removal of unnecessary files.
Conservative Crispy Hud with moved jewels between Item and Ammo, height of widgets from the original hud.
Adjusted Jewels with original spacing to item
Update sb_bar.c to fix height of item selector
Cleanup comments and use non-transparent patch for item selector background.
Move Frags to be visible above health.
Moving Hud down by 10px
Fixing Findings for Pull-Request #1234 Crispy-Hud:
#1234
Added "return" in crispy hud condition to keep indentation of original code intact.
First rough version of Hexen crispy HUD, without shifting widgets or considering widescreendelta.
Shift widgets to the left and right, make it align with aspect ratio, fixing indentation.
Shifting down Hexen Crispy Hud by 7px. Cleanup comments.
Shifting up by 1px again, shifting item widget to the left instead of right.
Only draw health and ammo widget once the inventory is open.
Display frags even when inventory open, adding intersect check between ManaPatch2 and Gem1.
@Noseey
Copy link
Author

Noseey commented Nov 8, 2024

Do you happen to know how I can clean-up the commit-history to only show the recent changes and ignore the ones already merged before?

Fix Hexen Crispy-Hud Item-Alignment to match standard HUD.
To be consistent with the Hexen Crispy-Hud:
- Align height of Heretic HUD Item Selection Bar with vanilla fullscreen hud
- Don't draw Ammo and Jewels when Gem2 overlaps with Jewels
@Noseey Noseey changed the title Adding Crispy-Hud for Hexen Adding Crispy-Hud for Hexen and align Heretic Crispy-Hud Nov 18, 2024
Fixing PatchSELECTBOX Pos for Hexen Crispy-Hud by moving it 2px to the left to align with non-fullscreen standard hud.
Copy link
Owner

@fabiangreffrath fabiangreffrath left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

@fabiangreffrath fabiangreffrath merged commit f665d01 into fabiangreffrath:master Nov 21, 2024
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Suggestion] Hexen: Crispy Hud (Crispy Heretic) (Suggestion #3) Improved minimal HUD?
2 participants