Skip to content

Merge develop-rena -> develop#1258

Merged
Eblo merged 14 commits intodevelopfrom
develop-rena
Sep 3, 2025
Merged

Merge develop-rena -> develop#1258
Eblo merged 14 commits intodevelopfrom
develop-rena

Conversation

@Eblo
Copy link
Contributor

@Eblo Eblo commented Sep 1, 2025 •
edited by github-actions bot
Loading

mckinlee and others added 14 commits July 25, 2025 08:10
@mckinlee
add health check preventing hop counter reset on death (#1214)
1c7be58
@Eblo
Fix rando refills for Chateau Romani (#1216)
0f745ff
@balloondude2
Allow access to smithy checks without a sword (#1208)
05c3d81
@Eblo
Fix float slider labels (#1210)
4e0356f
@Eblo
Do not allow gameover audio to be changed (#1225)
76b34bf
@Eblo
Fix slider labels where position is None (#1227)
27c3822
@Eblo
Fix BSoDT bugs with audio and early day change (#1228)
cad8a77
@Eblo
Properly configure INCLUDE_MPQ_SUPPORT (#1243)
cda1b7b
@Eblo
Check previousBankValue in custom bank thresholds (#1232)
bd62d64
@Eblo
Restore vertices after geometry seams patch (#1237)
f67f3f2
@Eblo
Fix softlock with Magic Hag's Blue Potion (#1252)
c8407db
@Eblo
Revert "Fix cracking/buzzing with streamed audio (#1153)" (#1233)
31f1827 
This reverts commit 120c657.
@Eblo
[Rando] Reset cycle collectible flags on cycle save (#1254)
a07bf79
@balloondude2
bump to Rena Bravo (#1257)
ee1a045
@Eblo Eblo merged commit 47771de into develop Sep 3, 2025
13 checks passed
@Eblo Eblo deleted the develop-rena branch September 3, 2025 12:38
@Eblo Eblo restored the develop-rena branch September 3, 2025 12:39
Eblo added a commit that referenced this pull request Sep 10, 2025
@Eblo
Revert "Merge develop-rena -> develop (#1258)"
a8a6c7b 
This reverts commit 47771de.
@Eblo Eblo mentioned this pull request Sep 10, 2025
Merged
Eblo added a commit that referenced this pull request Sep 10, 2025
@Eblo
Revert "Merge develop-rena -> develop (#1258)" (#1269)
df18c6d 
This reverts commit 47771de.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@balloondude2 balloondude2 balloondude2 approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@Eblo @balloondude2 @mckinlee