1547 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Christopher Leggett	60257b98a4	Oops. Missed closing bracket.	2022-08-30 11:21:29 -04:00
Christopher Leggett	3856d1b0a7	Fixed small key case that was behind an else and shouldn't have been	2022-08-30 11:00:47 -04:00
briaguya	bb57479732	Merge pull request #1339 from leggettc18/rando-next-key-fix ... Randomizer: When Shuffled to Own Dungeon or Vanilla, Give Vanilla Keys, Maps and Compasses	2022-08-30 10:19:48 -04:00
Sarge-117	f4e53c54b5	Correct German spellings, add 2 more hints	2022-08-29 18:17:23 -07:00
Christopher Leggett	99674ff88c	Readds missing workaround for spirit temple and ganon's castle keys.	2022-08-29 19:19:01 -04:00
Christopher Leggett	b9aee7085e	Adds note to key colors enhancement about this change.	2022-08-29 19:12:19 -04:00
Garrett Cox	c7207d2e0a	Move obtainability check up higher	2022-08-29 17:42:48 -05:00
Garrett Cox	8c6774fa35	More small changes	2022-08-29 16:00:47 -05:00
Garrett Cox	ded7ccab3f	Minor fixes	2022-08-29 15:35:37 -05:00
Garrett Cox	5961c33ba9	Rename GetItemFromGet and move obtainability checks to a separate function	2022-08-29 15:26:27 -05:00
aMannus	1161873044	Moar names	2022-08-29 21:51:42 +02:00
Christopher Leggett	51dbee365a	Oops part 2	2022-08-29 01:04:13 -04:00
Christopher Leggett	f44c588a2c	Oops	2022-08-29 01:03:21 -04:00
Christopher Leggett	a84262dbf7	Bit of cleanup	2022-08-29 00:11:10 -04:00
Christopher Leggett	0a27714b8e	Adds missing case for RSK_GERUDO_KEYS from spoilerfile parsing.	2022-08-29 00:09:44 -04:00
Christopher Leggett	35d651f06e	When shuffled to Own Dungeon or below, give vanilla keys, maps, and compasses.	2022-08-28 23:54:13 -04:00
Christopher Leggett	760eaa4d97	Adds randotodo comment as a note to adapt for the keysanity situation.	2022-08-28 23:14:42 -04:00
Christopher Leggett	0de1cd96b1	Fixes keys, maps, and compasses on develop-zhora rando.	2022-08-28 23:14:29 -04:00
aMannus	fdc0aa9ab4	Code Cleanup	2022-08-28 21:07:18 +02:00
aMannus	2456473f49	Merge fix	2022-08-28 20:21:32 +02:00
aMannus	1c59995feb	Merge branch 'rando-next' into rando-settings-menu-even-moar-changes	2022-08-28 20:19:19 +02:00
aMannus	77f4472902	Redone layout tabs/columns	2022-08-28 19:40:46 +02:00
briaguya	6d4288c2a5	Merge pull request #1331 from leggettc18/ganon-trials ... Reimplements selecting different amounts of Ganon's Trials.	2022-08-28 11:48:34 -04:00
Christopher Leggett	9c43f7225b	Adds captilization to French spoilerfile strings.	2022-08-27 18:45:21 -04:00
Christopher Leggett	fafd90482b	Refactor of some old rando code to use new functions.	2022-08-27 18:42:36 -04:00
Christopher Leggett	6aaef2179b	More Cleanup	2022-08-27 18:26:25 -04:00
Christopher Leggett	404a637ebd	Removes added function that went unused.	2022-08-27 15:56:11 -04:00
Christopher Leggett	dbd8909d26	Forgot to limit slider from 1-6 rather than 0-6	2022-08-27 15:53:57 -04:00
Christopher Leggett	4d8bfa97c0	UI Changes (dropdown and slider rather than checkbox and slider)	2022-08-27 15:51:14 -04:00
briaguya	c9755cd05e	Merge pull request #1330 from leggettc18/malon-missed-check ... Changes Malon's behavior to so she won't leave Hyrule Castle until you've obtained her item.	2022-08-27 14:43:35 -04:00
Christopher Leggett	3d8b8066da	More comment cleanup	2022-08-27 14:33:38 -04:00
Christopher Leggett	ff0ef4a6b4	ImGui/Commented out code cleanup.	2022-08-27 14:27:02 -04:00
Christopher Leggett	1bf8423f75	Reimplements selecting different amounts of Ganon's Trials.	2022-08-27 14:19:37 -04:00
Christopher Leggett	928a39fe9e	More Cleanup	2022-08-27 09:30:49 -04:00
Christopher Leggett	a572c11f4f	Fixes ice trap gidata not getting cleared after trap is sprung. (#1322)	2022-08-27 09:27:20 +02:00
Christopher Leggett	bf1b327a95	Cleanup and Documentation	2022-08-27 02:50:44 -04:00
Christopher Leggett	7fbb381db7	Changes Malon's behavior to so she won't leave Hyrule Castle until you've obtained her item.	2022-08-27 02:25:13 -04:00
briaguya	f27922df17	Merge pull request #1328 from leggettc18/starting-adult-trade ... ACTUALLY fixes adult trade items on save init this time.	2022-08-26 22:43:36 -04:00
Garrett Cox	67a890ed1e	Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity	2022-08-26 21:41:21 -05:00
Christopher Leggett	62aeac51b9	ACTUALLY fixes adult trade items on save init this time.	2022-08-26 22:14:49 -04:00
briaguya	a74461272f	Merge pull request #1327 from leggettc18/starting-adult-trade ... Properly handles starting link with adult trade items.	2022-08-26 21:34:55 -04:00
Christopher Leggett	9f47099232	Properly handles starting link with adult trade items.	2022-08-26 21:17:12 -04:00
Christopher Leggett	05136c13b7	Fixes Link getting Song as pocket item (#1326)	2022-08-27 02:46:19 +02:00
briaguya	ef74b7b6e7	Merge pull request #1325 from aMannus/rando-links-pocket-skull-token ... Rando: Add Skull Token to Links Pocket	2022-08-26 20:46:06 -04:00
aMannus	637f089485	some stuff	2022-08-27 00:42:54 +02:00
aMannus	83abf57766	Add skull token to links pocket	2022-08-26 23:51:36 +02:00
briaguya	06fb3ed885	Merge pull request #1318 from leggettc18/magic-bean-pack ... Adds Shuffle Magic Beans option	2022-08-26 12:18:16 -04:00
aMannus	4ebcc83161	Code styling	2022-08-26 15:13:34 +02:00
aMannus	9e6d61d7ec	Incompatible checkboxes	2022-08-26 11:13:11 +02:00
aMannus	b43f77caba	Columns in childs & code style changes	2022-08-26 09:56:34 +02:00