Feat/UI 5p - #87
Merged
Merged
Conversation
Provide psx_cyc_bb_defer_* helpers and soft-batch charge path so MotK generated code that uses GCC cleanup guards can compile against the merged netplay stack without waiting for the full FMV branch merge. Co-authored-by: Cursor <cursoragent@cursor.com>
STARVATION_RING_ENABLED builds referenced s_watchdog_throttle / s_pc_sample_throttle while the pin still defines the public psx_*_throttle globals. Co-authored-by: Cursor <cursoragent@cursor.com>
Implement list_lan_ips (GetAdaptersAddresses / getifaddrs), bump recomp-ui for the Host Lobby LAN IP combo, and keep UDP bind on 0.0.0.0. Co-authored-by: Cursor <cursoragent@cursor.com>
…andling. Keep LAN membership on the local registry/UDP path and online lobbies on the WebSocket server, return soft-exits to the same room for rematch, accept guest ephemeral peers, and fail LAN create when the UDP port is busy while online create auto-selects a free port. Bump recomp-ui for lobby UI updates. Co-authored-by: Cursor <cursoragent@cursor.com>
Games pass MAX_PLAYERS (2..5, default 2) to bake PSX_MAX_PLAYERS. SCPH-1070 multitap maps pads 0–3 on port 1 and pad 4 on port 2. Lobby max_slots and recomp-net slot_count follow the game player count; MotK stays at 2. Co-authored-by: Cursor <cursoragent@cursor.com>
Use the standalone feat/max-slots-5 and feat/netplay-5p commits instead of detached local bumps so submodule fetches resolve. Co-authored-by: Cursor <cursoragent@cursor.com>
Enabling SCPH-1070 during BIOS boot breaks pad/LoadExe bring-up for N-player titles. Offline builds arm multitap once fntrace sees game start; netplay still enables from slot_count >= 3. Co-authored-by: Cursor <cursoragent@cursor.com>
Discover recomp-ui from CMAKE_SOURCE_DIR/recomp-ui (or RECOMP_UI_ROOT). Keep lib/recomp-net in the engine. Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
Restore the six conflicted runtime files to the clean 5p tip so shared psxrecomp matches BPE again. Co-authored-by: Cursor <cursoragent@cursor.com>
Resolve main.cpp comment conflicts (keep MotK NETPLAY/P1 wording and fail-closed match_caps launch). Point lib/recomp-net at 5336f24 (same tree as local host-auth delay sync patch). Co-authored-by: Cursor <cursoragent@cursor.com>
it stops checking the entire PSX disc for full hash check every time the launcher runs, assuming the user's hash checked it when selecting the disc the first time and saving it to settings, so it just validates the file name and size instead, then it shares lifecycle with the launcher and the game to load the game faster, and several optimizations were made to loadstate paths which I think in the end relied on reanchoring host timings to the restored clock that came with the state
Keep 5p/ICE netplay host + lobby client; take master's cycle batching, SDL3 defaults, and dropped vendored lib/recomp-ui. Co-authored-by: Cursor <cursoragent@cursor.com>
Collaborator
Author
Latest merged (today)#87 Feat/UI 5p →
Also recent / open
PR | Status | Summary
-- | -- | --
#86 | Open | Host-independent validation of overlay_capture_persist_dir
#85 | Open | Register orphaned recompiler CTests
#84 | Merged | Versioned .psxmod runtime mod packages
#81 / #80 | Open | Mod-package loader framework; savestate code-cache invalidation
#79 / #78 | Merged | Native-wide GPU draw-area union; backdrop X stretch in native-wide
#77 | Merged | OpenBIOS — profile-driven redistributable BIOS recomp
#76 / #74 / #71 | Merged | Drop RmlUi leftovers; present letterbox/UV fixes; explicit bltz_sites cull widen
MAX_PLAYERS, multitap, N-slot netplay wiring |
mstan
added a commit
that referenced
this pull request
Jul 31, 2026
fix: revert destructive PR #87 runtime merge
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
1 participant
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.
No description provided.