Tentative de merge Dev Vers V3 #12
Closed
Conversation
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
… in network thread (HarbourMasters#5969)
* Added new trick Skip Dodongo Cavern by using Bombchus to light the eyes * Update soh/soh/Enhancements/randomizer/location_access/dungeons/dodongos_cavern.cpp Co-authored-by: Philip Dubé <serprex@users.noreply.github.com> * Update soh/soh/Enhancements/randomizer/location_access/dungeons/dodongos_cavern.cpp Co-authored-by: Philip Dubé <serprex@users.noreply.github.com> --------- Co-authored-by: Philip Dubé <serprex@users.noreply.github.com>
* Modularize Hurt Container mode hook * Hook condition was wrong - fixed it * Change type of hurtEnabled for clarity * Change type back to bool * Add VB hook * Don't duplicate health capacity modifier calculation * Add constants, replace magic numbers * Clang format * Publicize more health unit macros * Make mod file self-contained
* Modularize equipment hand hooks * Remove unnecessary include * More efficient hammer hand hook * More efficient equipment visible hook * Add declarations of patching/resetting functions up front * Remove forward declarations * Make mod file self-contained
* A bit of cleanup on BGS hook * Cleanup on a few more hooks, fix itemId ref * Use direct pointer to params * Revert item receive ID hook setup * Remove callbacks from menu GUI * Add comments explaining conditions of permanent loss methods * Move custom skeletons hook to subfolder * Clang format * Shorten comment * Remove unnecessary re-register function call
- Returned support for custom tunic colors - Ocarina playback now audible - Fixed movement translation issue when climbing or going through crawlspaces - Fixed issue preventing some items from being visible in Dummy hands (namely ocarina) - Fixed stick length not correctly syncing
* Create AutoSyncFork.yml * Off * Delete .github/workflows/AutoSyncFork.yml * Fix Logic In GF
* Modularize Hyper Enemies hook * Use extern "C" * Make mod file self-contained
also make goron neck searchable
* Apply ImGui scaling when using presets * Make ImGuiScale function do nothing if scale setting is unchanged
* Use game over textures instead of save textures * Improves custom kaleido menu. Specifically: 1. Changes textures to the Game Over screen textures, which look the same but doesn't have "SAVE" at the top. 2. Adds a cursor on the left, doesn't currently do anything other than make it slightly clearer that you can move up and down and scroll, but opens the door for more menu-ing/toggling capabilities later. * Add fishing rod to kaleido menu * Adds skeleton key to kaleido menu with placeholder icon * More condensing of kaleido menu + add overworld keys * clang-format
* Adds new Progressive Bombchu Bags option Also changes existing code to account for Bombchu Bags becoming a drop down with 3 values instead of a checkbox * Handle the new lower capacities for ammo refills * Handle what happens when receiving a bombchu bag * Remove the trick name of Progressive Bombchu Bag Since, you know, that's an actual thing now. * Implements Bombchu Bag handling next to Progressive Bombchu Handling * clang-formatting * Add extra bag for plentiful items * Address review comment * Move bombchu upgrade level to gSaveContext and add save/load * Use logic's saveContext for correct logic calculations * Remove RG_PROGRESSIVE_BOMBCHU * Fix Bombchu Refill obtainability * Don't add normal chus to the pool if chu bags are on. * cmake-format * Properly reset bombchuUpgradeLevel on savefile init * Fix error with va_arg on linux * Fixes small error in the Bombchu Bag description * Fix bug with bombchu obtainability * clang-format * Fix infinite bombchu text * fix clang-format
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.
No description provided.