summaryrefslogtreecommitdiff
path: root/soh/src/code
AgeCommit message (Collapse)Author
2025-03-28Revert "Set Sample Rate to 32000 hz (#4780)" (#5234)Malkierian
This reverts commit 9455579f4272953ecace1d812e1f43f3e0761193.
2025-03-26shipinit (r)ba (#5025)briaguya
* RBA and BA * move rba to shipinit * make the vanilla condition actually a vanilla condition * update should docs * move ba to shipinit * don't pass things * try a different readability strategy * remove option/preset entries --------- Co-authored-by: rozlette <Rozelette@users.noreply.github.com>
2025-03-24Mouse Support (#4673)lilacLunatic
* mouse * (mouse) small fix * "fix" implicit declaration * LUS 1.2 * empty commit to force CI re-run * include new mouse LUS * deleted: soh/soh/Enhancements/controls/GameControlEditor.cpp * [mouse]LUS * fix input viewer header * Bump LUS for mouse support * Mouse Support * Comment cleanup * Adding the actual mouse enhancement files * Fix (?) Windows and Mac builds * Maybe fix MacOS now * Why was it compiling with this?? * Mouse input viewer handling * [Mouse] LUS bump * [mouse] LUS * (Mouse) bump LUS for dxgi fix * F2 mouse notif * Update soh/soh/Enhancements/controls/Mouse.h Co-authored-by: Pepe20129 <72659707+Pepe20129@users.noreply.github.com> * Update soh/soh/Enhancements/controls/Mouse.cpp Co-authored-by: Pepe20129 <72659707+Pepe20129@users.noreply.github.com> * Fix mouse shield ranges to match control stick behavior * Use early returns in Mouse_HandleQuickspin * newline cleanup * cleanup * rename BUTTON_COLOR_MOUSE_BEIGE to BUTTON_COLOR_MOUSE_GRAY * 'Enable Mouse' tooltip * Fix includes * Comments re mouse quickspin * bullshit * Hook handler for cursor recentering on shield * Hook handler for first person mouse aiming * Hook handlers for mouse quickspin * Hook handlers for mouse shield control * Hook registration conditions * Enable Mouse -> Enable Mouse Controls --------- Co-authored-by: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>
2025-03-19Menu - Enhancements and cheats re-organisation (#5142)aMannus
* First pass cheats, extra modes, minigames, difficulty, fixes, graphics * More progress. One tab left * Enhancements & cheats done and fix for item tracker font
2025-03-15Modern Menu (#5116)Malkierian
* Add menu files, hook menu up to window system. Temporarily rename new menu's UIWidgets to UIWidgets2 to allow both menu systems to coexist temporarily. * Finish implementing new menu. Rename 2ship UIWidgets to UIWidgets2 to complete facilitation of both menus working for now. * More preliminary setup * More prepwork, begin on settings options * Finish settings, add enhancements windows * Fix search function not looking past first columns. * Add dev tool windows * Finish dev tools * Add about window * Fully replace about window * Remove moved menu items from menubar, add more windows to new menu * Implement WindowButtonOptions. Add ability to not embed popout windows when not popped out. Add ability to hide the button for WindowButtons. Fix Entrance Tracker from showing when not enabled. * Fix entrance tracker settings embedded display. Fix entrance tracker settings window original size declaration. * Initial implementation of themed radio button widget. * Move "About" section to second column of general. Fix sidebar sections starting in second column. * Restore Entrance Tracker `Draw()` to allow for custom styling. * Fix combobox positioning formatting. Fix color picker end spacing. Convert everything in check tracker settings to UIWidgets2 (except color pickers and section headers). Make all tracker windows not embed. * Minor cleanup * Fix main volume defaults & mirror jitter fix removal on dev * Improve color picker with RGB/RGBA options. Not finished. * Finish creating CVarColorPicker and implement for Check Tracker background color. Fix tracker and network prefixes. * Finish check tracker settings and convert check tracker. * Port all Cheats menu except for Beta Quest * Port over Beta Quest to new menu * Remove old cheats menu * Port cutscene skips to modern menu * Port Timesaver Enhancements to new menu * Port the Items and Item Count Messages submenu * Port Difficulty Options to new Menu * Removes options that have been ported thus far. * Port "Reduced Clutter" options to new menu * Add forgotten callbacks to Hyper Enemies/Bosses * Copy StateButton to UIWidgets2, and implement custom padding for them in the tracker. * Ports some pause menu related settinga * Change tracker window active title color. Make state buttons smaller in tracker to get more info on screen. * Convert window title active theming to all windows. * Port the rest of Enhancements->Gameplay to new menu * Port the "Graphics" Enhancements to new menu * Ports Fixes over to the Modern Menu * Ported Restorations to Modern Menu * Ported Extra Modes to new menu * Port Autosave and Boot Sequence to modern menu * Cleans up some leftover data for ported buttons * Ports Enhancement Presets to new menu * Port Additional timers to new menu. Removes Enhancements from old menu * Cleans up some unused stuff * Ports Randomizer Enhancements to modern menu * Convert Item Tracker Settings. Something's wrong with the comboboxes in a second column of a table. * Fix combobox alignment and label position calculations. * Convert Entrance Tracker window. * Save Editor Info tab finished. Added `PushStyleInput` and `PushStyleTabs` for Info tab. Fixed some indentation in entrance tracker source. Added font push to tracker windows. * Increase size of all icons in save editor. * Convert flag groups to child windows for automatic sizing and border drawing. * Flags tab completed. Finished inventory tab. * Convert save editor help hover to UIWidgets2. * Various fixes and corrections * Start cosmetics editor, fix theme colors not updating * Cosmetics editor conversion progress * Remove Mac internal resolution restrictions. * Copy over advanced resolution partial and enable most options as a custom widget. * Add size to float sliders, more cosmetics editor progress * Fix incorrect cvar for notifications * Radio button & header color options, more cosmetics editor progress * Finish cosmetics editor conversion * Create and apply THEME_COLOR macro. Resides in SohGui for easy access to mSohMenu. * Move ResolutionEditor to SohGui directory. * Add labels to build info. Fix slider width calculations. * Fix some advanced resolution widget hiding. * Fully implement Advanced Resolution options. Fix graphics settings formatting. Improve slider label position calculations. Implement Clamp options on sliders. * Finish save editor. Convert save editor code to `using namespace UIWidgets2`. Fix search crashing on time splits window. Remove `SetLastItemHoverText` from `UIWidgets2`. * Unify cvar sectioning in time splits. * Add InputString and InputInt widgets, and corresponding CVar Widgets * Adds Widget Type for Inputs, not currently used. * Convert Sail to modern menu * Add Combobox that takes a vector of std::strings * Convert checkbox and combobx to new widgets * Add Tristate checkbox * Convert sliders and tristate checkboxes * Convert top half of Rando window * remove/replace remainder of UIWidgets usage in option.cpp * Converts tricks, locations, and removes old UIWidgets refs * Fix windows build errors * Remove Tri-State checkboxes * Use PushStyleInput instead of PushStyleSlider lol oops didn't realize it was a thing in Ship. * Rebase and address review comments * Convert Crowd Control to modern menu. * Fix build error * Audio editor progress * Re-add CVar SaveOnNextFrame calls to Resolution Editor. Remove old Resolution Editor files. * Convert TimeSplits to new menu. Fix a few enum warnings. * Decrease padding on Arrow Buttons * Audio editor + gameplay stats done * Give Randomizer Menu more screen real-estate * Port plandomizer menu * Fix slider width calculation and allow combobox LabelPosition::None * Fix None labelPos and slider width for inline labels * Fix all slider value label insertions. Convert Collision Viewer. * Minor Collision Viewer enum change. Convert Actor Viewer. * Theme/convert Message Viewer. * Add font to Message Viewer. Theme Value Viewer. * DL Viewer and SohModals themed. * Convert Input Viewer. * Missed some color settings in Input Viewer. Removed UIWidgets references from Controller Config, and restored SoH version. * Remove UIWidgets.hpp include from multiple files. * Completely remove old UIWidgets. Rename UIWidgets2 to UIWidgets. Move Accessibility and Language options to new menu. * Fix Gfx Debugger not showing up. Remove menubar registration. * Fix clearCvars references. * Fix passing std::string to const char* argument. * enum name spacing --------- Co-authored-by: aMannus <mannusmenting@gmail.com> Co-authored-by: Christopher Leggett <chris@leggett.dev>
2025-02-25Trade cleanup (#4971)Pepe20129
* Move adult trade to flags * Move child trade to flags * Fix vanilla * Address review * Rename `trade_shuffle` to `ShuffleTradeItems` * Fix mac build * Update GIVanillaBehavior.h * Update z_kankyo.c * Update z_en_heishi2.c
2025-02-25Use gamemode enum (#5089)Archez
* Use gamemode enum * update console command for file_select
2025-02-19Use VB hook to fix Deku Nut upgrade bug (#5047)Jordan Longstaff
* Use VB hook to fix Deku Nut upgrade bug * Use constexpr, remove unused extern * Separate IS_RANDO out of value macro * Restore mask check in hook * Call VB hook in SkipMiscInteractions hook * Mask of Truth hook not registered in rando
2025-02-17Added and implemented TrailType enum (#5059)Miles Acquaviva
* added TrailType enum * fixed build, moved declaration * added enhancement comment * Apply suggestions from code review --------- Co-authored-by: link5669 <acqmiles@gmail.com>
2025-02-14Autosave Overhaul (#5022)aMannus
* Autosave interval based * Move to save on soft reset, remove adjustable interval * Use new BeforeExitGame hook to prevent non-existent data problems * Fix check tracker crash, remove BeforeExitGame hook * update comment
2025-02-12ShipInit and move ValueViewer rendering out of src (#5039)Archez
2025-02-12Add hilite setup calls around all custom GI draws (#5043)Archez
2025-02-12Remove POLY_KAL and restore POLY_OPA for kaleido (#5041)Archez
2025-02-12Created and implemented PosType enum (#5046)Miles Acquaviva
* Created and implemented PosType enum * fixed formatting --------- Co-authored-by: link5669 <acqmiles@gmail.com>
2025-02-11Restore pause link drawing behavior to use the work buffer (#5038)Archez
2025-02-08simplify pause menu link (#5013)aMannus
2025-02-02better soft reset (#4984)briaguya
2025-01-23Replace old pause buffer input experience with a more accurate one (#4918)Garrett Cox
2025-01-20Fix particles (#4923)aMannus
2025-01-16Update Actor Flags to decomp (#4822)Pepper0ni
2025-01-15Add Dana's models to the game, add cosmetic customisation for keys and ↵Pepper0ni
rename Bombchus in Logic (#4311) * initial implementation of new models * fix typo * Add smaller skeleton key model and try to fix windows build * stupid windows, you made me look bad! * make DrawBombchuBag function work * small cleanups * OOGGA BOOGA BOO * fix post merge leftovers * post merge fix * Added Big Key Lighting override to show vanilla lighting when unchanged * rename CustomdLists into customIconDLs * post merge fixes * fix some tooltip issues * post merge cleanup and some small menu changes * post merge fix * post merge fix * add new boss soul model, colours broken * update boss soul model for env support * Add dungeon customise buttons to cosmetic editor * fix mac build? * keys don't support alpha * fix submodules * ring now draws * fix keyring colours * Add bombchu Bag RG, fix boss soul skull colour * address reviews
2025-01-15[Rando] Prevent alarm when at full HP (#4831)Fredrik Andreasson
* * Prevent low HP alarm when at full HP for 1 heart start * * updated name
2025-01-15Organize ship specific save context additions (#4597)Pepe20129
* Basic restructure * Undo most randomizerInf changes for now * Small fixes * Fix linux & mac builds? * Fix remnants of randomizerInf changes * Post-merge fix * Post-merge fix
2025-01-08Set Sample Rate to 32000 hz (#4780)Alejandro Asenjo Nitti
* Set Sample Rate to 32000 hz * PR review * .DesiredBuffered = 1680
2025-01-07Fix Naborru fight CS for child and with entrance skips (#4821)Archez
2025-01-05Introduce in-game Randomizer Settings menu, remove plando mode (#4804)aMannus
* Initial mockup * Rip out part of plando mode, implement rando settings menu * MVP new randomizer flow * Translation support and code cleanup * Fixes and more cleanup * Fix whoopsie * Fix whoopsie 2
2025-01-03Fix Broken Giant's Knife flag not resetting (#4608)Jordan Longstaff
* Fix Broken Giant's Knife flag not resetting * Force setting on in rando * Fix flag when checkbox is toggled
2025-01-02Rename code file for inventory functions (#4783)Jordan Longstaff
2024-12-26Fix transition wipe not rendering properly (#4757)Archez
2024-12-25don't use magic numbers in `EnItem00_CustomItemsParticles` (#4728)briaguya
* don't use magic numbers in `EnItem00_CustomItemsParticles` * Update particle enums, add deku/stick bag RGs (#377) --------- Co-authored-by: aMannus <mannusmenting@gmail.com>
2024-12-23Convert audio sliders from float to int (#4709)aMannus
* Audio sliders float -> int * Implement migrator * Must construct additional if statements
2024-12-22Freestanding Rupees/Hearts Shuffle (#4686)Pepper0ni
* Enable freestanding items other than heart pieces and keys * Add option to disable freestanding rupee & heart shuffle * Add items to pool * Actually add shuffle setting * Define overworld locations * Add logic for overworld freestanding checks * Add freestanding items for child dungeons. * Add checks for Ice Cavern and Bottom of the Well * Add checks for Forest Temple and Gerudo Training Grounds * Add checks for Fire Temple and Water Temple * Add Shadow Temple checks This does not include the spinning pots rupees, even though they're included with freestanding rupees in the N64 randomizer as they would require dedicated overrides for the code for the pots in question. * Define Spirit Temple and Ganon's Castle hearts * Add remaining checks to dungeon definitions * Fix missing logic * Add freestanding checks to Save Flags Editor * Fix flags for Zora Fountain underwater rupees * Add option to enable freestanding shuffle for either dungeons or overworld * Add missing MQ checks and fix mac & windows compile error * Improve description and add hint text * Update logic for Bombchu fixes * Add missing Spirit Temple MQ hearts * Add missing settings entries * Actually add Forest Temple trick to the tricks menu. * Re-add Ice Cavern lobby rupee * go over MQ logic * review logic on non-MQ checks * convert all freestandings to location based * add option enum and fix jabu exit logic * fix mislocated freestandings * fix mislocted freestandings * Fix some mislocationed checks --------- Co-authored-by: Angel Bulfone <mbulfone@gmail.com>
2024-12-21Fix actor inits happening too early (#4742)briaguya
* fix dogs not running * clean up kak gs fix * clean up scrub leader fix
2024-12-20Rename `code_80043480.c` from decomp (#4731)Jordan Longstaff
2024-12-18add bottles and greg to sparkle list (#4720)Eric Hoey
2024-12-14Fix GfxPrint shadow for HD fonts and some cleanup (#4681)Archez
2024-12-14Rename a lot of actor movement-related functions from decomp (#4680)Jordan Longstaff
2024-12-14Re-implement old toggles for Dpad and Right Stick Ocarina Playback. (#4660)Malkierian
2024-12-14Add pulsate boss icon enhancement (#4651)Rozelette
2024-12-13Rename two Actor functions from decomp (#4674)Jordan Longstaff
2024-12-13Consistently name Gift from Rauru (#4677)Pepper0ni
2024-12-09Name alpha-distance update function from decomp (#4658)Jordan Longstaff
2024-12-06Fix crash when toggling alt assets while paused (#4621)Archez
2024-12-03Add Timer Display Window (#4553)Caladius
* Add new timer window and display options * Fix overflow spacing * Icons for Timers * Swap Labels for Icons. * Additional Timers * Navi Timer Icon * Clean up unused Defines. * Code clean up and double check. Ready for Review * Update from Suggestions * Update magic numbers, correct indentations hopefully * One moooooore thing * Undo z_param change * Updates
2024-12-02Adjust Actor_GetProjectileActor to behave more like hardware, fixing an ↵Garrett Cox
issue with Dark Link (#4606)
2024-12-02Boomerang Reticle and First-Person Aiming (#3374)Eric Hoey
* First-person, reticle, sway, menu, and presets * Put sway back behind reticle, adjust aim height for age * block vanilla + comments * new documentation method * second try formatting * Correct boomerang distance * Update for CVAR changes * Fix alignment? * Condition cleanup * Change reticle range to match bow behavior * remove magic values
2024-11-29Cosmetics cleanup (#4587)Malkierian
* Convert defaultColor from ImVec4 to Color_RGBA8. Convert defaultColor's ints to floats when being applied to currentColor in the macro. * Address previous cleanup comments. Surround `Message` tab in an advanced check. * Resolve warnings and cleanup whitespace/formatting. * Make Color_RGBA8 constructing function because... platform differences... * Function name clarification. * Remove default color conversion, reference default colors directly in CosmeticOption initialization.
2024-11-27Fix some situations where trade items spoiled (#4569)Pepe20129
* Fix some situations where trade items reverted * Update z_game_over.c * Hopefully fix mac
2024-11-26Cosmetics Changes (#4275)Pepe20129
* Clean CosmeticsEditor.h * Add CosmeticsEditor_GetDefaultValue * Add message text cosmetics * Format cleanup * Remove dependency on 3drando random functions * Fix rainbow for every cosmetic * Add "Rainbow All" & "Un-Rainbow All" * Add HookshotChain cosmetic * Add Nayru's cosmetics * Add Farore's cosmetics * Add Din's cosmetics * Add Title card cosmetics * Update CosmeticsEditor.cpp * Add Copyright text cosmetic
2024-11-22Save timesplits colour to cvar and reload it on init. (#4572)Pepper0ni
* save timesplits colour to cvar and reload it * fix mac and match cosmetics with the color conversion * more stupid other platform fixes
generated by cgit v1.2.3 (git 2.25.1) at 2026-09-18 21:48:52 +0000