Code

Custom Audio Support#778

Code

Open

louist103 wants to merge 145 commits intoHarbourMasters:developHarbourMasters/2ship2harkinian:developfrom louist103:customAudio2louist103/2ship2harkinian:customAudio2Copy head branch name to clipboard

+7,458-6,984

Commits

Commits on Jun 28, 2024

• Implement custom sequences and the audio editor.

  louist103

  committed
  dd59a56

  Copy full SHA for dd59a56

• Fix implicit function declaration AudioEditor_GetReplacementSeq

  louist103

  committed
  e90cab7

  Copy full SHA for e90cab7

• Fix mac again.

  louist103

  committed
  79cd020

  Copy full SHA for 79cd020

• String and header cleanup

  louist103

  committed
  cac05a1

  Copy full SHA for cac05a1

• Oops

  louist103

  committed
  a6fae26

  Copy full SHA for a6fae26

Commits on Jun 30, 2024

• WIP ZIP Sound fonts

  louist103

  committed
  eb9f3e6

  Copy full SHA for eb9f3e6

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

  louist103

  committed
  65a1405

  Copy full SHA for 65a1405

Commits on Jul 1, 2024

• Name sequences

  louist103

  committed
  5b25e62

  Copy full SHA for 5b25e62

• Cleanup the SF importer a little.

  louist103

  committed
  bc92ebf

  Copy full SHA for bc92ebf

Commits on Jul 3, 2024

• XML Sequences good

  louist103

  committed
  aae5f59

  Copy full SHA for aae5f59

• Fix mac

  louist103

  committed
  eadf08d

  Copy full SHA for eadf08d

Commits on Jul 4, 2024

• Destructor

  louist103

  committed
  3e9e50a

  Copy full SHA for 3e9e50a

• Bump submodule

  louist103

  committed
  6a0bcbe

  Copy full SHA for 6a0bcbe

Commits on Jul 18, 2024

• Thread safe queue

  louist103

  committed
  e0d55e7

  Copy full SHA for e0d55e7

• Add WAV decoder

  louist103

  committed
  92d4eee

  Copy full SHA for 92d4eee

• sequenceMap->mSequenceMap and a string fix

  louist103

  committed
  0eb669f

  Copy full SHA for 0eb669f

• Streamed sequence importer

  louist103

  committed
  c46d738

  Copy full SHA for c46d738

Commits on Aug 17, 2024

• Add s16 sample processing.

  louist103

  committed
  ae494b0

  Copy full SHA for ae494b0

• Fix drwave define

  louist103

  committed
  36033f3

  Copy full SHA for 36033f3

• Fix STB

  louist103

  committed
  953ba73

  Copy full SHA for 953ba73

Commits on Aug 24, 2024

• Reorder the loading to enable custom sound fonts

  louist103

  committed
  93296bc

  Copy full SHA for 93296bc

• New streamed solution

  louist103

  committed
  d6f0e20

  Copy full SHA for d6f0e20

• Bump exporter

  louist103

  committed
  ca56117

  Copy full SHA for ca56117

Commits on Aug 25, 2024

• Generate 1 minute long looping sequence.

  louist103

  committed
  1465f7b

  Copy full SHA for 1465f7b

Commits on Aug 27, 2024

• Very long sample support (113 minutes or so)

  louist103

  committed
  0cf00df

  Copy full SHA for 0cf00df

• MP3 Decoding

  louist103

  committed
  63b305e

  Copy full SHA for 63b305e

• Don't byteswap the crc from XML.

  louist103

  committed
  915169b

  Copy full SHA for 915169b

Commits on Sep 1, 2024

• WIP OGG

  louist103

  committed
  6bcf490

  Copy full SHA for 6bcf490

Commits on Sep 5, 2024

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

  louist103

  committed
  bb16026

  Copy full SHA for bb16026

• Just throw more cores at the problem

  louist103

  committed
  cc7f341

  Copy full SHA for cc7f341

Commits on Sep 6, 2024

• Dynamically allocate fontMap

  louist103

  committed
  ce93ca0

  Copy full SHA for ce93ca0

• Re-add OOB read fix from old branch

  louist103

  committed
  bb2c084

  Copy full SHA for bb2c084

• FLAC decoder, threads for the other compressed formats

  louist103

  committed
  2a73ed4

  Copy full SHA for 2a73ed4

• Remove thread from class

  louist103

  committed
  a5c7dfc

  Copy full SHA for a5c7dfc

Commits on Sep 23, 2024

• timings

  louist103

  committed
  b43edd4

  Copy full SHA for b43edd4

Commits on Sep 24, 2024

• cleanup conflicts

  louist103

  committed
  d0fc330

  Copy full SHA for d0fc330

• update submodules

  louist103

  committed
  3f404df

  Copy full SHA for 3f404df

• update submodules

  louist103

  committed
  d0b2c97

  Copy full SHA for d0b2c97

Commits on Sep 25, 2024

• update submodules

  louist103

  committed
  5c0225b

  Copy full SHA for 5c0225b

Commits on Oct 3, 2024

• loop or not to loop

  louist103

  committed
  d8ea4ed

  Copy full SHA for d8ea4ed

• named audio XML

  louist103

  committed
  a58ed3d

  Copy full SHA for a58ed3d

Commits on Oct 5, 2024

• Update submodules

  louist103

  committed
  734726e

  Copy full SHA for 734726e

• merge

  louist103

  committed
  49d9fe8

  Copy full SHA for 49d9fe8

• format

  louist103

  committed
  bfa9706

  Copy full SHA for bfa9706

• format again cause git didnt see it for some reason

  louist103

  committed
  9f3d846

  Copy full SHA for 9f3d846

• move drlib to submodule

  louist103

  committed
  2019e98

  Copy full SHA for 2019e98

• Conflict

  louist103

  committed
  e186dce

  Copy full SHA for e186dce

• Merge branch 'develop' into customAudio2

  louist103

  authored
  6ccc5fc

  Copy full SHA for 6ccc5fc

• Update apt-deps.txt

  louist103

  authored
  628b823

  Copy full SHA for 628b823

• Fix for new cmake

  louist103

  committed
  15ce6e9

  Copy full SHA for 15ce6e9

• fix game interactor

  louist103

  committed
  d4411b5

  Copy full SHA for d4411b5

• Update macports-deps.txt

  louist103

  authored
  fb2302f

  Copy full SHA for fb2302f

• PR fixes and fix OTRExporter for mac

  louist103

  committed
  a4cdbc1

  Copy full SHA for a4cdbc1

• Merge branch 'customAudio2' of https://github.com/louist103/2ship2harkinian into customAudio2

  louist103

  committed
  a41d090

  Copy full SHA for a41d090

• format

  louist103

  committed
  dc96e96

  Copy full SHA for dc96e96

Commits on Oct 6, 2024

• format

  louist103

  committed
  158648f

  Copy full SHA for 158648f

• ifdef intrin header

  louist103

  committed
  955a329

  Copy full SHA for 955a329

• Merge branch 'customAudio2' of https://github.com/louist103/2ship2harkinian into customAudio2

  louist103

  committed
  fd97c91

  Copy full SHA for fd97c91

• Docs

  louist103

  committed
  07c9a08

  Copy full SHA for 07c9a08

Commits on Oct 8, 2024

• use macro for preview

  louist103

  committed
  27c2522

  Copy full SHA for 27c2522

• Small fixes

  louist103

  committed
  da1cf35

  Copy full SHA for da1cf35

• format

  louist103

  committed
  96cd60f

  Copy full SHA for 96cd60f

Commits on Oct 9, 2024

• fix 2nd day clock town

  louist103

  committed
  c24f0d2

  Copy full SHA for c24f0d2

Commits on Oct 10, 2024

• Update exporter

  louist103

  committed
  e3a7e82

  Copy full SHA for e3a7e82

Commits on Oct 11, 2024

• Fix duplicate global in stubs.c

  louist103

  committed
  dc779a5

  Copy full SHA for dc779a5

• restore editor to use cvars again sadge

  louist103

  committed
  3493553

  Copy full SHA for 3493553

• Format

  louist103

  committed
  414b832

  Copy full SHA for 414b832

• Merge branch 'develop' into customAudio2

  louist103

  authored
  0fb8f67

  Copy full SHA for 0fb8f67

Commits on Oct 12, 2024

• warn if more than 255 sequences

  louist103

  committed
  a14ba79

  Copy full SHA for a14ba79

• use main seq player to avoid an overflow

  louist103

  committed
  d6615c5

  Copy full SHA for d6615c5

• Merge branch 'customAudio2' of https://github.com/louist103/2ship2harkinian into customAudio2

  louist103

  committed
  1917d67

  Copy full SHA for 1917d67

Commits on Oct 14, 2024

• fix the wrong seq playing in the editor again

  louist103

  committed
  852e1e1

  Copy full SHA for 852e1e1

Commits on Oct 18, 2024

• 16 bit seqIds

  louist103

  committed
  379bc5d

  Copy full SHA for 379bc5d

Commits on Oct 19, 2024

• fix shop crash

  louist103

  committed
  ae29eb7

  Copy full SHA for ae29eb7

• format

  louist103

  committed
  795586e

  Copy full SHA for 795586e

• cleanups

  louist103

  committed
  dd17321

  Copy full SHA for dd17321

Commits on Oct 20, 2024

• Delete audio collection

  louist103

  committed
  69cc9cc

  Copy full SHA for 69cc9cc

• Add entry to modern menu

  louist103

  committed
  3b92153

  Copy full SHA for 3b92153

• Cleanup the audio collection

  louist103

  committed
  5a184a5

  Copy full SHA for 5a184a5

• fix clock town randomization

  louist103

  committed
  9f1e6ab

  Copy full SHA for 9f1e6ab

• format

  louist103

  committed
  98af18f

  Copy full SHA for 98af18f

Commits on Oct 22, 2024

• format again

  louist103

  committed
  e3f9cc5

  Copy full SHA for e3f9cc5

Commits on Oct 23, 2024

• some fixes for custom audio (#1)

  mckinlee

  authored
  0433a89

  Copy full SHA for 0433a89

Commits on Oct 24, 2024

• how I would sort the sequences (#2)

  Show description for a53439e
  

  louist103

  and

  mckinlee

  authored
  a53439e

  Copy full SHA for a53439e

Commits on Oct 27, 2024

• Adjustments to ocarina song types

  louist103

  committed
  edfa595

  Copy full SHA for edfa595

Commits on Oct 28, 2024

• stereo

  louist103

  committed
  754bc74

  Copy full SHA for 754bc74

Commits on Oct 31, 2024

• format

  louist103

  committed
  0645457

  Copy full SHA for 0645457

Commits on Nov 3, 2024

• Loop point support

  louist103

  committed
  e4d0941

  Copy full SHA for e4d0941

• Merge branch 'customAudio2' of https://github.com/louist103/2ship2harkinian into customAudio2

  louist103

  committed
  7f0e6ae

  Copy full SHA for 7f0e6ae

Commits on Nov 5, 2024

• Merge branch 'develop' into customAudio2

  louist103

  authored
  3afe66a

  Copy full SHA for 3afe66a

Commits on Nov 7, 2024

• Merge remote-tracking branch 'upstream/develop' into customAudio2

  louist103

  committed
  c4021da

  Copy full SHA for c4021da

• Part of a PR review

  louist103

  committed
  5e44d8c

  Copy full SHA for 5e44d8c

Commits on Nov 8, 2024

• Remove drlib submodule

  louist103

  committed
  febed7b

  Copy full SHA for febed7b

• Clarify change

  louist103

  committed
  7be4dc7

  Copy full SHA for 7be4dc7

• Merge branch 'develop' into customAudio2

  louist103

  authored
  acbe2f7

  Copy full SHA for acbe2f7

• Format

  louist103

  committed
  54478a1

  Copy full SHA for 54478a1

• Add tag

  louist103

  committed
  5c970f0

  Copy full SHA for 5c970f0

• Merge branch 'customAudio2' of https://github.com/louist103/2ship2harkinian into customAudio2

  louist103

  committed
  e83d8b7

  Copy full SHA for e83d8b7

• switch to find_package

  Archez

  committed
  ca33b1f

  Copy full SHA for ca33b1f

Commits on Nov 9, 2024

• bump ZAPDTR

  louist103

  committed
  bedafde

  Copy full SHA for bedafde

Commits on Nov 12, 2024

• Milk bar day/night fix

  louist103

  committed
  8dd127d

  Copy full SHA for 8dd127d

Commits on Nov 23, 2024

• x86 SIMD for aMixImpl

  louist103

  committed
  23ca06f

  Copy full SHA for 23ca06f

• Merge branch 'develop' into customAudio2

  louist103

  authored
  92c8402

  Copy full SHA for 92c8402

• format

  louist103

  committed
  5e98ea5

  Copy full SHA for 5e98ea5

Commits on Nov 24, 2024

• NEON

  louist103

  committed
  b6a3bf8

  Copy full SHA for b6a3bf8

• format

  louist103

  committed
  a76f1f8

  Copy full SHA for a76f1f8

Commits on Nov 25, 2024

• remove | 0x900 causing a crash

  louist103

  committed
  d54c4b8

  Copy full SHA for d54c4b8

• Asan fixes

  louist103

  committed
  8a00f35

  Copy full SHA for 8a00f35

• add missing define for MSVC

  louist103

  committed
  75cd5d2

  Copy full SHA for 75cd5d2

Commits on Nov 27, 2024

• Clock town fixes

  Show description for 7e3c33f
  

  louist103

  and

  mckinlee

  committed
  7e3c33f

  Copy full SHA for 7e3c33f

• format

  louist103

  committed
  04e46aa

  Copy full SHA for 04e46aa

Commits on Nov 28, 2024

• Fix underscore logic in audio collection

  louist103

  committed
  ff5c0d3

  Copy full SHA for ff5c0d3

• Use torch sample XML format

  louist103

  committed
  1c0568f

  Copy full SHA for 1c0568f

• fix font map size and format

  louist103

  committed
  815f46a

  Copy full SHA for 815f46a

• quick fix

  louist103

  committed
  fa35e34

  Copy full SHA for fa35e34

Commits on Dec 2, 2024

• Update exporter

  louist103

  committed
  75d01ba

  Copy full SHA for 75d01ba

Commits on Dec 7, 2024

• Opus

  louist103

  committed
  7fdc75b

  Copy full SHA for 7fdc75b

• actions packages

  louist103

  committed
  ea3ed23

  Copy full SHA for ea3ed23

• fix it again?

  louist103

  committed
  5dca7d0

  Copy full SHA for 5dca7d0

Commits on Dec 8, 2024

• Fix a few missed 16 bit masks

  louist103

  committed
  7143c4f

  Copy full SHA for 7143c4f

• Remove unused stubs

  louist103

  committed
  1190fbd

  Copy full SHA for 1190fbd

Commits on Dec 16, 2024

• Revert "Fix a few missed 16 bit masks"

  Show description for a4cb09d
  louist103

  committed
  a4cb09d

  Copy full SHA for a4cb09d

Commits on Dec 18, 2024

• Opus decoding

  louist103

  committed
  eb8370a

  Copy full SHA for eb8370a

Commits on Dec 19, 2024

• Fixes for linux and other things

  louist103

  committed
  5bcc466

  Copy full SHA for 5bcc466

• free opus data

  louist103

  committed
  c2e5240

  Copy full SHA for c2e5240

• format

  louist103

  committed
  bc38f2e

  Copy full SHA for bc38f2e

Commits on Dec 20, 2024

• Update FindOpusFile.cmake

  louist103

  committed
  254e4b3

  Copy full SHA for 254e4b3

• bria's fix?

  louist103

  committed
  5ac7177

  Copy full SHA for 5ac7177

• Merge branch 'develop' into customAudio2

  louist103

  authored
  dfc090d

  Copy full SHA for dfc090d

• Update BenMenuBar.cpp

  louist103

  authored
  e2b9307

  Copy full SHA for e2b9307

• Update BenMenuBar.cpp

  louist103

  authored
  836d8d3

  Copy full SHA for 836d8d3

Commits on Dec 21, 2024

• Split ocarina tabs

  louist103

  committed
  15a3ed7

  Copy full SHA for 15a3ed7

• better error handling

  louist103

  committed
  b71d9bb

  Copy full SHA for b71d9bb

• Remove unused vectors

  louist103

  committed
  fc4d1fc

  Copy full SHA for fc4d1fc

Commits on Dec 22, 2024

• move audio editor to enhancements

  louist103

  committed
  8364276

  Copy full SHA for 8364276

Commits on Dec 25, 2024

• Fix mac again?

  louist103

  committed
  2ac2982

  Copy full SHA for 2ac2982

Commits on Dec 29, 2024

• Final cleanups

  louist103

  committed
  56a4cab

  Copy full SHA for 56a4cab

• merge

  louist103

  committed
  acfcbfc

  Copy full SHA for acfcbfc

• Format

  louist103

  committed
  026315a

  Copy full SHA for 026315a

• extern C

  louist103

  committed
  59c45ba

  Copy full SHA for 59c45ba

Commits on Jan 5, 2025

• Allow custom fanfares to be used in songs

  louist103

  committed
  cc4197c

  Copy full SHA for cc4197c

Commits on Jan 28, 2025

• Conflicts, add audio editor back to new menu

  louist103

  committed
  66de11a

  Copy full SHA for 66de11a

• format

  louist103

  committed
  35533d3

  Copy full SHA for 35533d3

Commits on Feb 16, 2025

• WIP sf editor support

  louist103

  committed
  771f9eb

  Copy full SHA for 771f9eb

• Merge remote-tracking branch 'refs/remotes/origin/customAudio2' into customAudio2

  louist103

  committed
  3ad6535

  Copy full SHA for 3ad6535