Mouse let it snow#12
Open
lilacLunatic wants to merge 189 commits intodevelopfrom
Open
Conversation
…o mouse MacReady Delta
…o mouse MacReady Echo
* commit to merge * rewrite fire and fix deku
* Zora's River waterfall opens instantly * VB cleanup * Move it all to VB hook * Fix build errors * Null safety
* VBify poe collector giving for rando. * Forgot an include. * Further refinement so all the action happens in the handler. Virtual full restoration of vanilla code flow. * Restored 1000 point messages before rando item give. * Cleanup redundant GI Should call.
…ere u8 to s32 to avoid value overflow. (HarbourMasters#4463)
* rewrite forest logic, add swim to lake logic * fix small oops * oops
* Skip walking away cutscene when freeing Gorons * Revert a change too far * Restore Goron walking out animation
* Bump LUS * bump LUS * bump lus (again) * bump LUS again
* Automate settings text to enum conversion * rename fortress setting into carpenters * More renames for the new spoiler log layout
* Potsanity proof of concept * Hide pot item cutscenes for very frequent items * Add 1 new pot to the item pool * V1 custom pot model * V2 pot model * Pushing for help. lol * Format clean up on added hint_list entries. Removal of WriteIngameSpoilerLog call that was unneeded. * THREE_ACTOR_PARAMS -> TWO_ACTOR_PARAMS and hints in a loop * Lost woods pots logic * Realign Pot Checklist in Location_list.cpp * Correcting some values and adding Master Quest pots. * Remove vanilla placements * Re-order enums + start hints per region * Fix build * Break up shuffle pot options to dungeon/overworld/all * Fixes * Prepare default pot contents, fix/add dungeons * Fix dungeon/overworld only settings * Updates to Parameters and RHT information * Remove unused hints * Add proper check tracker entry exclusion * Tweak items to skip cutscenes for * Vanilla Drop List * Update magic to blue rupees * After merge fixes * Fix Ganondorf's Lair pots * Fix check tracker + minor stuff * Unlock early GBK door * Minor fixes * More minor stuff and start of logic entries * Fix TWO_ACTOR_PARAMS overlap between pots * De-dupe defines * Add missing water trial pot * Update to develop-rando * VBify pots progress * Cleanup and fixes * Overworld logic done * Cleanup and fix item00 queues * Implement skipping cutscenes for common items * Revert "Implement skipping cutscenes for common items" This reverts commit fe44916. * Ganons tower pot not spawning item fix + cleanup * Fix ganon's tower, barinade, water temple pots * VBify ganons key door * Lizalfos Pot addition (example) * Separate MQ pots in randomizerTypes.h * Fix build * Fix linux build (?) * DC/Jabu/Botw/ start of Forest Pots (NMQ) * Remaining Dungeon Non MQ Pot Location Logic * After merge fixes round 1 * Post merge fixes round 2 * Apply MQ pot logic * Re-align some stuff * Cleanup, more work on locationlist * Start of handling dungeon pots in item pool * Finish dungeon pots in item pool * GTG MQ Pots * Review comments round 1 & code cleanup * Fix ganon's lair pots being behind GBK in logic * Update soh/include/z64actor.h Co-authored-by: Pepe20129 <72659707+Pepe20129@users.noreply.github.com> * Update soh/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c Co-authored-by: Pepe20129 <72659707+Pepe20129@users.noreply.github.com> * Address review comment * Fix logic for pots in Fire Temple * Fix GtG MQ pots, fix water temple pot logic * Review Comments * Logic review part 1 * Logic comments part 2 --------- Co-authored-by: Caladius <Caladius@users.noreply.github.com> Co-authored-by: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com> Co-authored-by: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>
* CC random buttons fix * Archez's fix
* Skip fire arrow spawn cutscene after shooting sun * Fix * Reorganize VB flags in enum * A bit of VB cleanup
* Skip Biggoron's waking up cutscene * Allow fast speaking and trading
…new separate CVars. (HarbourMasters#4692)
* Add Snow Golems (Skeleton override) * update snowball to use new snowball DL
…pwright into let-it-snow
…OOT into let-it-snow
`develop` -> `let-it-snow`
* [Holiday] Custom rainbows * Update soh/soh/Enhancements/Holiday/LL.h Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com> --------- Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.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
16 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