Sarge-117 cfc5d1d4e3 Fix merge error ...

Didn't mean to have Zhora changes in here yet

2022-09-06 14:05:29 -07:00

..

assets

Merge branch 'develop' into z64-devmerge

2022-06-17 00:39:07 -04:00

CMake

Move to cmake across all platforms (#363)

2022-08-05 07:59:19 +02:00

include

Add trials required and merchant prices to save file instead of loading from active spoiler log

2022-09-05 14:55:34 -05:00

macosx

MacOS OTR (#973)

2022-08-18 19:40:41 +02:00

platform

Wii U support (#1097)

2022-08-14 22:57:24 -04:00

soh

Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows

2022-09-06 12:43:13 -07:00

soh.xcodeproj

Use tex sizes from texture rather than hardcoded values (#610)

2022-07-31 21:32:40 -04:00

src

Fix merge error

2022-09-06 14:05:29 -07: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

Revert "Revert "Merge branch 'develop-zhora' into rando-settings-overhaul""

2022-07-19 13:09:24 +02:00

CMakeLists.txt

Merge branch 'develop-zhora' into z-to-rando-next

2022-09-03 03:47:09 -04: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

git subrepo clone https://github.com/HarbourMasters/soh.git

2022-03-22 02:51:23 +01:00

SHIPOFHARKINIAN.ico

git subrepo clone https://github.com/HarbourMasters/soh.git

2022-03-22 02:51:23 +01:00