1066 Commits

Author	SHA1	Message	Date
Sarge-117	55fa913c78	Couple more ... Just need German for these Co-Authored-By: PurpleHato <47987542+PurpleHato@users.noreply.github.com>	2022-08-30 15:24:44 -07:00
Sarge-117	d9ad01174b	Merge remote-tracking branch 'upstream/rando-next' into update-navi-hints-rando	2022-08-30 14:22:11 -07:00
Sarge-117	b803c77f58	Add French translation ... Thanks to PurpleHato	2022-08-30 14:22:02 -07:00
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
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	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
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
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	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
Christopher Leggett	62aeac51b9	ACTUALLY fixes adult trade items on save init this time.	2022-08-26 22:14:49 -04:00
Christopher Leggett	9f47099232	Properly handles starting link with adult trade items.	2022-08-26 21:17:12 -04:00
aMannus	83abf57766	Add skull token to links pocket	2022-08-26 23:51:36 +02:00
Christopher Leggett	53531c4481	Cleanup	2022-08-26 01:17:51 -04:00
Christopher Leggett	9148fa5aec	Adds custom particles to Freestanding Bean Pack item.	2022-08-25 20:48:28 -04:00
Christopher Leggett	4a51ab3187	Fixes bug where Bean Pack was also granting blue potion	2022-08-25 20:42:34 -04:00
Christopher Leggett	71e7fb9d70	Merge rando-next and rename scrub message table to merchant message table	2022-08-25 18:02:00 -04:00
Christopher Leggett	e9fa231ae6	Merge branch 'rando-next' of github.com:HarbourMasters/Shipwright into magic-bean-pack	2022-08-25 17:45:41 -04:00
briaguya	0107699a6b	more formatting	2022-08-25 17:29:09 -04:00
briaguya	866cb3166b	formatting	2022-08-25 17:28:46 -04:00
briaguya	0bcc5b1310	no more blank spoilers	2022-08-25 17:27:37 -04:00
Christopher Leggett	78e506a072	Merge branch 'rando-next' of github.com:HarbourMasters/Shipwright into magic-bean-pack	2022-08-25 16:58:05 -04:00
briaguya	da07a8f409	Merge pull request #1300 from aMannus/tokensanity-bgs-fix ... Rando: Tokensanity BGS and maps/compasses fix	2022-08-25 16:50:21 -04:00
briaguya	1cfa0a9623	Merge pull request #1264 from garrettjoecox/scrubsanity ... Scrubsanity	2022-08-25 16:48:28 -04:00
Christopher Leggett	5043309c63	Adds basic german text for bean salesman	2022-08-25 16:43:57 -04:00
Garrett Cox	dc9eeb18d9	Increase size of randomizerInf	2022-08-25 15:38:41 -05:00
briaguya	4919bddda2	Merge branch 'develop-zhora' into ztorn	2022-08-25 16:08:16 -04:00
Garrett Cox	c76ff719f4	Fix issue in spoiler generation	2022-08-25 13:53:04 -05:00
Garrett Cox	1e31d108e6	Various changes from feedback, and use new randomizerInf table	2022-08-25 13:49:02 -05:00
Christopher Leggett	3da197f0cd	Removes some magic numbers	2022-08-25 14:39:12 -04:00
Christopher Leggett	c2fed1a382	Fixes Lost Woods Bridge Ice Trap in Rando (#1313)	2022-08-25 20:16:43 +02:00
Garrett Cox	936513a9c4	Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into scrubsanity	2022-08-25 13:02:47 -05:00
aMannus	29b9f0b37e	Comment	2022-08-25 19:58:05 +02:00