summaryrefslogtreecommitdiff
path: root/CMake
AgeCommit message (Collapse)Author
2025-11-17LUS bump to make trace available to debug+release (#1334)Eblo
2025-11-03Address logging issues (#1317)Eblo
* Address logging issues * Default log levels for debug and release
2025-05-18LUS update (#1142)louist103
* LUS update * Commit backend refactor * Cleanup tinyxml includes * Add LUS again * Rebase LUS * LUS bump * Point to LUS main * Fix metal * Bump LUS to test * Chagnes for removed cvar dropped file
2025-04-16Bump extraction tools and bring over OOT changes (#1120)louist103
* Bump extraction tools and bring over OOT changes * Fix appimage * Fix again * Fix path for builtin extractor * Fix mac hopefully * Remove 's' * update gitmodules
2025-03-03Fix FindOpusFile for Homebrew. (#1039)ReddestDream
2025-03-02Custom Audio Support (#778)louist103
* 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 <mckinlee@ymail.com> * 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 <mckinlee@ymail.com> * 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 <mckinlee@ymail.com> Co-authored-by: Archez <archez39@me.com>
2025-02-16pin linuxdeploy (#996)briaguya
see https://github.com/HarbourMasters/Shipwright/pull/5070
2025-02-05macOS Game Mode Support for 2Ship2Harkinian (#811)Lars-Christian Selland
* final commit(hopefully) * Moving directory creation logic out of LUS * Update BenPort.cpp * move Ternary operator one line down to keep to the clang limit * I have no idea how clang works * Using ChatGPT to hopefully fix the formatting because I'm tired * ChatGPT is useless, it's brain time * Will Putin become the next Miss America? * I hope this works for slimming down 2s2h(Mac) as well My builds have gotten double their original size since I started taking care of them and I feel bad about it :( * Some final pre merge cleanup Removed the bash script and its references * Updated to follow Archez's new conventions * Parity with upstream * updated git ignore * update git ignore again * Re-added the folder creation function * I should pay more attention to what I am doing * Update mm/macosx/Info.plist.in Co-authored-by: Archez <Archez@users.noreply.github.com> * Update CMakeLists.txt * desperation * Revert "desperation" This reverts commit 6aea78dc92b767bc5073a6e632e3955a2b9ad451. * Update .gitignore * does this do the trick? * Revert "does this do the trick?" This reverts commit 267fbfb2bbb5a6306f485c30eb335870f90318b3. * Revert "Parity with upstream" This reverts commit 6bfdee805e0c8b41b104e1131a7341e14259f82b. * Update libultraship * Revert "Update libultraship" This reverts commit e9e07473bc5216311de92f0aeded00564079f7e7. --------- Co-authored-by: Archez <Archez@users.noreply.github.com>
2025-01-24Remove caching from CVar prefix defines (#966)Archez
2024-05-31Bump LUS (#625)Garrett Cox
2024-05-31Implement Alt Assets Variable LUS (#619)Malkierian
* Bump LUS to `94b755b77c0c0f566686c9d23fa4c15e23473a0c`. Remove `CVAR_ALT_ASSETS` from LUS cvars cmake. Change all pertinent `CVarGetInteger` calls for `CVAR_ALT_ASSETS` to `ResourceManager::IsAltAssetsEnabled`. Implement frame-end toggle of `mAltAssetsEnabled`. * Remove `ShouldClearTextureCacheAtEndOfFrame`. Move prevAltAssets check to end of `Gfx_ProcessGfxCommands`. * Missed initial `mAltAssetsEnabled` set.
2024-05-30ci(linux): install libzip without crypto, bump sdl from 2.28.5 -> 2.30.3 (#588)briaguya
* ci(linux): install libzip without crypto, bump sdl from 2.28.5 -> 2.30.3 * just install libzip with apt for otr gen * copy the .so to a place linuxdeploy looks for it * but do it in the right place
2024-05-30Fix o2r file copy (#592)Archez
* fix o2r file copy script * move script to cmake folder
2024-05-27Fix macports cache (#543)Archez
* fix macports cache * cache key obey os version * more tweaks * fix sccache and try mac gtar replacement * oh a custom gtar wrapper.. * comments and different test * update * soh otr after main build * cache bust * 2ship o2r builder * change install path * bust cache * sccache cmake fixes * dont list 2ship.o2r in pr artifacts
2024-05-26exclude `libcrypto` from appimage (instead rely on system version of ↵briaguya
openssl) (#485) Co-authored-by: Archez <Archez@users.noreply.github.com>
2024-05-26Rename CMake project from mm to 2ship (#487)Archez
2024-05-24Use temporary cvar to disable close color wrapping for now (#472)Garrett Cox
2024-05-23Add cvar overrides for LUS (#464)Garrett Cox
2024-05-22Pack and publish release builds (#300)Archez
* pack release builds * changes * test * more * different unzip * different unzip 2 * add pr artifacts action * mm hashes * add gc rom * update linux sh * fix windows linking * give windows release a console * tweaks
2024-05-22Add cmake for bundling mac app and add mac icon (#177)Archez
2024-05-22Initial commit for 2S2HGarrett Cox
Co-authored-by: Louis <35883445+louist103@users.noreply.github.com> Co-authored-by: Nicholas Estelami <NEstelami@users.noreply.github.com> Co-authored-by: Random06457 <28494085+Random06457@users.noreply.github.com>