Repository navigation
Conversation
# Conflicts: # src/mods/Loader.lua
# Conflicts: # docs/modding.md # src/mods/Loader.lua # src/world/WorldAPI.lua
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
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.
Restore Gen1’s default SAVE/LOAD/SPEED/COLOR/TILT/ZOOM touch strip in the native controller, editor placement, safe-area sizing and persistent mobile OPTIONS toggle. The six cells call the actual native engine keyboard owner. Add missing key-1 speed cycling and retain ownership of the entire virtual-control gesture through synchronous reset/screen changes. Native shoulder/Gen4 controls remain with their existing owner.
Depends on #383 and its #124 viewport prerequisites; those must merge first. This is an offered stack, not a current-main mergeability claim. Focused diff: https://github.com/Roxas2712/Gen2Recomped/compare/codex/upstream-touch-skin-stack...codex/upstream-touch-hotbar . The offered older base uses its actual world-on-stack and flat OPTIONS owners; the tests exercise those owners rather than importing the fork’s newer screen tree.
Validation: exact77510a8f native hotbar271 and skin65 assertions pass. Copied Gen1 hotbar51, haptics37, viewport56 and orientation12 focused regressions also pass. A real-host integration test exposed a missing speedLocked service in the prerequisite skin stack that a narrow test double had hidden. That fix is now also pushed to #383: real native fixed-speed/link ownership governs both preference cycling and the actual logic multiplier. Actual memory-file save/load, native speed/palette/tilt/zoom owners, ordinary OPTIONS input, real editor dragging, safe-area rotations and complete pointer ownership are covered.
Separately, the fork integration passes Metal/OpenGL actual GPU hotbar comparisons against pinned Gen1:14 strip framebuffers/backend at equal user-selected geometry, six key pairs/orientation and restored release artwork. Those runs do not qualify this upstream source, OS touch, full-mod playability, performance or a release. This is a draft increment; full SkinStudio and comprehensive parity qualification remain open.
Provenance: identified hotbar geometry/drawing and adapted reference test originate in Gen1Recomp535a5ec0, Copyright(C)2026 BOIS CLUB GAMES, LLC. GPLv3/Section7 are preserved in licenses/GEN1RECOMP-TOUCH-SKINS.md. Independently owned integration contributions by Roxas2712 are expressly offered to Cedric/UNDERdecoded under LICENSE-ROXAS2712.md with visible credit, subject to existing GPL obligations and prior grants. No proprietary Gen1 launcher code or excluded artwork is copied; mods and player profiles remain untouched.
Current head e5a5c75 includes runtime a3f0d34 and its required README/visible native credits. Full composed studio-stack c23c662 has117/127 engine suites and3/3 SDK passing; its ten failures still need baseline attribution. This does not alter the passing focused hotbar271/skin65 scope, and no full upstream CI/main-mergeability acceptance is claimed.