Skip to content

Sync upstream PR #68: attack perimeter and player frame bars - #11

Merged
JDS300 merged 5 commits into
mainfrom
sync/upstream-68-combat-frames
Aug 14, 2026
Merged

Sync upstream PR #68: attack perimeter and player frame bars#11
JDS300 merged 5 commits into
mainfrom
sync/upstream-68-combat-frames

Conversation

@JDS300

@JDS300 JDS300 commented Aug 14, 2026

Copy link
Copy Markdown
Owner

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>).

Step Upstream PR Contents Status
1 itsspin#67 31571ab themes, SpinTexture, sounds merged (#10)
2 itsspin#68 8a4aef1 attack perimeter, player frame bars this PR
3 itsspin#72 ca5bc5b progression journal, secure updates queued
4 itsspin#73 f04c861 Windows updater path fix queued

What 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.py and restyle_combat.py updated 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

itsspin and others added 5 commits August 12, 2026 18:43
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>
@JDS300
JDS300 merged commit af36c35 into main Aug 14, 2026
6 checks passed
@JDS300
JDS300 deleted the sync/upstream-68-combat-frames branch August 14, 2026 12:40
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.

2 participants