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

core: More fixes for mixed AVM #14276

Merged
merged 2 commits into from
Dec 16, 2023

Conversation

Lord-McSweeney
Copy link
Collaborator

@Lord-McSweeney Lord-McSweeney commented Dec 2, 2023

Fixes #14264, closes #10759

@Lord-McSweeney
Copy link
Collaborator Author

I need a little more time to figure out some of the correct behaviors

@Lord-McSweeney Lord-McSweeney marked this pull request as draft December 2, 2023 06:57
@Lord-McSweeney Lord-McSweeney marked this pull request as ready for review December 2, 2023 19:41
@Lord-McSweeney
Copy link
Collaborator Author

This relies on #13889

@torokati44
Copy link
Member

This relies on #13889

But that is still a draft. Is it because of @Toad06's concern?

Copy link
Member

@torokati44 torokati44 left a comment

Choose a reason for hiding this comment

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

While I haven't tested it myself, I trust @Lord-McSweeney in this area, and the changes themselves look logical and fine.

@torokati44 torokati44 added mixed-avm Mixing AVM1 and AVM2 waiting-on-author Waiting on the PR author to make the requested changes and removed waiting-on-review Waiting on review from a Ruffle team member labels Dec 13, 2023
@torokati44 torokati44 enabled auto-merge (rebase) December 16, 2023 17:51
@torokati44
Copy link
Member

Thanks for the comment, merging!

@Lord-McSweeney Lord-McSweeney removed the waiting-on-author Waiting on the PR author to make the requested changes label Dec 16, 2023
@torokati44 torokati44 merged commit 375c99e into ruffle-rs:master Dec 16, 2023
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
mixed-avm Mixing AVM1 and AVM2
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Bloons: Doppleprimeape issue Error on Jump!
4 participants