1161 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
briaguya	a03ffc90dc	Merge pull request #1081 from garrettjoecox/fixShuffleCowsUI ... Change shuffle cows to checkbox and remove extra line	2022-08-07 04:12:29 -04:00
Garrett Cox	f7267be29a	Change shuffle cows to checkbox and remove extra line	2022-08-07 02:10:54 -05:00
briaguya	cac6869a56	Merge pull request #1080 from HarbourMasters/develop-zhora ... zhora -> rando-next	2022-08-07 02:16:11 -04:00
briaguya	91ad58aa3e	Merge pull request #1061 from garrettjoecox/frogSongs ... Shuffle frog song rupees	2022-08-07 02:13:24 -04:00
Christopher Leggett	3258fc5fb3	Correctly renders freestanding items ... Particle effects are probably broken, need to fix them still, I pretty much know how I would do that.	2022-08-06 23:29:28 -04:00
Garrett Cox	ea9d76621c	Fix issue with keysanity values not loading from spoiler file	2022-08-06 22:01:55 -05:00
Christopher Leggett	cfce0eba3d	Implements fixes for competing getItem calls.	2022-08-06 22:51:15 -04:00
GaryOderNichts	cb2410d9c5	Handle audio thread properly	2022-08-06 21:52:42 -04:00
qurious-pixel	b2ac01bc98	[CI] Link Updated SDL2 version (#1078)	2022-08-07 03:52:22 +02:00
David Chavez	1794683d3a	Ignore build.c	2022-08-06 21:06:40 -04:00
David Chavez	c70e3f38b1	Enable SPD logging in libultra	2022-08-06 21:06:40 -04:00
David Chavez	aadabe1ecd	Better instructions for VS solutions	2022-08-06 21:06:40 -04:00
briaguya	7f58ef14ee	add a command to copy the otr to the build dir	2022-08-06 21:06:21 -04:00
briaguya	8efeceb236	formatting	2022-08-06 21:05:51 -04:00
briaguya	9a126dec4e	add version requirements in building.md	2022-08-06 21:05:51 -04:00
briaguya	f007ca4d37	Merge pull request #1075 from briaguya-ai/clean-up-cowsanity ... Clean up cowsanity	2022-08-06 19:07:39 -04:00
briaguya	c3253fe59f	add comment explaining ocarina mode setting	2022-08-06 18:23:47 -04:00
briaguya	0eb8f5c95f	remove commented out lines	2022-08-06 18:15:24 -04:00
briaguya	e0d6445f24	remove unused cow stuff	2022-08-06 18:14:01 -04:00
briaguya	46c3541458	seems to be working, still needs cleanup	2022-08-06 18:07:16 -04:00
Garrett Cox	ea909b748e	Add super basic custom messages for keysanity, not pretty...	2022-08-06 16:51:58 -05:00
lilDavid	f885195fc9	Apply trade item timer disabling consistently	2022-08-06 16:01:29 -05:00
lilDavid	7cfe21f865	Fix non-randomizer carpenter's son despawning	2022-08-06 15:58:57 -05:00
lilDavid	c8289f5946	Skip lines in Adult Trade Shuffle description	2022-08-06 15:38:32 -05:00
th-2021	7ef3fff869	add soh icon for Windows (#1060)	2022-08-06 22:19:06 +02:00
lilDavid	8ee597298c	Change cursor sound and add files to build system	2022-08-06 15:01:35 -05:00
Christopher Leggett	194c4f4e52	Adds new files to CMakeLists.	2022-08-06 15:54:19 -04:00
Garrett Cox	8aba2b6323	Merge branch 'keysanity' of github.com:garrettjoecox/Shipwright into keysanity	2022-08-06 14:18:50 -05:00
Garrett Cox	77f2e56039	Support starts with and more options on ganons boss key	2022-08-06 14:07:46 -05:00
lilDavid	f41b939a71	Only show adult trade items in the save editor if they're shuffled	2022-08-06 12:58:21 -05:00
lilDavid	6603a9a474	Add adult trade shuffle to randomizer	2022-08-06 12:58:08 -05:00
Christopher Leggett	ba160cf997	merge in develop-zhora	2022-08-06 12:26:38 -04:00
Christopher Leggett	9062eaaca5	Should fix switch build pt 2	2022-08-06 12:21:11 -04:00
Christopher Leggett	43461cec69	Should fix switch build	2022-08-06 12:15:27 -04:00
briaguya	1b8168cfbb	Merge pull request #1067 from garrettjoecox/shuffleCowsFix ... Fix cows giving free bottles, too generous	2022-08-06 04:50:59 -04:00
Garrett Cox	acb3d14193	Merge pull request #1 from briaguya-ai/fix-ganon-boss-key ... fix ganon's boss key	2022-08-06 03:31:16 -05:00
briaguya	5574442fdc	fix ganon's boss key	2022-08-06 04:30:03 -04:00
Garrett Cox	e274530073	Fix cows giving free bottles, too generous	2022-08-06 03:03:11 -05:00
Garrett Cox	b420638267	Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into keysanity	2022-08-06 00:48:55 -05:00
briaguya	1ee89c50e2	Merge pull request #1066 from briaguya-ai/zhora-to-next ... zhora to rando-next	2022-08-06 01:48:01 -04:00
Garrett Cox	5346217af3	Misc fixes	2022-08-06 00:29:05 -05:00
Garrett Cox	2d9d67bbd0	Add missing case	2022-08-05 23:44:53 -05:00
Garrett Cox	cc4300ef8b	Revert accidental changes	2022-08-05 23:40:43 -05:00
briaguya	61c88386a1	Merge branch 'develop-zhora' into zhora-to-next	2022-08-06 00:26:50 -04:00
Garrett Cox	733ce5d28f	Use scene enum, handle thieves hideout keys	2022-08-05 23:26:50 -05:00
Garrett Cox	4a78375c8f	And like magic, keysanity working :D	2022-08-05 23:08:46 -05:00
briaguya	97d363c91e	Merge pull request #1019 from garrettjoecox/shuffleCows ... Add shuffleCows options for randomizer	2022-08-06 00:03:27 -04:00
Garrett Cox	9a145221ec	Remove newline	2022-08-05 21:02:02 -05:00
Garrett Cox	de34fd7e94	Check coords for other cows rather than falling back	2022-08-05 16:11:17 -05:00
Garrett Cox	528dbcdc17	More suggested changes	2022-08-05 14:59:04 -05:00