Skip to content

rebase of gamemodes branch onto main - #149

Merged
Mr-Wiseguy merged 15 commits into
N64Recomp:mainfrom
gcsmith:gamemodes_rebase
Aug 3, 2026
Merged

Mr-Wiseguy merged 15 commits into
N64Recomp:mainfrom
gcsmith:gamemodes_rebase

Conversation

@gcsmith

@gcsmith gcsmith commented May 27, 2026

Copy link
Copy Markdown
Contributor

No description provided.

@Mr-Wiseguy
Mr-Wiseguy merged commit 589bbf0 into N64Recomp:main Aug 3, 2026
10 checks passed
amazingalek added a commit to amazingalek/N64ModernRuntime-web that referenced this pull request Oct 12, 2026
…trol, controller fixes, is_entrypoint

The web branch was on ca568b6, the gamemodes branch upstream squashed into main as N64Recomp#149. Main adds what came after it:
recomp::Configuration and ultramodern::MessageQueueControl (N64Recomp#131, which Zelda64Recomp's recomp-frontend branch uses),
controller and rumble fixes, nlohmann json 3.12, the is_entrypoint API (main renamed entrypoint, N64Recomp#147) and stack
arguments in _arg (N64Recomp#138). N64Recomp is N64Recomp-web with upstream's 81213c1 merged in, the commit main pins.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants