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

lara: fix jump-twist state softlock #890

Merged
merged 1 commit into from
Jul 14, 2023

Conversation

lahm86
Copy link
Collaborator

@lahm86 lahm86 commented Jul 14, 2023

Resolves #889.

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

Description

I discovered I had missed the collision routine for twists in #802, so I believe this bug was a result of unknown behaviour there. In addition to this, I have added guards to the post-twist animations to ensure that if Lara is on the floor, her goal state should no longer be twist. It is a very difficult bug to reproduce, but Eycore provided a save with the issue and this fix allows that save to be played from again, plus I have not been able to reproduce the bug again after testing several scenarios.

Thanks as well to @Trxyebeep for input on this issue.

@lahm86 lahm86 added the TRX bug A bug with TRX label Jul 14, 2023
@lahm86 lahm86 requested review from rr- and walkawayy July 14, 2023 11:35
Copy link
Collaborator

@rr- rr- left a comment

Choose a reason for hiding this comment

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

LGTM. @walkawayy @lahm86 what do you think about publishing the current develop as a hotfix 2.15.1?

@lahm86
Copy link
Collaborator Author

lahm86 commented Jul 14, 2023

LGTM. @walkawayy @lahm86 what do you think about publishing the current develop as a hotfix 2.15.1?

That sounds good to me. The only way currently you could workaround this softlock would be to enter and exit DOZY, but that's obviously not ideal.

@walkawayy
Copy link
Collaborator

Ya hotfix sounds good. I'm afk for a bit so I can't test right now.

@rr-
Copy link
Collaborator

rr- commented Jul 14, 2023

Please LMK here or in Discord once this gets merged so that I can do the release.

@lahm86 lahm86 merged commit c8df4ad into LostArtefacts:develop Jul 14, 2023
1 check passed
@lahm86
Copy link
Collaborator Author

lahm86 commented Jul 14, 2023

Please LMK here or in Discord once this gets merged so that I can do the release.

Apologies, I got distracted. Should be good to go 👍

@lahm86 lahm86 deleted the issue-889-jump-twist-lock branch July 14, 2023 15:11
@rr- rr- added this to the 2.15.1 milestone Jul 14, 2023
@lahm86 lahm86 mentioned this pull request Aug 20, 2023
2 tasks
@rr- rr- added the TR1 label Oct 3, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
TR1 TRX bug A bug with TRX
Projects
None yet
Development

Successfully merging this pull request may close these issues.

T1M bug: jump-twist animation can lock near low ceilings
3 participants