Rebasing Upstream: Friendship Is Magic#65
Open
jason-oliveira wants to merge 9 commits intoRender96:masterfrom
Open
Rebasing Upstream: Friendship Is Magic#65jason-oliveira wants to merge 9 commits intoRender96:masterfrom
jason-oliveira wants to merge 9 commits intoRender96:masterfrom
Conversation
Fixes controllers which don't check for rumble_strength and have constant rumble from rumbling even when set to 0 in the config.
Check for zero rumble setting before allowing rumble
Update README_es_ES.md
Fix by PeachyPeach to stop crashes with Discord Integration when enter later Bowser courses and fights early
Bugfix: Discord Integration crashes
Revert "Bugfix: Discord Integration crashes"
|
Yes please! |
|
@jason-oliveira i know it’s been 3 years but I would consider rebasing the nightly branch of sm64ex |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Please rebase.