Skip to content

Conversation

@TechnikTil
Copy link
Contributor

REQUIRES FunkinCrew/Funkin#4608 TO BE MERGED!!

Does this PR fix any issues?

FunkinCrew/Funkin#4605, FunkinCrew/Funkin#2833

What does this PR do?

This PR adds the Pause Menu to most cutscenes, and adding the ability to pause, skip, and restart if they haven't had that ability already.

I say most, as the Winter Horrorland cutscene is still hardcoded.

@TechnikTil
Copy link
Contributor Author

is in draft because i gotta rebase ONE more time

@TechnikTil TechnikTil force-pushed the add-pause-to-ingame-cutscenes branch from cac3ca0 to 11446b8 Compare August 1, 2025 19:04
@TechnikTil TechnikTil marked this pull request as ready for review August 1, 2025 19:04
@TechnikTil
Copy link
Contributor Author

TechnikTil commented Aug 1, 2025

there we go
(needed to cherry-pick this one)

@Hundrec Hundrec added size: huge A huge pull request with more than 500 changes. pr: hscript PR modifies game scripts. type: enhancement Provides an enhancement or new feature. status: pending triage Awaiting review. labels Aug 1, 2025
@AbnormalPoof AbnormalPoof force-pushed the main branch 2 times, most recently from 34fd992 to c371066 Compare August 2, 2025 16:59
@AbnormalPoof AbnormalPoof changed the base branch from main to develop August 2, 2025 17:07
@TechnikTil
Copy link
Contributor Author

ok so fixing merge conflicts from the website sucks

@TechnikTil TechnikTil force-pushed the add-pause-to-ingame-cutscenes branch from 811375f to 11446b8 Compare August 3, 2025 03:39
@github-actions github-actions bot added pr: github PR modifies GitHub metadata files. pr: documentation PR modifies documentation or README files. labels Aug 3, 2025
@TechnikTil
Copy link
Contributor Author

how did that not do anything??

@TechnikTil
Copy link
Contributor Author

TechnikTil commented Aug 3, 2025

something is fucked up here, its giving me merge conflicts for stuff i havent changed
i might need to do cherry-picking again

@TechnikTil TechnikTil force-pushed the add-pause-to-ingame-cutscenes branch from b1e6c6c to 83328b8 Compare August 3, 2025 04:06
@github-actions github-actions bot added pr: art PR modifies art or animations. pr: audio PR modifies sound or music. and removed pr: github PR modifies GitHub metadata files. pr: documentation PR modifies documentation or README files. labels Aug 3, 2025
@TechnikTil
Copy link
Contributor Author

oh dear god

@TechnikTil
Copy link
Contributor Author

image

😭

@TechnikTil TechnikTil force-pushed the add-pause-to-ingame-cutscenes branch from 83328b8 to 722ea83 Compare August 3, 2025 04:30
@github-actions github-actions bot removed pr: art PR modifies art or animations. pr: audio PR modifies sound or music. labels Aug 3, 2025
@TechnikTil
Copy link
Contributor Author

TechnikTil commented Aug 3, 2025

FINALLY!! I DID IT!

@TechnikTil TechnikTil marked this pull request as draft August 3, 2025 23:25
@TechnikTil
Copy link
Contributor Author

TechnikTil commented Aug 3, 2025

yeah...

8mb.video-suD-A3p8O0s0.mp4

(video by @JackXson-Real)

@JackXson-Real
Copy link
Contributor

FINALLY!! I DID IT!

Does he know

@TechnikTil
Copy link
Contributor Author

Does he know

the ONE time where i dont playtest

@AbnormalPoof AbnormalPoof force-pushed the develop branch 3 times, most recently from e0ba6ab to bcd30e1 Compare August 4, 2025 17:51
@Hundrec Hundrec added the topic: associated Has an associated pull request in the Funkin repository. label Sep 2, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

pr: hscript PR modifies game scripts. size: huge A huge pull request with more than 500 changes. status: pending triage Awaiting review. topic: associated Has an associated pull request in the Funkin repository. type: enhancement Provides an enhancement or new feature.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants