<feed xmlns='http://www.w3.org/2005/Atom'>
<title>2ship2harkinian/OTRExporter, branch develop</title>
<subtitle>2Ship2Harkinian: Majora’s Mask PC port</subtitle>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/'/>
<entry>
<title>Bump LUS and OTRExporter, add null audio backend (#1289)</title>
<updated>2025-10-29T16:56:57+00:00</updated>
<author>
<name>Eblo</name>
<email>7004497+Eblo@users.noreply.github.com</email>
</author>
<published>2025-10-29T16:56:57+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=83921dc012588c520efe0ed8c7ac1406806543c7'/>
<id>83921dc012588c520efe0ed8c7ac1406806543c7</id>
<content type='text'>
* Bump LUS and OTRExporter, add null audio backend

* Missed an include change

* And again

* Thanks macOS

* Another one

* Bump LUS again, fixing SDL audio backend bug

* Sync LUS bump changes to merged PRs

* Bump LUS again

* Update CMakeLists.txt includes</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
* Bump LUS and OTRExporter, add null audio backend

* Missed an include change

* And again

* Thanks macOS

* Another one

* Bump LUS again, fixing SDL audio backend bug

* Sync LUS bump changes to merged PRs

* Bump LUS again

* Update CMakeLists.txt includes</pre>
</div>
</content>
</entry>
<entry>
<title>Lus Bump (#1179)</title>
<updated>2025-07-21T18:26:40+00:00</updated>
<author>
<name>louist103</name>
<email>35883445+louist103@users.noreply.github.com</email>
</author>
<published>2025-07-21T18:26:40+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=2d1d03828b6ae1c0b1b3e99f66335d36df6be902'/>
<id>2d1d03828b6ae1c0b1b3e99f66335d36df6be902</id>
<content type='text'>
* 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</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
* 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</pre>
</div>
</content>
</entry>
<entry>
<title>Bump extraction tools and bring over OOT changes (#1120)</title>
<updated>2025-04-16T22:25:21+00:00</updated>
<author>
<name>louist103</name>
<email>35883445+louist103@users.noreply.github.com</email>
</author>
<published>2025-04-16T22:25:21+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=be9339b80b805834bbf82091723de811fff817ef'/>
<id>be9339b80b805834bbf82091723de811fff817ef</id>
<content type='text'>
* Bump extraction tools and bring over OOT changes

* Fix appimage

* Fix again

* Fix path for builtin extractor

* Fix mac hopefully

* Remove 's'

* update gitmodules</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
* Bump extraction tools and bring over OOT changes

* Fix appimage

* Fix again

* Fix path for builtin extractor

* Fix mac hopefully

* Remove 's'

* update gitmodules</pre>
</div>
</content>
</entry>
<entry>
<title>Add option to de-select XMLs and fix credits (#1064)</title>
<updated>2025-03-17T15:06:03+00:00</updated>
<author>
<name>louist103</name>
<email>35883445+louist103@users.noreply.github.com</email>
</author>
<published>2025-03-17T15:06:03+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=d20976f7e628d3bd2171d3b4714bc960b6d1138f'/>
<id>d20976f7e628d3bd2171d3b4714bc960b6d1138f</id>
<content type='text'>
* Add option to de-select XMLs

* Format

* Bump ZAPD

* Fix credits

* Format

* Final bump

* Actual final push.

* Actual final bump</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
* Add option to de-select XMLs

* Format

* Bump ZAPD

* Fix credits

* Format

* Final bump

* Actual final push.

* Actual final bump</pre>
</div>
</content>
</entry>
<entry>
<title>Custom Audio Support (#778)</title>
<updated>2025-03-03T04:30:05+00:00</updated>
<author>
<name>louist103</name>
<email>35883445+louist103@users.noreply.github.com</email>
</author>
<published>2025-03-03T04:30:05+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=2d0942a1b187938f55d34c71e0965e37a70b1094'/>
<id>2d0942a1b187938f55d34c71e0965e37a70b1094</id>
<content type='text'>
* 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-&gt;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 &lt;mckinlee@ymail.com&gt;

* 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 &lt;mckinlee@ymail.com&gt;

* 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 &lt;mckinlee@ymail.com&gt;
Co-authored-by: Archez &lt;archez39@me.com&gt;</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
* 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-&gt;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 &lt;mckinlee@ymail.com&gt;

* 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 &lt;mckinlee@ymail.com&gt;

* 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 &lt;mckinlee@ymail.com&gt;
Co-authored-by: Archez &lt;archez39@me.com&gt;</pre>
</div>
</content>
</entry>
<entry>
<title>Bump LUS and OTRExporter pt.3 (#984)</title>
<updated>2025-02-04T15:28:18+00:00</updated>
<author>
<name>Archez</name>
<email>Archez@users.noreply.github.com</email>
</author>
<published>2025-02-04T15:28:18+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=7896a0f648170c8826ac8b2330d86933779a5545'/>
<id>7896a0f648170c8826ac8b2330d86933779a5545</id>
<content type='text'>
* Bump LUS and OTRExporter pt.3

* Remove outdated controller disclaimer</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
* Bump LUS and OTRExporter pt.3

* Remove outdated controller disclaimer</pre>
</div>
</content>
</entry>
<entry>
<title>Bump LUS and OTRExporter pt.1 (#982)</title>
<updated>2025-02-04T03:34:17+00:00</updated>
<author>
<name>Archez</name>
<email>Archez@users.noreply.github.com</email>
</author>
<published>2025-02-04T03:34:17+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=63079f1cf67f3ba90367111cab447db51617ca81'/>
<id>63079f1cf67f3ba90367111cab447db51617ca81</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>fix zora magic shield alpha (#768)</title>
<updated>2024-09-12T20:32:19+00:00</updated>
<author>
<name>Archez</name>
<email>Archez@users.noreply.github.com</email>
</author>
<published>2024-09-12T20:32:19+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=137ca0de12e43c29ea634dd4b3896c5b8ec6c956'/>
<id>137ca0de12e43c29ea634dd4b3896c5b8ec6c956</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Bump latest lus and bring over Array resource (#689)</title>
<updated>2024-06-19T00:00:16+00:00</updated>
<author>
<name>Archez</name>
<email>Archez@users.noreply.github.com</email>
</author>
<published>2024-06-19T00:00:16+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=8b2b12dbe8a308550cde067b4821025ff4128767'/>
<id>8b2b12dbe8a308550cde067b4821025ff4128767</id>
<content type='text'>
* bump latest lus and bring over array resource

* use upstream otrexporter</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
* bump latest lus and bring over array resource

* use upstream otrexporter</pre>
</div>
</content>
</entry>
<entry>
<title>update to latest lus main (#614)</title>
<updated>2024-05-31T03:30:05+00:00</updated>
<author>
<name>briaguya</name>
<email>70942617+briaguya-ai@users.noreply.github.com</email>
</author>
<published>2024-05-31T03:30:05+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=65870f3c075a62cbbb9bf68f120817fbfc195e68'/>
<id>65870f3c075a62cbbb9bf68f120817fbfc195e68</id>
<content type='text'>
* update to latest lus main

* upstream otrexporter and zapdtr submodules

* upstream LUS submodule</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
* update to latest lus main

* upstream otrexporter and zapdtr submodules

* upstream LUS submodule</pre>
</div>
</content>
</entry>
</feed>
