summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-05-10Version Bump (#2867)7.0.1Christopher Leggett
2023-05-10Use OnGameFrameUpdate for rainbow tick instead of relying on ImGui hidden ↵Garrett Cox
window (#2872)
2023-05-10reserved thread count (#2868)briaguya
* reserved thread count * add comment, use latest main --------- Co-authored-by: briaguya <briaguya@alice>
2023-05-10Fix several enemy ID's for Hyper Rush (#2871)aMannus
2023-05-10CC: No longer rely on received parameter to be 0 (#2870)aMannus
2023-05-10Cleanup cvars that are set on boot (#2863)Garrett Cox
2023-05-09RANDO: Fix logic with OGC and mixed entrance pools (#2830)Christopher Leggett
* RANDO: Fix logic with OGC and mixed entrance pools Adds a `GANONS_CASTLE_LEDGE` area and a `BuiltRainbowBridge` logic var. Added an event to `GANONS_CASTLE_GROUNDS` that sets `BuiltRainbowBridge` to true. Adds Entrances for `GANONS_CASTLE_LEDGE` to `GANONS_CASTLE_GROUNDS` when `IsAdult` and `BuiltRainbowBridge` (or the glitched logic that lets you skip the rainbow bridge) are true, `HYRULE_CASTLE_GROUNDS` when `IsChild` is true, and `GANONS_CASTLE_ENTRYWAY` When IsAdult is true (if child enters `GANONS_CASTLE_LEDGE` in game they are in `HYRULE_CASTLE_GROUNDS` and thus cannot go back into GANONS_CASTLE_ENTRYWAY). Adds Entrance for `GANONS_CASTLE_GROUNDS` to `GANONS_CASTLE_LEDGE` when `BuiltRainbowBridge` is true, or when the glitched logic that lets you skip the Rainbow Bridge is true. * Adds intermediate area for age-gating * Fixes the logic for actually killing the skulltula * Adds hammer crouch stab as a way to kill OGC_GS
2023-05-09improve built in extraction detection (#2865)Adam Bird
2023-05-09fix for day/night textures (#2853)briaguya
* hacky fix for deku tree entrance * lonlon windows * only hack in one place instead of everywhere * dehack deku * goron city entrance * gerudo cell, zd entrance * kak windows * fix pot house * back to the hacks * back back * space * globals * just hack it together to fix em all --------- Co-authored-by: briaguya <briaguya@alice>
2023-05-09bump LUS for thread stuff (#2866)briaguya
* bump for threads * use latest lus main --------- Co-authored-by: briaguya <briaguya@alice>
2023-05-08Fixed small error in CC .cs file (#2858)aMannus
2023-05-08fix own dungeon items not using rando GI item when boss rooms are shuffled ↵Adam Bird
(#2859)
2023-05-07Bump LUS (#2855)Kenix3
* Bump LUS * Ship -> LUS namespace change * z_scene_otr Ship -> LUS namespace
2023-05-07Reverts part of PR #2851 that required OTR regen. (#2856)Christopher Leggett
2023-05-07fix build (#2852)briaguya
Co-authored-by: briaguya <briaguya@alice>
2023-05-07Add stdint headers (#1) (#2832)Lutzx
* Add stdint header * Add stdint header Co-authored-by: Christopher Leggett <chris@leggett.dev>
2023-05-07Bump LUS version (#2849)Kenix3
* Bump LUS version * Removes the "now" boolean from the LUS resource bridge functions. * Bump LUS * More LUS bump * Update soh/soh/resource/importer/AudioSampleFactory.cpp --------- Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
2023-05-07ZAPD Update (#2851)louist103
* git subrepo clone --force --branch=rebase2 C:/ZeldaStuff/ZAPDTR ZAPDTR/ subrepo: subdir: "ZAPDTR" merged: "6aa54a551" upstream: origin: "C:/ZeldaStuff/ZAPDTR" branch: "rebase2" commit: "6aa54a551" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * git subrepo clone --force --branch=rebase2 C:/ZeldaStuff/ZAPDTR ZAPDTR/ subrepo: subdir: "ZAPDTR" merged: "88b012240" upstream: origin: "C:/ZeldaStuff/ZAPDTR" branch: "rebase2" commit: "88b012240" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * Update (its broken) * fix the enum * git subrepo push --remote=C:/ZeldaStuff/ZAPDTR/ ZAPDTR subrepo: subdir: "ZAPDTR" merged: "b7b6e1c82" upstream: origin: "C:/ZeldaStuff/ZAPDTR/" branch: "rebase2" commit: "b7b6e1c82" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * New names for LUS actions * git subrepo push --remote=C:/ZeldaStuff/ZAPDTR/ ZAPDTR subrepo: subdir: "ZAPDTR" merged: "c5cfebeee" upstream: origin: "C:/ZeldaStuff/ZAPDTR/" branch: "rebase2" commit: "c5cfebeee" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * git subrepo clone (merge) --force --branch=rebase2 C:/ZeldaStuff/ZAPDTR ZAPDTR/ subrepo: subdir: "ZAPDTR" merged: "d5f4769b8" upstream: origin: "C:/ZeldaStuff/ZAPDTR" branch: "rebase2" commit: "d5f4769b8" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * Fix missing commands in the exporter. * Cleanups. * git subrepo pull --force --remote=https://github.com/harbourmasters/ZAPDTR --branch=master ZAPDTR subrepo: subdir: "ZAPDTR" merged: "d4c35b90a" upstream: origin: "https://github.com/harbourmasters/ZAPDTR" branch: "master" commit: "d4c35b90a" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * Add unordered_map include to fix MacOS * fix string_view * Update Main.cpp * fix string view * So close I can almost taste it * So close * Fix missed git marker. * Fix surface types and * Update ZFile.cpp * Delete Jenkinsfile --------- Co-authored-by: Christopher Leggett <chris@leggett.dev> Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
2023-05-05Move Game Saving to Separate Thread (#2820)Malkierian
* Refactor `Vec2f`, `Vec3f`, `Vec3s` in `z64math` to avoid reserved identifiers. * Include `z64save` in SaveManager, which requires encapsulating `#include gameplaystats.h` and `InitStatTracker` in the cpp to fix compile issues. Adds SaveContext reference parameters to SaveFunc and existing implementations in preparation for threaded saves. * Threaded saves fully implemented. Platform-specific save code removed. Thread safety added. Will wait for thread pool tasks to finish before resetting or closing. * Converted gSaveContext copy for save threads to the heap with `new`, deleted at the end of the threaded function to prevent possible issues with the stack. * Turns out leaving the call to `ThreadPoolWait` in a `GameInteractor::OnExitGame` hook seems to be just fine. * Removed unnecessary references to `SaveManager::ThreadPoolWait()`, game hooks are the only places it's called now. * Re-added WiiU/Switch performance save code. * Added call to `SaveManager::ThreadPoolWait` in `Sram_InitSave` to prevent trying to load a newly "created" save before the save file was actually written. --------- Co-authored-by: Christopher Leggett <chris@leggett.dev>
2023-05-05CrowdControl 2.0 compatibility & category tweak (#2814)aMannus
* Updated CC 2.0 .cs file and small category fix * Remove old comments * Prepare prices and descriptions in .cs file * Finalize 2.0 files
2023-05-05remove tts hotkey for linux and update readme (#2833)Adam Bird
2023-05-05udpate mac launch script to set SHIP_HOME (#2831)Adam Bird
2023-05-04Lus updates (#2835)Kenix3
* Changes for LUS renames in ResourceManager and Archive. * Moves WriteSaveFile and ReadSaveFile to SaveManager. * Removes ImGui namespace. * Bump LUS * Updates gitignore for intellij projects. * Controller usage is now up to date with newest LUS. * Adapters for removal of Controller.WriteToSource from LUS. * Uses correct capitalization on Controller.GetProfile() * Bump LUS --------- Co-authored-by: Christopher Leggett <chris@leggett.dev>
2023-05-04fix: don't crash when changing margins (#2828)briaguya
for some reason we were getting garbage data in cvarNameMargins when doing things the `const char *` way. i wasn't able to figure out why that was getting garbage but this makes it so we don't get garbage in there Co-authored-by: briaguya <briaguya@alice>
2023-05-04TWEAK: Rupee dash duplication (#2815)PurpleHato
* TWEAK: Rupee dash duplication Rupee dash was duplicated while being moved over the EXTRA MODES, so this fixes the duplication and put it only there * Update soh/soh/GameMenuBar.cpp --------- Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
2023-05-03fix: properly load textures for debug text (#2775)briaguya
Co-authored-by: briaguya <briaguya@alice>
2023-05-03GCC 13 support (#2780)GaryOderNichts
2023-05-03fix: properly load custom models on scene transition (#2779)briaguya
* hack that makes it so custom models still work on scene transition * Update soh/soh/OTRGlobals.cpp Co-authored-by: Nicholas Estelami <NEstelami@users.noreply.github.com> * naming/formatting --------- Co-authored-by: briaguya <briaguya@alice> Co-authored-by: Nicholas Estelami <NEstelami@users.noreply.github.com>
2023-05-03Tweak: Reset trade item cycling when pausing or changing pages (#2808)Adam Bird
* reset trade select when unpausing * move trade select reset to kaleido init and handle when changing pages
2023-05-03more mq only texture lookup fixes (#2803)Adam Bird
2023-05-03fix: extractor dialog No selection (#2798)AltoXorg
2023-05-03add back missing early break/return for bottle filling (#2817)Adam Bird
2023-05-03Fix: add header to align soh.otr file assets and fix asset crash for Mac (#2819)Adam Bird
* add header for aligned assets for soh files * remove debug statements * update more string asset usage to aligned vars
2023-05-03Lus updates (#2822)Kenix3
* Changes for LUS renames in ResourceManager and Archive. * Moves WriteSaveFile and ReadSaveFile to SaveManager. * Removes ImGui namespace. * Bump LUS * Update soh/soh/GameMenuBar.cpp * Bump LUS --------- Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
2023-04-30remove 100 character limit to baseRomPath (#2801)AltoXorg
2023-04-27fix mq dungeons crashing by not using mq textures (#2764)Adam Bird
2023-04-27bump version (#2752)7.0.0briaguya
2023-04-27spockalicious (#2751)briaguya
* Rough mockup of LUS XML loading * Updated code for merge * Loading from FS support and custom DList WIP implementation * Added current directory support to F3D and impl most of the dlist cmds * WIP Skeleton support * Almost done * Rebase fixes * Submodule updates * HD Texture Support * Fixes * bump lus * fix exporter build, header update * soh builds * setMesh image path cleanup * Update soh/src/overlays/actors/ovl_player_actor/z_player.c * Update soh/src/overlays/actors/ovl_player_actor/z_player.c * Update OTRExporter/OTRExporter/Main.cpp * Update ZAPDTR/ZAPD/ZResource.h * Update soh/src/code/z_skelanime.c * Update OTRExporter/OTRExporter/Main.cpp * Fixed jpeg backgrounds and decreased icon buffer size * Bump lus * Increased even more the buffer because it crashes on long texts * Removed print because sometimes the if is not triggered when the image is already byteswapped * fix non-windows build * fix build Co-authored-by: Kenix <kenixwhisperwind@gmail.com> * add hd checkbox * Various fixes for custom model support (#23) * Some fixes * Updated LUS Version * Fixed issue with Link Skirt on pause menu * Added CVar for custom link model changes * Fixed headers * Additional header fixes * Tweaks * Unload HD game assets on scene transition. (#16) * Unload game assets on scene transition. * Bump LUS * Unloads all HD assets on scene transition. * Only unload hd assets if hd assets are turned on. * Fixes issues on toggling between HD and non HD assets. --------- Co-authored-by: briaguya <briaguya@alice> * fix: actually load hd debug font (#27) * fix: actually load hd debug font * toggle debug text correctly --------- Co-authored-by: briaguya <briaguya> * Yes. (#28) * Merge branch 'develop' into dev-to-ghost * HD Skeleton Swapping and Language Fixes (#32) * Yes. * HD Skeleton Swapping and Language Fixes * Test * Fixed issues with ganon cape (#34) * Fixed Bongo Bongo Crash (#35) * Added HD Assets Toggle (#37) * Ivan the Fairy - Coop Mode (#36) * wip * hookshotable ivan * added hookshot item * new items & changes & fixes & restored navi * farore, din and nayru's spells are done * fixed slingshot & bow * added more items supported * done with all main items * bug fixes & ready * added imgui button * wip * hookshotable ivan * added hookshot item * new items & changes & fixes & restored navi * farore, din and nayru's spells are done * fixed slingshot & bow * added more items supported * fix own dungeon items on shuffled boss rooms (#2683) * bump lus (#2692) * fix: lowercase package names for vcpkg (#2693) vcpkg was throwing an error `error: invalid character in package name (must be lowercase, digits, '-')` this updates our calls to `vcpkg_install_packages` to use lowercase package names instead of uppercase * fix death mountain cloud in rando (#2691) * Fix: Switch Age No Longer Reloads Start Room (#2679) * [Reduced Clutter] Disable Hot/Underwater Warning Text (#2684) * Disable Warning Text * Moved to Reduced Clutter * done with all main items * bug fixes & ready * fix: process roms in consistent order (#2696) * chore: move rando savefile setup and document flags (#2697) * remove rando save init from sram * move rando savefile init logic and set more flags * document flags for rando save creation * Fix: Use correct fps value for frame interpolation with match refresh rate (#2694) * Fix: Kak GS placement on construction site (#2695) * added imgui button * addressed kenix's comments * fixed useless null * added rupee dash mode in extra modes * changed menu position --------- Co-authored-by: Adam Bird <Archez@users.noreply.github.com> Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com> Co-authored-by: inspectredc <78732756+inspectredc@users.noreply.github.com> Co-authored-by: Patrick12115 <115201185+Patrick12115@users.noreply.github.com> * LUS Scancodes (#42) * Added HD Assets Toggle * Switched out SDL for LUS scancodes * Ivan tweaks (#45) * Magic consumption slowed down; Bosses now affected by Ivan's Din spell * Adjust magic timer * clean up imgui * model fixes/improvements (#50) * replace `gUseCustomLinkModel` with custom resource check * handle adult/child * bump lus * fix model switching with tab * use lus main * fix carpet man (#52) Co-authored-by: Rozelette <Rozelette@users.noreply.github.com> * get ship model and lus texture into soh.otr, use `gAuthenticLogo` to toggle between ship and authentic (#55) * Use libultra features for CPU-modified textures (#40) * Use libultra features for CPU-modified textures * Comment * bump lus on ghost (#58) * fix: properly use `Interface_LoadActionLabel` to display start button text (#61) * Changes hd -> alt for texture replacement. (#65) * Changes hd -> alt for texture replacement. * Renames variables in gfxprint for hd -> alt change. * Update soh/soh/resource/type/Skeleton.cpp --------- Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com> * Fixes kaleido dungeon maps (#67) * skeleton stuff (#69) * comment out wii u build (#70) * bump lus (#71) * Rework readme (#72) * Update README.md * docs * put custom music docs somewhere * Update README.md * Update README.md * Update README.md * Update README.md * dark/light title image * lus * Update README.md * Fixed vanilla minimap (#73) * Fixed vanilla minimap * Workaround for pulsing SD maps with non-broken HD maps. --------- Co-authored-by: Christopher Leggett <chris@leggett.dev> * Skeleton fix fixed (#75) * WIP skelton patcher fix * Fixes skeleton reference change. * Adds const back to name in ResourceMgr_LoadSkeletonByName --------- Co-authored-by: Christopher Leggett <chris@leggett.dev> Co-authored-by: Kenix <kenixwhisperwind@gmail.com> * Fixes z_message_otr memory leak. * Update soh/soh/z_message_OTR.cpp * Update soh/src/code/game.c * docs: add how to find otr files to switch instructions (#78) * bump lus (#79) * comment out RegisterBlendedTexture in king d (#80) --------- Co-authored-by: Nicholas Estelami <NEstelami@users.noreply.github.com> Co-authored-by: David Chavez <david@dcvz.io> Co-authored-by: briaguya <briaguya@alice> Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com> Co-authored-by: KiritoDv <kiritodev01@gmail.com> Co-authored-by: briaguya <briaguya> Co-authored-by: Ralphie Morell <stratomaster64@gmail.com> Co-authored-by: MelonSpeedruns <melonspeedruns@outlook.com> Co-authored-by: Adam Bird <Archez@users.noreply.github.com> Co-authored-by: inspectredc <78732756+inspectredc@users.noreply.github.com> Co-authored-by: Patrick12115 <115201185+Patrick12115@users.noreply.github.com> Co-authored-by: Rozelette <Rozelette@users.noreply.github.com> Co-authored-by: Christopher Leggett <chris@leggett.dev> Co-authored-by: Lywx <36680385+KiritoDv@users.noreply.github.com>
2023-04-26ci: don't build/ship OTRGui (#2748)briaguya
2023-04-25fix: support building for switch on selfhosted runners (#2747)briaguya
2023-04-25Add version info and other details to windows exe properties (#2743)Adam Bird
* add version info and other details to windows exe properties * configure properties file directly to src dir * move version name in properties and change to Title Case
2023-04-25Implement built in Extractor for Windows (#2730)louist103
* wip * const * split zapd into two targets * Workingish. * fix working dir and copy xmls on build (#2) * dont change current working dir with dialog prompts * copy asset xmls to target dir * make zpadlib public * Messagebox. * Check for WIN32 * threading * Cleanups to the exporter and main. * Multi extraction. * Fix byteswap header includes. * Fix another byteswap include. * fix again. * stddef size_t * Add other targets for ZAPDLib * Non windows. * IDYES IDNO * Linux fixes * hopefully remove switch and wiiu from building extractor * Please? * validate roms and add another valid rom * ifdef out extract.h for switch and wiiu * Maybe update lux * Remove ZAPDlib from switch and WiiU * more rules * Update soh/soh/Extractor/Extract.cpp Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com> * Update ZAPDTR/ZAPD/ExecutableMain.cpp Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com> * Update ZAPDTR/ZAPD/CMakeLists.txt Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com> * Update ZAPDTR/ZAPD/GameConfig.cpp Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com> * Update ZAPDTR/ZAPD/Globals.cpp Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com> * Update ZAPDTR/ZAPD/Main.cpp Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com> * Update soh/CMakeLists.txt Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com> * Update soh/soh/Extractor/Extract.cpp Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com> * Update soh/soh/Extractor/Extract.cpp Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com> * Update soh/soh/Extractor/Extract.cpp Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com> * the last fix * Add context to a comment --------- Co-authored-by: Adam Bird <archez39@me.com> Co-authored-by: Adam Bird <Archez@users.noreply.github.com> Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
2023-04-24fix: update xml resolution for FireTempleBigVerticalFlame to match dlist ↵briaguya
resolution (#2741)
2023-04-24improve ci compat by not using touch on windows (#2740)briaguya
* improve ci compat by not using touch on windows * try new-item
2023-04-23bump lus (#2739)briaguya
2023-04-23Implement patches for authentic texture overflows (#2737)Adam Bird
* implement dlist patching for authentic texture overflows * add overflow patch to deku stick; move toggle
2023-04-23clean up build info on logo screen (#2736)briaguya
2023-04-22Enhancement: Aiming reticle for the bow/slingshot (#2715)RaelCappra
* Bow reticle enhancement * Menu bar checkbox * fix * simplify bow/slingshot reticle logic * Comment on RETICLE_MAX * Tooltip clarity update --------- Co-authored-by: briaguya <briaguya@alice>
2023-04-22chore: add mods dir for windows (#2735)briaguya
* chore: add empty mods dir for windows * add placeholder file to mods dir
2023-04-22bump lus (#2733)briaguya
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 10:48:27 +0000