summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-02-02Vanilla Behavior OverhaulGarrett Cox
Co-authored-by: jordanpg <jordanpg@users.noreply.github.com>
2024-02-02Merge pull request #3900 from garrettjoecox/develop-rando-mergeGarrett Cox
Develop -> Develop-rando
2024-02-02Merge branch 'develop' of garrettjoecox.github.com:HarbourMasters/Shipwright ↵Garrett Cox
into develop-rando-merge
2024-02-02Fix Internal Resolution format to use %.1f instead of %d (#3899)Ted Newman
2024-02-02Moar caching (#3896)Garrett Cox
2024-02-01Fix starting skulltulas (#3876)aMannus
2024-02-01Merge pull request #3897 from briaguya-ai/macready-to-dev-2-2Garrett Cox
macready -> dev (2024/2/2)
2024-02-02Merge branch 'develop-macready' into macready-to-dev-2-2briaguya
2024-02-01sccache for windows builds (#3385)briaguya
* cache vcpkg on windows ci * try sccache as variant * missed a spot * see if we're checking here * does this do it? * trying to make minimal changes and have this work * hopefully these z7s do something * we were almost at the max already bump to double * Apply suggestions from code review * sc * latest from soh-macready branch of otrexporter
2024-02-01gc controllers via sdl on linux (#3869)briaguya
* try gc via sdl basing this idea on this comment https://github.com/Ryujinx/Ryujinx/issues/2425#issuecomment-1269658650 * libusb? * fix * use latest lus main * don't bump lus yet
2024-02-01Item Tracker Text Size Slider (#3856)Patrick12115
* Adds Slider and Functionality * prefix * Changed values * HELLO --------- Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
2024-02-01Merge controller menus (#3860)Pepe20129
* Merge controller menus * Re-run Build * Update SohInputEditorWindow.h * Update soh/soh/Enhancements/controls/SohInputEditorWindow.cpp Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com> * pin switch devkit docker image --------- Co-authored-by: Garrett Cox <garrettjcox@gmail.com> Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
2024-02-01[Graphics] Show Equipment Regardless of Age (#3830)Patrick12115
* Hookshot, Hammer, & Boomerang * Added the remainder of equipment and DL Patching for hands * Removed Mirror Shield Patch Messed with the front texture of shield * Child Hylian Shield Cheat Adds a cheat that allows Child Link to hold Hylian Shield as adult. Added to this since it uses the same way to render the shield * Debugging * Adds Scaling to Child Link with Adult Equipment * Fix Merge Conflict Blunders * More cleanup * Added Scaling checkbox and some clean up * Added an || ITEM_NONE * More cleanup and simplification * Accidently added spacer * Replace B_BTN_ITEM * Spacing Co-authored-by: Pepe20129 <72659707+Pepe20129@users.noreply.github.com> * Added most sheath functionality * Updated tooltips * removed child hylian shield and tweaked bow/slingshot Made child hylian shield cheat into a separate branch and hooked into existing bow/slingshot enhancement for drawing those * Prefixes * () --------- Co-authored-by: Pepe20129 <72659707+Pepe20129@users.noreply.github.com> Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
2024-02-01Clarify descriptions of Graphics Settings (#3881)Tina H. (sheepytina)
* Rewrite tooltips: Internal Resolution, Anti-Aliasing. + Tweak others. * MSAA slider will display 1x as Off. * Rename setting and tweak tooltips: FPS (to Framerate) + Code style formatting. * Add tooltip: Texture Filtering. + Small tooltip changes. + Tidy up comments/newlines. * Add internal resolution advisory for Apple users. (Because this setting being missing keeps getting reported as a bug.) * Small text tweaks. * Code review suggestion Co-authored-by: inspectredc <78732756+inspectredc@users.noreply.github.com> * Missed one of the buttons + correct spelling of "frame rate" --------- Co-authored-by: inspectredc <78732756+inspectredc@users.noreply.github.com>
2024-02-01Cosmetics Editor entry for Ivan the Fairy (#3718)skyyoshi86
* First commit * Reverted MODDING.md Reverted a correction to MODDING.md (case-sensitive broken link?) as this is not a change related to this PR * Delete CMakeSettings.json Deleted CMakeSettings.json as this is not a change related to this PR. * checks for cosmetic changes ONCE for both body and sparles Please review carefully. I made these changes blindly as I figure out why I can't compile it in my machine anymore. Sorry! * correctly updates OUTER color when it's changed in Cosmetics Editor * Update soh/soh/Enhancements/cosmetics/CosmeticsEditor.cpp * Update soh/soh/Enhancements/cosmetics/CosmeticsEditor.cpp * Update soh/soh/Enhancements/cosmetics/CosmeticsEditor.cpp * Update soh/soh/Enhancements/cosmetics/CosmeticsEditor.cpp * Update soh/soh/Enhancements/cosmetics/CosmeticsEditor.cpp * Update soh/src/overlays/actors/ovl_En_Partner/z_en_partner.c * Update soh/src/overlays/actors/ovl_En_Partner/z_en_partner.c * Update soh/src/overlays/actors/ovl_En_Partner/z_en_partner.c Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com> * Update soh/src/overlays/actors/ovl_En_Partner/z_en_partner.c Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com> * Update soh/src/overlays/actors/ovl_En_Partner/z_en_partner.c Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com> * Update soh/src/overlays/actors/ovl_En_Partner/z_en_partner.c Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com> * Update soh/src/overlays/actors/ovl_En_Partner/z_en_partner.c --------- Co-authored-by: Garrett Cox <garrettjcox@gmail.com> Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
2024-02-01Add gShowDoorLocksOnBothSides (#3787)Garrett Cox
* Add gShowDoorLocksOnBothSides * Update soh/src/overlays/actors/ovl_En_Door/z_en_door.c --------- Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
2024-02-01Item Tracker Hookshot/Longshot Identifiers (#3848)Patrick12115
* H & L Adds an H and L for Hookshot and Longshot to be able to tell more clearly which one you have. * Added Toggle and Refined Adds a toggle if players don't want it on. Also scales the letter to stay constant with the icons, both size and position. Also now hides the letter if you don't have a hookshot yet. * Clean up some of the comments * prefix
2024-02-01Audio Editor UI Improvements and Scene Init Randomization (#3388)Chris
* Audio Editor UI Improvements and Scene Init Randomization * Update soh/soh/Enhancements/audio/AudioEditor.cpp Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com> * Update soh/soh/Enhancements/audio/AudioEditor.cpp Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com> --------- Co-authored-by: Garrett Cox <garrettjcox@gmail.com> Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
2024-02-01change default value + scale offset by icon size appropriately (#3861)Eric Hoey
2024-02-01Fix +/- buttons on float sliders not working at certain values (#3865)Josh Bodner
2024-02-01[Time Saver] Reset Navi Timer (#3818)Patrick12115
* Reset Navi Timer * Force Rebuild * Prefix
2024-02-01Randomize cosmetics on new scene (#3342)Chris
* Randomize cosmetics on new scene * Code review feedback --------- Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
2024-02-01Triforce Hunt GI Model Blender source files (#3478)aMannus
* Triforce Hunt GI model source files * Move assets to different path
2024-02-01Colors 1 (#3463)louist103
2024-02-01Account for removed object dependency in Deku Scrub Leader (#3878)Rozelette
* Account for removed object dependency in Deku Scrub Leader * Update soh/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c --------- Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
2024-02-01Increase Door Cull range (#3888)inspectredc
* cullzone * better cvar name * Update soh/src/code/z_actor.c * Update soh/src/code/z_actor.c --------- Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
2024-02-01Hurt Container Mode (#3336)Caladius
* Each Heart Container or full Heart Piece reduces Links hearts by 1 * Based on Briaguya's suggested Code but modified slightly as some parts were missing. * Static Bool * The episode without Captain Hook's Hook --------- Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com> Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
2024-02-01Lost Woods Ocarina Game Difficulty Options (#3371)Eric Hoey
* Menu options, note speed, unlimited playback time * Instant win * Add custom ocarina game cvar to all options and presets * Extra spaces * Add starting note count, ending note count by round, more presets * Block out vanilla code + comments * finish blocking out vanilla code * new documentation formatting * add starting notes to randomizer preset
2024-02-01Increase Crawl Speed (#3366)Eric Hoey
* Increase animation speeds, crawl speed, add magic numbers for camera timer, add to menu and presets * Remove extra space, reformat comments * Initialilze CVar at 0, Initialize default timer, set default case for timer, change all CVarGets to 1, reorg logic * Fix remaining CVars + unify logic * block out vanilla code + comments * new documentation formatting * Simplify camera swing fix * Remove redundant multiplication * Update soh/src/code/z_onepointdemo.c reduce code duplication Co-authored-by: Garrett Cox <garrettjcox@gmail.com> --------- Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
2024-02-01Fisherman asks for fishing rod when leaving (#3347)Eric Hoey
* CVar, presets, custom message, fishing actor * Add placeholder translations for French/German * Fix for MS Shuffle change * Rename function to match * Missing comma in presets * Change description, CVar name, add'l function name, edit custom message * Actual whitespace fix * re-order custom message * Fix message formatting * Add enhancement comments * yeet if (play) {} from enhancement * new documentation format
2024-02-01Swim Speed Modifiers (#3308)Eric Hoey
* Add CVars for swimming, apply to swim speed calc * Prevent modifer from working underwater * Re-enable swim speed mod when underwater, use new (orig) function for y-velocity while diving * Add to presets list * Fix spacing * block out vanilla + comments * re-org vanilla code block in a sane way * new documentation format * rename Surface function + comment for usage * handle merge conflicts, but like an adult this time
2024-02-01No Magic Numbers for Preset Location Exclusions (#3801)Malkierian
* Adds `FormatLocations` and `PRESET_ENTRY_TYPE_CPP_STRING` to allow for feeding `RandomizerCheck` values directly in presets instead of a string with magic numbers. * Switch to concatenation with `std::to_string`. * Forgot to remove <format> include XD
2024-02-01Renames Freecam to Free Look. (#3771)Malkierian
Adds helper info for invert, distance, and transition speed options.
2024-02-01fix timestamp truncation (#3874)Archez
2024-02-01Unify defaults for reward count sliders with Greg As Reward so they need to ↵Malkierian
register changes. (#3875)
2024-02-01fix bombchu logic bugs (#3720)Pepper0ni
2024-02-01Merge pull request #3894 from Archez/mergeDevelopMacreadyJan31Archez
Merge develop-macready -> develop
2024-01-31Merge remote-tracking branch 'origin/develop-macready' into ↵Adam Bird
mergeDevelopMacreadyJan31
2024-01-15Fix disabled icon for Easy Input Buffering checkbox when Easy Frame ↵Ted Newman
Advancing is enabled (#3859)
2024-01-15Fix: Move Ruto earring fix to graphic patch and fix Ganon fight rubble DL ↵Archez
reference (#3810) * move ruto earing fix to real patch * use stringpath for ganon rubble
2024-01-15Revert actor uncullZone related checks back to match decomp (#3828)inspectredc
2024-01-15Tweak: Improve pause menu dungeon map performance (#3773)Archez
* add map palettes per pulse to leverage shader caching * use unregister blended with kaleido maps * use Gfx_TextureCacheDelete for KD lava * bump lus * add miss tex clears for KD
2024-01-15Add Collision Header XML parser (#3396)Pepe20129
* Add Collision Header XML parser * Update CollisionHeaderFactory.cpp * Remove "Num" attributes * Fix crashes Prevent crash when the camera setting is negative Change some IntAttributes to UnsignedAttributes
2024-01-15Restore Original Scene Command Object List Behaviour (MacReady) (#3827)inspectredc
* Restore Original Scene_CommandObjectList Behaviour * remove some vrom stuff * add some comments
2024-01-15Add a tooltip to "Restore old Gold Skulltula cutscene" enhancement. (#3849)Tina H. (sheepytina)
2024-01-15Adds a log statement to show the SoH version at startup, in case crashes ↵Malkierian
don't produce a stack trace from which to glean that information. (#3786)
2024-01-15Fix: Tektite texture not loading for death animation (#3808)Archez
* fix tektite death texture loading * add string header
2024-01-15Remove OpenMenu Bar Check (#3817)Patrick12115
Having it set to just -6 makes the Glitch Tick stay in the same spot in game. when the F1 menu bar is open. At least on Windows
2024-01-15Custom message loading (#3713)Amaro Martínez
* Add custom text message loading * Use "override" folder for text mods * Replace only existing messages * Use std::find_if to check for existing messages
2024-01-15Imgui polish (#3481)Josh Bodner
* Rearrange menus for better layout on smaller screens. * Automatically calculate +/- increments for float sliders * Add needed header * Use stringstream instead of format since apparently most platforms don't actually support all of c++20 yet boooooo * Add header that only Mac complained about for some reason * Theoretical performance improvement * Actual performance improvement