Shipwright/libultraship/libultraship
Christopher Leggett 7b08f98b8c
Dual OTR MQ and Vanilla Support (#1694)
* Changes OTR Extraction to have specific mq and nonmq paths.

Also updates the game to load resources according to whether or not
Master Quest or Vanilla is loaded.

* Removes unneeded code from the last commit.

* Fixes some weird formatting in ZRom.c

* Loads oot-mq.otr and patches oot.otr on top, if both are present.

If only one or the other are present, it becomes the only and main OTR.

* Adds ImGui Logic for whether or an MQ Checkbox.

Checkbox checked only specifies whether new saves should be MQ or not.
Checkbox is disabled or force-enabled according to which OTRs are loaded.
Also as a necessity includes tracking what game versions have been loaded
from the OTRs.

* Adds MQ settings logic for Randomizer's ImGui menu.

* Writes Master Quest dungeons to the spoiler log

* Loads MQ Dungeons from spoiler, persists in save, and loads when appropriate.

* Adds logic to prevent loading or creating incompatible rando saves.

* Fixdes some linux build issues and new rando save issues

* Makes appimage create both vanilla and mq otrs

If either rom is present, it makes the corresponding OTR. If both are present,
it will make both. If one OTR is present but both roms are present, it will
create the missing OTR.

* Makes it so a randomized save file will not be marked as MQ.

* Refactors to load all OTRs from MainPath or a specific list.

Also adds the ability to take a std::unordered_set of hashes to
validate each OTR's version file against.

* Fixes a syntax error

* Makes ExtractAssets output Vanilla and MQ OTRs if both roms are present

* Fixes asset generation bug.

* Partially working fix for dual OTR extract_assets

Currently the cmake ExtractAssets target will return with a 1 if you
only end up exporting one type of OTR isntead of both. Haven't found
a great way to only attempt to copy a file if it exists from within
cmake. It does actually correctly copy the OTR that is generated,
despite the error from copying the other one.

Pushing as is for now but will keep investigating.

* Adds oot-mq.otr to the gitignore.

* Makes ExtractAssets not fail on only one rom/OTR.

* Removes PatchesPath from the constructors requiring OTRFiles vector.

* Renames OOT_UNKNOWN to just UNKNOWN to remove OOT specific reference.

* Removes randomizing MQ Dungeons and re-disables MQ rando.

Doing this so the PR can get merged quicker with just the Dual OTR
support and won't need to wait on rando logic to be updated. That
will happen in another PR directly after the merge.

* Update mac startup script for dual otr

* Update soh/macosx/soh-macos.sh

* Update soh/macosx/soh-macos.sh

* Update soh/macosx/soh-macos.sh

* Implements new BinaryReader to fix Linux build issue.

BinaryReader itself comes from https://github.com/Moneyl/BinaryTools
I added a wrapper to adapt it to the ABI from ZAPD's Binary Reader and
add Endianness checking. I also had to copy a handful of other bits and
pieces from ZAPD to make it all function as expected.

* A few edits to the updatream BinaryReader to compile it on Linux.

* Adds the Endianness to the first byte of the version file.

* Fixes Jenkins

* Addresses some of Kenix's comments

* Renames `ReadNullTerminatedString` to `ReadCString`

* Refactors Archive::LoadFile into a private method with more arguments.

* Removes BitConverter and extends existing endianness.h instead.

* Fixes an endianness issue with the version file.

Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
2022-10-16 23:07:35 -04:00
..
Factories Dual OTR MQ and Vanilla Support (#1694) 2022-10-16 23:07:35 -04:00
Lib Dual OTR MQ and Vanilla Support (#1694) 2022-10-16 23:07:35 -04:00
abi.h git subrepo clone https://github.com/HarbourMasters/libultraship.git 2022-03-22 02:52:44 +01:00
Animation.cpp Dual OTR MQ and Vanilla Support (#1694) 2022-10-16 23:07:35 -04:00
Animation.h git subrepo clone https://github.com/HarbourMasters/libultraship.git 2022-03-22 02:52:44 +01:00
Archive.cpp Dual OTR MQ and Vanilla Support (#1694) 2022-10-16 23:07:35 -04:00
Archive.h Dual OTR MQ and Vanilla Support (#1694) 2022-10-16 23:07:35 -04:00
Array.cpp Linux/GCC Support (#28) 2022-05-11 13:18:24 -04:00
Array.h Audio decompiled and WIP custom sample support 2022-06-16 20:35:52 -04:00
Audio.cpp Dual OTR MQ and Vanilla Support (#1694) 2022-10-16 23:07:35 -04:00
Audio.h Add Support for macOS (#441) 2022-06-22 14:59:21 -04:00
AudioPlayer.h Feature: Allow choosing audio backend (#1588) 2022-09-26 19:48:47 -04:00
BinaryReader.cpp Dual OTR MQ and Vanilla Support (#1694) 2022-10-16 23:07:35 -04:00
BinaryReader.h Dual OTR MQ and Vanilla Support (#1694) 2022-10-16 23:07:35 -04:00
Blob.cpp git subrepo clone https://github.com/HarbourMasters/libultraship.git 2022-03-22 02:52:44 +01:00
Blob.h git subrepo clone https://github.com/HarbourMasters/libultraship.git 2022-03-22 02:52:44 +01:00
CMakeLists.txt Dual OTR MQ and Vanilla Support (#1694) 2022-10-16 23:07:35 -04:00
CollisionHeader.cpp git subrepo clone https://github.com/HarbourMasters/libultraship.git 2022-03-22 02:52:44 +01:00
CollisionHeader.h git subrepo clone https://github.com/HarbourMasters/libultraship.git 2022-03-22 02:52:44 +01:00
color.h Fixed merge/rebase issues 2022-07-31 16:57:04 -04:00
Console.cpp Wii U: Several fixes and improvements (#1608) 2022-09-27 19:29:55 -04:00
Console.h Moves class member functions from headers to compilation units. 2022-08-24 23:06:23 -04:00
ControlDeck.cpp Disable game input when typing into a textfield (#1398) 2022-09-21 21:32:27 -04:00
ControlDeck.h Disable game input when typing into a textfield (#1398) 2022-09-21 21:32:27 -04:00
Controller.cpp Fix issue with 'auto' controller setting (#1548) 2022-09-21 21:29:16 -04:00
Controller.h [579] Add simulated input lag option (#1438) 2022-09-19 22:49:13 -04:00
ControllerAttachment.cpp git subrepo clone https://github.com/HarbourMasters/libultraship.git 2022-03-22 02:52:44 +01:00
ControllerAttachment.h git subrepo clone https://github.com/HarbourMasters/libultraship.git 2022-03-22 02:52:44 +01:00
CrashHandler.cpp Dual OTR MQ and Vanilla Support (#1694) 2022-10-16 23:07:35 -04:00
CrashHandler.h Crash Handler 2.0 (#1466) 2022-09-26 19:54:25 -04:00
Cutscene.cpp Dual OTR MQ and Vanilla Support (#1694) 2022-10-16 23:07:35 -04:00
Cutscene.h git subrepo clone https://github.com/HarbourMasters/libultraship.git 2022-03-22 02:52:44 +01:00
Cvar.cpp Cosmetics Editor Fixes (#1287) 2022-08-25 01:28:27 +02:00
Cvar.h LUS Cleanup: Removes GameSettings class. Moves code to Imgui. (#1036) 2022-08-05 01:03:11 -04:00
DisplayList.cpp Dual OTR MQ and Vanilla Support (#1694) 2022-10-16 23:07:35 -04:00
DisplayList.h git subrepo clone https://github.com/HarbourMasters/libultraship.git 2022-03-22 02:52:44 +01:00
DummyController.cpp Moves class member functions from headers to compilation units. 2022-08-24 23:06:23 -04:00
DummyController.h Moves class member functions from headers to compilation units. 2022-08-24 23:06:23 -04:00
endianness.h Dual OTR MQ and Vanilla Support (#1694) 2022-10-16 23:07:35 -04:00
File.cpp git subrepo clone https://github.com/HarbourMasters/libultraship.git 2022-03-22 02:52:44 +01:00
File.h LUS Cleanup: Merge Window and GlobalCtx2 classes. (#1259) 2022-08-21 21:08:01 -04:00
GameOverlay.cpp Wii U: Several fixes and improvements (#1608) 2022-09-27 19:29:55 -04:00
GameOverlay.h Makes data in OverlayCommand private. 2022-08-16 22:45:33 -04:00
GameVersions.h Dual OTR MQ and Vanilla Support (#1694) 2022-10-16 23:07:35 -04:00
Hooks.cpp Moves class member functions from headers to compilation units. 2022-08-24 23:06:23 -04:00
Hooks.h Randomizer v2 (#1065) 2022-09-21 00:50:22 -04:00
ImGuiImpl.cpp Wii U: Several fixes and improvements (#1608) 2022-09-27 19:29:55 -04:00
ImGuiImpl.h Feature: Allow choosing audio backend (#1588) 2022-09-26 19:48:47 -04:00
InputEditor.cpp Add support for extra buttons to be used as walk speed modifiers (#449) 2022-10-10 08:28:19 +02:00
InputEditor.h Add support for extra buttons to be used as walk speed modifiers (#449) 2022-10-10 08:28:19 +02:00
KeyboardController.cpp Add support for extra buttons to be used as walk speed modifiers (#449) 2022-10-10 08:28:19 +02:00
KeyboardController.h Moves class member functions from headers to compilation units. 2022-08-24 23:06:23 -04:00
luslog.cpp git subrepo clone https://github.com/HarbourMasters/libultraship.git 2022-03-22 02:52:44 +01:00
luslog.h git subrepo clone https://github.com/HarbourMasters/libultraship.git 2022-03-22 02:52:44 +01:00
LUSMacros.h git subrepo clone https://github.com/HarbourMasters/libultraship.git 2022-03-22 02:52:44 +01:00
Material.cpp Dual OTR MQ and Vanilla Support (#1694) 2022-10-16 23:07:35 -04:00
Material.h LUS Cleanup: Merge Window and GlobalCtx2 classes. (#1259) 2022-08-21 21:08:01 -04:00
Matrix.cpp git subrepo clone https://github.com/HarbourMasters/libultraship.git 2022-03-22 02:52:44 +01:00
Matrix.h git subrepo clone https://github.com/HarbourMasters/libultraship.git 2022-03-22 02:52:44 +01:00
MemoryPack.cpp git subrepo clone https://github.com/HarbourMasters/libultraship.git 2022-03-22 02:52:44 +01:00
MemoryPack.h git subrepo clone https://github.com/HarbourMasters/libultraship.git 2022-03-22 02:52:44 +01:00
mixer.c add support for clang compiler (#592) 2022-07-10 10:51:12 -04:00
mixer.h Headphones setting in game should now work. 2022-06-27 22:10:00 -04:00
Model.cpp Dual OTR MQ and Vanilla Support (#1694) 2022-10-16 23:07:35 -04:00
Model.h Dual OTR MQ and Vanilla Support (#1694) 2022-10-16 23:07:35 -04:00
OSXFolderManager.h Introduce App Directory Path (#572) 2022-07-13 00:19:07 -04:00
OSXFolderManager.mm Introduce App Directory Path (#572) 2022-07-13 00:19:07 -04:00
Path.cpp git subrepo clone https://github.com/HarbourMasters/libultraship.git 2022-03-22 02:52:44 +01:00
Path.h Dual OTR MQ and Vanilla Support (#1694) 2022-10-16 23:07:35 -04:00
PlayerAnimation.cpp git subrepo clone https://github.com/HarbourMasters/libultraship.git 2022-03-22 02:52:44 +01:00
PlayerAnimation.h git subrepo clone https://github.com/HarbourMasters/libultraship.git 2022-03-22 02:52:44 +01:00
PulseAudioPlayer.cpp testing out item replacement (#416) 2022-07-11 20:11:07 -04:00
PulseAudioPlayer.h Linux/GCC Support (#28) 2022-05-11 13:18:24 -04:00
Resource.cpp Dual OTR MQ and Vanilla Support (#1694) 2022-10-16 23:07:35 -04:00
Resource.h Dual OTR MQ and Vanilla Support (#1694) 2022-10-16 23:07:35 -04:00
ResourceMgr.cpp Dual OTR MQ and Vanilla Support (#1694) 2022-10-16 23:07:35 -04:00
ResourceMgr.h Dual OTR MQ and Vanilla Support (#1694) 2022-10-16 23:07:35 -04:00
RumblePack.cpp git subrepo clone https://github.com/HarbourMasters/libultraship.git 2022-03-22 02:52:44 +01:00
RumblePack.h git subrepo clone https://github.com/HarbourMasters/libultraship.git 2022-03-22 02:52:44 +01:00
Scene.cpp Dual OTR MQ and Vanilla Support (#1694) 2022-10-16 23:07:35 -04:00
Scene.h git subrepo clone https://github.com/HarbourMasters/libultraship.git 2022-03-22 02:52:44 +01:00
SDLAudioPlayer.cpp Big-endian support (#909) 2022-07-27 23:50:56 +02:00
SDLAudioPlayer.h Move to cmake across all platforms (#363) 2022-08-05 07:59:19 +02:00
SDLController.cpp Add support for extra buttons to be used as walk speed modifiers (#449) 2022-10-10 08:28:19 +02:00
SDLController.h Moves class member functions from headers to compilation units. 2022-08-24 23:06:23 -04:00
Skeleton.cpp Dual OTR MQ and Vanilla Support (#1694) 2022-10-16 23:07:35 -04:00
Skeleton.h git subrepo clone https://github.com/HarbourMasters/libultraship.git 2022-03-22 02:52:44 +01:00
SkeletonLimb.cpp Dual OTR MQ and Vanilla Support (#1694) 2022-10-16 23:07:35 -04:00
SkeletonLimb.h git subrepo clone https://github.com/HarbourMasters/libultraship.git 2022-03-22 02:52:44 +01:00
stb_image_write.h git subrepo clone https://github.com/HarbourMasters/libultraship.git 2022-03-22 02:52:44 +01:00
stox.cpp Linux/GCC Support (#28) 2022-05-11 13:18:24 -04:00
stox.h git subrepo clone https://github.com/HarbourMasters/libultraship.git 2022-03-22 02:52:44 +01:00
SwitchImpl.cpp Fixed error screen (#1184) 2022-08-14 12:41:15 -04:00
SwitchImpl.h Nintendo switch support (#935) 2022-07-25 21:11:53 -04:00
SwitchPerformanceProfiles.h Nintendo switch support (#935) 2022-07-25 21:11:53 -04:00
Text.cpp git subrepo clone https://github.com/HarbourMasters/libultraship.git 2022-03-22 02:52:44 +01:00
Text.h git subrepo clone https://github.com/HarbourMasters/libultraship.git 2022-03-22 02:52:44 +01:00
Texture.cpp git subrepo clone https://github.com/HarbourMasters/libultraship.git 2022-03-22 02:52:44 +01:00
Texture.h git subrepo clone https://github.com/HarbourMasters/libultraship.git 2022-03-22 02:52:44 +01:00
UltraController.h Add support for extra buttons to be used as walk speed modifiers (#449) 2022-10-10 08:28:19 +02:00
Utils.cpp Console now exposes commands with a reference to itself. 2022-08-10 00:38:56 -04:00
Utils.h Console now exposes commands with a reference to itself. 2022-08-10 00:38:56 -04:00
Vertex.cpp git subrepo clone https://github.com/HarbourMasters/libultraship.git 2022-03-22 02:52:44 +01:00
Vertex.h git subrepo clone https://github.com/HarbourMasters/libultraship.git 2022-03-22 02:52:44 +01:00
WasapiAudioPlayer.cpp Merge branch 'develop' into z64-devmerge 2022-06-17 00:39:07 -04:00
WasapiAudioPlayer.h Linux/GCC Support (#28) 2022-05-11 13:18:24 -04:00
WiiUController.cpp LUS Cleanup: Merge Window and GlobalCtx2 classes. (#1259) 2022-08-21 21:08:01 -04:00
WiiUController.h Wii U support (#1097) 2022-08-14 22:57:24 -04:00
WiiUGamepad.cpp LUS Cleanup: Merge Window and GlobalCtx2 classes. (#1259) 2022-08-21 21:08:01 -04:00
WiiUGamepad.h Wii U support (#1097) 2022-08-14 22:57:24 -04:00
WiiUImpl.cpp LUS Cleanup: Merge Window and GlobalCtx2 classes. (#1259) 2022-08-21 21:08:01 -04:00
WiiUImpl.h Wii U support (#1097) 2022-08-14 22:57:24 -04:00
Window.cpp Dual OTR MQ and Vanilla Support (#1694) 2022-10-16 23:07:35 -04:00
Window.h Dual OTR MQ and Vanilla Support (#1694) 2022-10-16 23:07:35 -04:00