Sync upstream PR #68: attack perimeter and player frame bars - #11
Merged
Conversation
Agent/fix player exp progress
Takes itsspin/spinips 8a4aef1: the native foreground attack perimeter, an unmistakable auto-attack pulse, and tightened player frame progression bars, with the combat UI audit and painting tools updated to match. No conflicts. This slice touches only SpinUI skin XML, two new textures and the combat UI tooling, none of which this fork has changed. Verified: release quality gate ALL PASS, including the rewritten audit_combat_ui.py that now checks 14 foreground native attack perimeters. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
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.
Second of four staged merges. One PR per upstream PR, each merged before the next, so every step has its own CI run and revert point (
git revert -m 1 <merge>).31571ab8a4aef1ca5bc5bf04c861What comes in
The native foreground attack perimeter, an unmistakable auto-attack pulse, and tightened player frame progression bars — with
audit_combat_ui.py,paint_attack_indicator.pyandrestyle_combat.pyupdated to match.Conflicts
None. This slice touches only SpinUI skin XML, two new textures, and the combat UI tooling — none of which this fork has modified. The hard slice was itsspin#67.
Verification
Release quality gate
ALL PASS, including upstream's rewritten combat audit, which now checks 14 foreground native attack perimeters against the new frames.🤖 Generated with Claude Code