2ship2harkinian/.github/workflows, branch 4.0.2

Revert "Tweaks to github actions cache (#1359)" (#1362)

2025-11-22T19:05:32+00:00

This reverts commit a42551063d2723764e3b595f679bb83852101002.

Revert "Remove timestamp from cache key (#1360)" (#1361)

2025-11-22T19:04:53+00:00

This reverts commit 1ea60b6676f7041558c98c820dbaf23c2e40517d.

Remove timestamp from cache key (#1360)

2025-11-22T18:01:52+00:00

Tweaks to github actions cache (#1359)

2025-11-22T17:30:33+00:00

Properly configure INCLUDE_MPQ_SUPPORT (#1243)

2025-09-10T16:35:39+00:00

Revert "Merge develop-rena -> develop (#1258)" (#1269)

2025-09-10T16:32:40+00:00

This reverts commit 47771de011abced823d9b699fffc8832fedff1b7.

Merge develop-rena -> develop (#1258)

2025-09-03T12:38:51+00:00

* add health check preventing hop counter reset on death (#1214)

* Fix rando refills for Chateau Romani (#1216)

* Allow access to smithy checks without a sword (#1208)

* Fix float slider labels (#1210)

* Do not allow gameover audio to be changed (#1225)

* Fix slider labels where position is None (#1227)

* Fix BSoDT bugs with audio and early day change (#1228)

* Properly configure INCLUDE_MPQ_SUPPORT (#1243)

* Check previousBankValue in custom bank thresholds (#1232)

* Restore vertices after geometry seams patch (#1237)

* Fix softlock with Magic Hag's Blue Potion (#1252)

* Revert "Fix cracking/buzzing with streamed audio (#1153)" (#1233)

This reverts commit 120c657607dc3c7b5d8e063d457744733bb5b668.

* [Rando] Reset cycle collectible flags on cycle save (#1254)

* bump to Rena Bravo (#1257)

---------

Co-authored-by: mckinlee 
Co-authored-by: balloondude2 <55861555+balloondude2@users.noreply.github.com>

Lus Bump (#1179)

2025-07-21T18:26:40+00:00

* LUS Bump

# Conflicts:
#	mm/2s2h/Enhancements/Trackers/DisplayOverlay.cpp
#	mm/2s2h/Enhancements/Trackers/ItemTracker.cpp

* Add actions files

* Font fix

* Use new way

* Format

* Update LUS

* Oops

* oops again

Rework build caching for stability (#1056)

2025-03-12T15:21:11+00:00

* only save build cache for default branch

* only cache vcpkg for windows

* give otr runner dedicated ccache, cleanup windows/linux deps caching

* test logging

* save macports with hash

* try ccache on windows

* test

* back to 1g

* sccache again

* is it cmake flags

* try something else

* start back at 3.16

* evict old ccache

* add back embedded

* cache win build folder again..

* try 2gig

* try no build folder cache

* back to cmake 3.26

* final adjustments and cleanup

* tweak restore key pattern due to ccache inconsistency

Custom Audio Support (#778)

2025-03-03T04:30:05+00:00

* Implement custom sequences and the audio editor.

* Fix implicit function declaration `AudioEditor_GetReplacementSeq`

* Fix mac again.

* String and header cleanup

* Oops

* WIP ZIP Sound fonts

* The game opens and audio seems to play correctly. Needs extensive testing.

* Name sequences

* Cleanup the SF importer a little.

* XML Sequences good

* Fix mac

* Destructor

* Bump submodule

* Thread safe queue

* Add WAV decoder

* sequenceMap->mSequenceMap and a string fix

* Streamed sequence importer

* Add s16 sample processing.

* Fix drwave define

* Fix STB

* Reorder the loading to enable custom sound fonts

* New streamed solution

* Bump exporter

* Generate 1 minute long looping sequence.

* Very long sample support (113 minutes or so)

* MP3 Decoding

* Don't byteswap the crc from XML.

* WIP OGG

* add windows cmake stuff (broken) and fixes to OGG

* Just throw more cores at the problem

* Dynamically allocate fontMap

* Re-add OOB read fix from old branch

* FLAC decoder, threads for the other compressed formats

* Remove thread from class

* timings

* cleanup conflicts

* update submodules

* update submodules

* update submodules

* loop or not to loop

* named audio XML

* Update submodules

* format

* format again cause git didnt see it for some reason

* move drlib to submodule

* Update apt-deps.txt

* Fix for new cmake

* fix game interactor

* Update macports-deps.txt

* PR fixes and fix OTRExporter for mac

* format

* format

* ifdef intrin header

* Docs

* use macro for preview

* Small fixes

* format

* fix 2nd day clock town

* Update exporter

* Fix duplicate global in stubs.c

* restore editor to use cvars again sadge

* Format

* warn if more than 255 sequences

* use main seq player to avoid an overflow

* fix the wrong seq playing in the editor again

* 16 bit seqIds

* fix shop crash

* format

* cleanups

* Delete audio collection

* Add entry to modern menu

* Cleanup the audio collection

* fix clock town randomization

* format

* format again

* some fixes for custom audio (#1)

* how I would sort the sequences (#2)

clang

one more

forgot to revert

Co-authored-by: mckinlee 

* Adjustments to ocarina song types

* stereo

* format

* Loop point support

* Part of a PR review

* Remove drlib submodule

* Clarify change

* Format

* Add tag

* switch to find_package

* bump ZAPDTR

* Milk bar day/night fix

* x86 SIMD for aMixImpl

* format

* NEON

* format

* remove | 0x900 causing a crash

* Asan fixes

* add missing define for MSVC

* Clock town fixes

Co-authored-by: mckinlee 

* format

* Fix underscore logic in audio collection

* Use torch sample XML format

* fix font map size and format

* quick fix

* Update exporter

* Opus

* actions packages

* fix it again?

* Fix a few missed 16 bit masks

* Remove unused stubs

* Revert "Fix a few missed 16 bit masks"

This reverts commit 7143c4ff92d23157a79a10b4ee62e93e35acb23e.

* Opus decoding

* Fixes for linux and other things

* free opus data

* format

* Update FindOpusFile.cmake

* bria's fix?

* Update BenMenuBar.cpp

* Update BenMenuBar.cpp

* Split ocarina tabs

* better error handling

* Remove unused vectors

* move audio editor to enhancements

* Fix mac again?

* Final cleanups

* Format

* extern C

* Allow custom fanfares to be used in songs

* format

* WIP sf editor support

* Format

* Jacks fixes

* Bump submodule

* Archez's fixes

* Format

---------

Co-authored-by: mckinlee 
Co-authored-by: Archez