Merge develop into enemy souls#18
Merged
Caladius merged 17 commits intoCaladius:develop-enemy-souls-v2from Jan 6, 2026
Merged
Conversation
…ters#1433) * Exclude Triforce from plentiful, add error handling * Add max check because unsigned
- Update curated preset - Fix column alignment on overlay menu - Generate spoiler file by default - Add timesplit file to gitignore
…into-develop-again
* Fix softlock from repeating Kafei's Mask check (HarbourMasters#1432) * Exclude Triforce from plentiful items, add error handling (HarbourMasters#1433) * Exclude Triforce from plentiful, add error handling * Add max check because unsigned * Bump for Mion Charlie (HarbourMasters#1434)
…lop-again Merge mion into develop again, unsquashed
* Add Clocks as Items feature * refactor * some clean up * forgot to clangify * use proper randoinf flags and some fixes * proper skipsotcutscene fix * Animated Clock Item (Thank you Caladius!) * Close attempt at animating the clock, not perfect but a good start. * Git gud Clock * fix clock item get crash Co-Authored-By: Caladius <Caladius@users.noreply.github.com> * some enhancements * logic refactor, minor changes, and new enhancements * huge rework * clang * fix a oops; any day, not current day * housekeeping and starting items menu support * splits up some milkroad regions and fixes a audio bug * i suck at merging * feedback update * scarecrow dance fix * add clocks to new item tracker * day 2 bean patches * add time logic to enemy drops and simplify day 2 bean macro * rebrand to "Shuffle Time" * more eblo feedback * some more feedback * rename feedback * pauseSaveEntrance fix * fix take 2 * Time Shuffle cleanup Fix pause save Time Shuffle bug Fix event queue daytelop bug Finish merge commit header include Clean up with shouldRegister Co-authored-by: mckinlee <mckinlee@ymail.com> --------- Co-authored-by: Caladius <Caladius@users.noreply.github.com> Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
* Fierce Deity Flipbook Support * implemented suggestions z_player_lib.c is no longer touched * Crash fix + Deku and Goron * clang-format failed fix
* initial implementation * oops * feedback
* alternative solution? * feedback
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
5 participants
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.
null
Build Artifacts