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

Jump to bottom

Game flow follow-up work #2361

Open
wants to merge 17 commits into
base: develop
Choose a base branch
from
Open

Game flow follow-up work #2361

wants to merge 17 commits into from
+1,729 −1,862

Conversation

rr-
Copy link
Collaborator

@rr- rr- commented Jan 22, 2025 •
edited
Loading

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

  • Resolves TR1X bug: story so far in Folly is missing its opening FMV #2360
  • Fixes some tiny memory leaks in TR1 and TR2
  • Moves "demos" to their own key in the TR2 gameflow JSON
  • Does internal refactors to TR1 in preparation to merge via TRX (very preliminary work)
  • Merges start_cine TR1 sequence event to start_game
  • Merges stop_game TR1 sequence event to loop_game (they were always placed together)
  • Merges loop_cine TR1 sequence event to loop_game
  • Makes the level_num in the play_level TR2 sequence event optional
  • Removes camera position sequence events from TR1 as they seem to be no longer required

More refactors to come…

@rr- rr- added TRX bug A bug with TRX Internal The invisible stuff TR2 TR1 labels Jan 22, 2025
@rr- rr- self-assigned this Jan 22, 2025
@rr- rr- requested review from a team as code owners January 22, 2025 22:20
@rr- rr- requested review from lahm86, walkawayy and aredfan and removed request for a team January 22, 2025 22:20
@github-actions GitHub Actions
Copy link

github-actions bot commented Jan 22, 2025 •
edited
Loading

Download the built assets for this pull request:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lahm86 lahm86 Awaiting requested review from lahm86 lahm86 is a code owner automatically assigned from LostArtefacts/dev

@walkawayy walkawayy Awaiting requested review from walkawayy walkawayy is a code owner automatically assigned from LostArtefacts/dev

@aredfan aredfan Awaiting requested review from aredfan aredfan is a code owner automatically assigned from LostArtefacts/qa

At least 1 approving review is required to merge this pull request.

Assignees

@rr- rr-

Labels
Internal The invisible stuff TR1 TR2 TRX bug A bug with TRX
Projects
TRX Dev tracker
Status: In review
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

TR1X bug: story so far in Folly is missing its opening FMV
1 participant
@rr-