* 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>
317 lines
11 KiB
YAML
317 lines
11 KiB
YAML
name: generate-builds
|
|
on:
|
|
push:
|
|
pull_request:
|
|
concurrency:
|
|
group: ${{ github.workflow }}-${{ github.ref }}
|
|
cancel-in-progress: true
|
|
jobs:
|
|
generate-soh-otr:
|
|
runs-on: ${{ (vars.LINUX_RUNNER && fromJSON(vars.LINUX_RUNNER)) || 'ubuntu-latest' }}
|
|
steps:
|
|
- uses: actions/checkout@v3
|
|
with:
|
|
submodules: true
|
|
- name: ccache
|
|
uses: hendrikmuhs/ccache-action@v1.2
|
|
with:
|
|
key: ${{ runner.os }}-soh-otr-ccache
|
|
- name: Install dependencies
|
|
if: ${{ !vars.LINUX_RUNNER }}
|
|
run: |
|
|
sudo apt-get update
|
|
sudo apt-get install -y $(cat .github/workflows/apt-deps.txt)
|
|
- name: Install latest SDL
|
|
if: ${{ !vars.LINUX_RUNNER }}
|
|
run: |
|
|
export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
|
|
wget https://www.libsdl.org/release/SDL2-2.26.1.tar.gz
|
|
tar -xzf SDL2-2.26.1.tar.gz
|
|
cd SDL2-2.26.1
|
|
./configure
|
|
make -j 10
|
|
sudo make install
|
|
sudo cp -av /usr/local/lib/libSDL* /lib/x86_64-linux-gnu/
|
|
- name: Install latest SDL_net
|
|
if: ${{ !vars.LINUX_RUNNER }}
|
|
run: |
|
|
export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
|
|
wget https://www.libsdl.org/projects/SDL_net/release/SDL2_net-2.2.0.tar.gz
|
|
tar -xzf SDL2_net-2.2.0.tar.gz
|
|
cd SDL2_net-2.2.0
|
|
./configure
|
|
make -j 10
|
|
sudo make install
|
|
sudo cp -av /usr/local/lib/libSDL* /lib/x86_64-linux-gnu/
|
|
- name: Generate soh.otr
|
|
run: |
|
|
export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
|
|
cmake --no-warn-unused-cli -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE:STRING=Release
|
|
cmake --build build-cmake --config Release --target ZAPD
|
|
mkdir Extract
|
|
cp -r OTRExporter/assets/ ./Extract/assets
|
|
./build-cmake/ZAPD/ZAPD.out botr -se OTR --norom
|
|
- uses: actions/upload-artifact@v3
|
|
with:
|
|
name: soh.otr
|
|
path: soh.otr
|
|
retention-days: 1
|
|
build-macos:
|
|
needs: generate-soh-otr
|
|
runs-on: ${{ (vars.MAC_RUNNER && fromJSON(vars.MAC_RUNNER)) || 'macos-12' }}
|
|
steps:
|
|
- uses: actions/checkout@v3
|
|
with:
|
|
submodules: true
|
|
- name: ccache
|
|
uses: hendrikmuhs/ccache-action@v1.2
|
|
with:
|
|
key: ${{ runner.os }}-ccache
|
|
- name: Install gtar wrapper
|
|
if: ${{ !vars.MAC_RUNNER }}
|
|
run: |
|
|
sudo mv /usr/local/bin/gtar /usr/local/bin/gtar.orig
|
|
sudo cp .github/workflows//gtar /usr/local/bin/gtar
|
|
sudo chmod +x /usr/local/bin/gtar
|
|
- name: Cache MacPorts
|
|
id: cache-macports
|
|
if: ${{ !vars.MAC_RUNNER }}
|
|
uses: actions/cache@v2
|
|
with:
|
|
path: /opt/local/
|
|
key: ${{ runner.os }}-macports-${{ hashFiles('.github/workflows/macports-deps.txt') }}
|
|
restore-keys: |
|
|
${{ runner.os }}-macports-
|
|
- name: Install MacPorts (if necessary)
|
|
if: ${{ !vars.MAC_RUNNER }}
|
|
run: |
|
|
if [ -d /opt/local/ ]; then
|
|
echo "MacPorts already installed"
|
|
else
|
|
wget https://github.com/macports/macports-base/releases/download/v2.7.2/MacPorts-2.7.2-12-Monterey.pkg
|
|
sudo installer -pkg ./MacPorts-2.7.2-12-Monterey.pkg -target /
|
|
fi
|
|
echo "/opt/local/bin:/opt/local/sbin" >> $GITHUB_PATH
|
|
- name: Install dependencies
|
|
if: ${{ !vars.MAC_RUNNER }}
|
|
run: |
|
|
brew uninstall --ignore-dependencies libpng
|
|
sudo port install $(cat .github/workflows/macports-deps.txt)
|
|
brew install ninja
|
|
- name: Download soh.otr
|
|
uses: actions/download-artifact@v3
|
|
with:
|
|
name: soh.otr
|
|
- name: Build SoH
|
|
run: |
|
|
export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
|
|
cmake --no-warn-unused-cli -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"
|
|
cmake --build build-cmake --config Release --parallel 10
|
|
mv soh.otr build-cmake/soh
|
|
(cd build-cmake && cpack)
|
|
|
|
mv _packages/*.dmg SoH.dmg
|
|
mv README.md readme.txt
|
|
- name: Upload build
|
|
uses: actions/upload-artifact@v3
|
|
with:
|
|
name: soh-mac
|
|
path: |
|
|
SoH.dmg
|
|
readme.txt
|
|
build-linux:
|
|
needs: generate-soh-otr
|
|
strategy:
|
|
fail-fast: true
|
|
matrix:
|
|
include:
|
|
- os: ubuntu-20.04
|
|
gcc: 10
|
|
archive-suffix: compatibility
|
|
- os: ubuntu-22.04
|
|
gcc: 12
|
|
archive-suffix: performance
|
|
runs-on: ${{ (matrix.os == 'ubuntu-20.04' && ((vars.LINUX_COMPATIBILITY_RUNNER && fromJSON(vars.LINUX_COMPATIBILITY_RUNNER)) || matrix.os)) || (matrix.os == 'ubuntu-22.04' && ((vars.LINUX_PERFORMANCE_RUNNER && fromJSON(vars.LINUX_PERFORMANCE_RUNNER)) || matrix.os)) }}
|
|
steps:
|
|
- uses: actions/checkout@v3
|
|
with:
|
|
submodules: true
|
|
- name: Install dependencies
|
|
if: ${{ (matrix.os == 'ubuntu-20.04' && !vars.LINUX_COMPATIBILITY_RUNNER) || (matrix.os == 'ubuntu-22.04' && !vars.LINUX_PERFORMANCE_RUNNER) }}
|
|
run: |
|
|
sudo apt-get update
|
|
sudo apt-get install -y $(cat .github/workflows/apt-deps.txt)
|
|
- name: ccache
|
|
uses: hendrikmuhs/ccache-action@v1.2
|
|
with:
|
|
key: ${{ matrix.os }}-ccache
|
|
- name: Install latest SDL
|
|
if: ${{ (matrix.os == 'ubuntu-20.04' && !vars.LINUX_COMPATIBILITY_RUNNER) || (matrix.os == 'ubuntu-22.04' && !vars.LINUX_PERFORMANCE_RUNNER) }}
|
|
run: |
|
|
export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
|
|
wget https://www.libsdl.org/release/SDL2-2.26.1.tar.gz
|
|
tar -xzf SDL2-2.26.1.tar.gz
|
|
cd SDL2-2.26.1
|
|
./configure
|
|
make -j 10
|
|
sudo make install
|
|
sudo cp -av /usr/local/lib/libSDL* /lib/x86_64-linux-gnu/
|
|
- name: Install latest SDL_net
|
|
if: ${{ (matrix.os == 'ubuntu-20.04' && !vars.LINUX_COMPATIBILITY_RUNNER) || (matrix.os == 'ubuntu-22.04' && !vars.LINUX_PERFORMANCE_RUNNER) }}
|
|
run: |
|
|
export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
|
|
wget https://www.libsdl.org/projects/SDL_net/release/SDL2_net-2.2.0.tar.gz
|
|
tar -xzf SDL2_net-2.2.0.tar.gz
|
|
cd SDL2_net-2.2.0
|
|
./configure
|
|
make -j 10
|
|
sudo make install
|
|
sudo cp -av /usr/local/lib/libSDL* /lib/x86_64-linux-gnu/
|
|
- name: Download soh.otr
|
|
uses: actions/download-artifact@v3
|
|
with:
|
|
name: soh.otr
|
|
- name: Build SoH
|
|
run: |
|
|
export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
|
|
cmake --no-warn-unused-cli -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE:STRING=Release
|
|
cmake --build build-cmake --config Release -j3
|
|
(cd build-cmake && cpack -G External)
|
|
|
|
mv README.md readme.txt
|
|
mv build-cmake/*.appimage soh.appimage
|
|
env:
|
|
CC: gcc-${{ matrix.gcc }}
|
|
CXX: g++-${{ matrix.gcc }}
|
|
- name: Upload build
|
|
uses: actions/upload-artifact@v3
|
|
with:
|
|
name: soh-linux-${{ matrix.archive-suffix }}
|
|
path: |
|
|
soh.appimage
|
|
readme.txt
|
|
build-switch:
|
|
needs: generate-soh-otr
|
|
runs-on: ${{ (vars.LINUX_RUNNER && fromJSON(vars.LINUX_RUNNER)) || 'ubuntu-latest' }}
|
|
container:
|
|
image: devkitpro/devkita64:latest
|
|
steps:
|
|
- name: Install dependencies
|
|
run: |
|
|
sudo apt-get update
|
|
sudo apt-get install -y ninja-build
|
|
- name: Fix dubious ownership error
|
|
if: ${{ vars.LINUX_RUNNER }}
|
|
run: git config --global --add safe.directory '*'
|
|
- uses: actions/checkout@v3
|
|
with:
|
|
submodules: true
|
|
- name: ccache
|
|
uses: hendrikmuhs/ccache-action@v1.2
|
|
with:
|
|
key: ${{ runner.os }}-switch-ccache
|
|
- name: Build SoH
|
|
run: |
|
|
cmake -H. -Bbuild-switch -GNinja -DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/Switch.cmake -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache
|
|
cmake --build build-switch --target soh_nro -j3
|
|
|
|
mv build-switch/soh/*.nro soh.nro
|
|
mv README.md readme.txt
|
|
- name: Download soh.otr
|
|
uses: actions/download-artifact@v3
|
|
with:
|
|
name: soh.otr
|
|
- name: Upload build
|
|
uses: actions/upload-artifact@v3
|
|
with:
|
|
name: soh-switch
|
|
path: |
|
|
soh.nro
|
|
soh.otr
|
|
readme.txt
|
|
# build-wiiu:
|
|
# needs: generate-soh-otr
|
|
# runs-on: ${{ (vars.LINUX_RUNNER && fromJSON(vars.LINUX_RUNNER)) || 'ubuntu-latest' }}
|
|
# container:
|
|
# image: devkitpro/devkitppc:latest
|
|
# steps:
|
|
# - name: Install dependencies
|
|
# if: ${{ !vars.LINUX_RUNNER }}
|
|
# run: |
|
|
# sudo apt-get update
|
|
# sudo apt-get install -y ninja-build
|
|
# - uses: actions/checkout@v3
|
|
# with:
|
|
# submodules: true
|
|
# - name: ccache
|
|
# uses: hendrikmuhs/ccache-action@v1.2
|
|
# with:
|
|
# key: ${{ runner.os }}-wiiu-ccache
|
|
# - name: Build SoH
|
|
# run: |
|
|
# cmake -H. -Bbuild-wiiu -GNinja -DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/WiiU.cmake -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache
|
|
# cmake --build build-wiiu --target soh_wuhb --config Release -j3
|
|
|
|
# mv build-wiiu/soh/*.rpx soh.rpx
|
|
# mv build-wiiu/soh/*.wuhb soh.wuhb
|
|
# mv README.md readme.txt
|
|
# env:
|
|
# DEVKITPRO: /opt/devkitpro
|
|
# DEVKITPPC: /opt/devkitpro/devkitPPC
|
|
# - name: Download soh.otr
|
|
# uses: actions/download-artifact@v3
|
|
# with:
|
|
# name: soh.otr
|
|
# - name: Upload build
|
|
# uses: actions/upload-artifact@v3
|
|
# with:
|
|
# name: soh-wiiu
|
|
# path: |
|
|
# soh.rpx
|
|
# soh.wuhb
|
|
# soh.otr
|
|
# readme.txt
|
|
build-windows:
|
|
needs: generate-soh-otr
|
|
runs-on: ${{ (vars.WINDOWS_RUNNER && fromJSON(vars.WINDOWS_RUNNER)) || 'windows-latest' }}
|
|
steps:
|
|
- name: Install dependencies
|
|
if: ${{ !vars.WINDOWS_RUNNER }}
|
|
run: |
|
|
choco install ninja
|
|
Remove-Item -Path "C:\ProgramData\Chocolatey\bin\ccache.exe" -Force
|
|
- uses: actions/checkout@v3
|
|
with:
|
|
submodules: true
|
|
- name: ccache
|
|
uses: dcvz/ccache-action@27b9f33213c0079872f064f6b6ba0233dfa16ba2
|
|
with:
|
|
key: ${{ runner.os }}-ccache
|
|
- uses: ilammy/msvc-dev-cmd@v1
|
|
- name: Build SoH
|
|
run: |
|
|
set $env:PATH="$env:USERPROFILE/.cargo/bin;$env:PATH"
|
|
cmake -S . -B build-windows -G Ninja -DCMAKE_MAKE_PROGRAM=ninja -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
|
|
cmake --build build-windows --config Release --parallel 10
|
|
|
|
mkdir soh-windows
|
|
mv ./x64/Release/soh.exe ./soh-windows/soh.exe
|
|
mkdir soh-windows/debug
|
|
mkdir soh-windows/mods
|
|
New-Item soh-windows/mods/custom_otr_files_go_here.txt -type file
|
|
mv ./x64/Release/soh.pdb ./soh-windows/debug/soh.pdb
|
|
mv ./README.md ./soh-windows/readme.txt
|
|
mv ./build-windows/gamecontrollerdb.txt ./soh-windows/gamecontrollerdb.txt
|
|
mv ./build-windows/OTRGui/assets ./soh-windows
|
|
mv ./build-windows/ZAPD/ZAPD.exe ./soh-windows/assets/extractor/ZAPD.exe
|
|
- name: Download soh.otr
|
|
uses: actions/download-artifact@v3
|
|
with:
|
|
name: soh.otr
|
|
path: soh-windows
|
|
- name: Upload build
|
|
uses: actions/upload-artifact@v3
|
|
with:
|
|
name: soh-windows
|
|
path: soh-windows
|