Christopher Leggett d58968d196 Merge branch 'develop' into merge-develop ... # Conflicts: # soh/soh/Enhancements/custom-message/CustomMessageTypes.h # soh/soh/Enhancements/debugger/debugSaveEditor.h # soh/soh/Enhancements/item-tables/ItemTableTypes.h # soh/soh/Enhancements/mods.cpp # soh/soh/Enhancements/randomizer/3drando/entrance.cpp # soh/soh/Enhancements/randomizer/3drando/item_location.cpp # soh/soh/Enhancements/randomizer/3drando/keys.hpp # soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp # soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp # soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_training_grounds.cpp # soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ice_cavern.cpp # soh/soh/Enhancements/randomizer/3drando/menu.cpp # soh/soh/Enhancements/randomizer/3drando/playthrough.cpp # soh/soh/Enhancements/randomizer/3drando/settings.cpp # soh/soh/Enhancements/randomizer/3drando/settings.hpp # soh/soh/Enhancements/randomizer/randomizer.cpp # soh/soh/Enhancements/randomizer/randomizerTypes.h # soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp # soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp # soh/soh/Enhancements/randomizer/randomizer_entrance.c # soh/soh/OTRGlobals.cpp # soh/src/code/z_sram.c # soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c		2023-12-10 12:49:15 -05:00
..
assets	Merge branch 'develop' into merge-develop	2023-12-10 12:49:15 -05:00
CMake	Move to cmake across all platforms (#363)	2022-08-05 07:59:19 +02:00
include	Merge branch 'develop' into merge-develop	2023-12-10 12:49:15 -05:00
macosx	Fix: Repair working directory on Mac and use app directory for extractor search paths (#3359)	2023-11-06 16:46:48 -06:00
platform	Wii U support (#1097)	2022-08-14 22:57:24 -04:00
soh	Merge branch 'develop' into merge-develop	2023-12-10 12:49:15 -05:00
src	Merge branch 'develop' into merge-develop	2023-12-10 12:49:15 -05:00
.clang-format	git subrepo clone https://github.com/HarbourMasters/soh.git	2022-03-22 02:51:23 +01:00
.clang-tidy	git subrepo clone https://github.com/HarbourMasters/soh.git	2022-03-22 02:51:23 +01:00
.gitattributes	git subrepo clone https://github.com/HarbourMasters/soh.git	2022-03-22 02:51:23 +01:00
.gitignore	Add Support for macOS (#441)	2022-06-22 14:59:21 -04:00
.gitrepo	git subrepo push soh	2022-07-14 20:47:48 -04:00
CMakeLists.txt	[OTR Archive] Store soh version in OTR files and verify on launch/ask to regenerate (#3218)	2023-11-05 12:34:39 -05:00
fixbaserom.py	git subrepo clone https://github.com/HarbourMasters/soh.git	2022-03-22 02:51:23 +01:00
format.sh	git subrepo clone https://github.com/HarbourMasters/soh.git	2022-03-22 02:51:23 +01:00
icon.jpg	Nintendo switch support (#935)	2022-07-25 21:11:53 -04:00
resource.h	git subrepo clone https://github.com/HarbourMasters/soh.git	2022-03-22 02:51:23 +01:00
Resource.rc	Use UTF-8 for MSVC and enable visual styles for Windows (#2888)	2023-05-17 22:21:26 -04:00
SHIPOFHARKINIAN.ico	git subrepo clone https://github.com/HarbourMasters/soh.git	2022-03-22 02:51:23 +01:00
SHIPOFHARKINIAN.manifest	Use UTF-8 for MSVC and enable visual styles for Windows (#2888)	2023-05-17 22:21:26 -04:00