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

Move pause phase to libtrx; add pause dialog to TR2 #2234

Merged
merged 5 commits into from
Jan 8, 2025
Merged

Move pause phase to libtrx; add pause dialog to TR2 #2234

merged 5 commits into from
Jan 8, 2025

Conversation

rr-
Copy link
Collaborator

@rr- rr- commented Jan 8, 2025

Checklist

  • I have read the coding conventions
  • I have added a changelog entry about what my pull request accomplishes, or it is an internal change
  • I have added a readme entry about my new feature or OG bug fix, or it is a different change

Description

This PR builds on top of #2232 and moves the pause phase – which already utilizes the new phase API – to libtrx, and backports it to TR2. Fortunately, there weren't many missing dependencies, which made the transition pretty straightforward. I've added is a fade-out effect to ensure a smooth transition when the player exits the pause screen, whether by alt+f4, navigating through the UIs, or simply pressing the pause key again. Plus, I've made it flexible for players to rebind the pause key, which is set to P by default.

Testing

We only need to test general interaction with the pause screen (including exiting the game through alt+f4) in both TR1 and TR2 with fade effects on and off.
I'm aware that the fade-out transitions when exiting the game aren't consistent for TR1 right now, but we'll fix that once we consolidate more phases.

@rr- rr- added Feature New functionality Internal The invisible stuff TR2 TR1 labels Jan 8, 2025
@rr- rr- self-assigned this Jan 8, 2025
@rr- rr- requested review from a team as code owners January 8, 2025 11:17
@rr- rr- requested review from lahm86, walkawayy and aredfan and removed request for a team January 8, 2025 11:17
@rr- rr- force-pushed the fader-improvements branch 2 times, most recently from ab74e45 to 49fd51c Compare January 8, 2025 16:04
@rr- rr- force-pushed the trx-pause branch 2 times, most recently from a1e8888 to c47bc90 Compare January 8, 2025 16:38
@rr- rr- force-pushed the fader-improvements branch from 3031ae7 to d9cbc33 Compare January 8, 2025 18:13
@aredfan
Copy link
Collaborator

aredfan commented Jan 8, 2025

  • Just one issue for TR2X, there's no Pause label in the controls option.

20250108_184526_Laras_Home

Base automatically changed from fader-improvements to develop January 8, 2025 18:59
@rr-
Copy link
Collaborator Author

rr- commented Jan 8, 2025

@aredfan updated.

Copy link
Collaborator

@lahm86 lahm86 left a comment

Choose a reason for hiding this comment

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

Looks great. Just a couple of things below, but additionally, if you use the console in TR2 while in the pause screen, it's not displayed (but still works).

src/tr2/game/gameflow.c Show resolved Hide resolved
docs/tr2/CHANGELOG.md Show resolved Hide resolved
@rr-
Copy link
Collaborator Author

rr- commented Jan 8, 2025

@lahm86 addressed all remarks.

@rr- rr- merged commit c11d514 into develop Jan 8, 2025
8 checks passed
@rr- rr- deleted the trx-pause branch January 8, 2025 22:24
@Richard-L
Copy link
Collaborator

@rr- When you load a game there is no fade when the inventory menu animates in.

@Richard-L
Copy link
Collaborator

Richard-L commented Jan 8, 2025

2025-01-09.00-56-03.mp4

"Paused" shouldn't show until the fade is at 100%.

Also the fade is a few milliseconds too long (?) compared to OG in video above.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature New functionality Internal The invisible stuff TR1 TR2
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

4 participants