1514 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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
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	31c4b683d1	Merge pull request #1317 from briaguya-ai/no-more-blank-spoilers ... No more blank spoilers	2022-08-25 17:42:09 -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	60eb1382e0	Merge pull request #1315 from briaguya-ai/ztorn ... zhora -> rando-next	2022-08-25 16:19:06 -04: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
aMannus	49b48fb7a4	Fix BGS and maps/keys textboxes	2022-08-25 19:56:34 +02:00
aMannus	9fda6a0764	Merge branch 'rando-next' into tokensanity-bgs-fix	2022-08-25 19:27:55 +02:00
Christopher Leggett	efd4ceb636	Colors keywords in bean salesman text.	2022-08-25 12:46:08 -04:00
Christopher Leggett	6ab13f389b	Fixes salesman to properly take 60 rupees from you.	2022-08-25 12:43:19 -04:00
Christopher Leggett	00838cb5b6	Adds french text for the bean salesman	2022-08-25 12:39:34 -04:00
lilDavid	ad33aba9ba	Merge branch 'rando-next' into bombchu-logic	2022-08-25 11:23:30 -05:00
briaguya	9f60a97307	Merge pull request #1303 from aMannus/rando-skulls-winnerpoh-fix ... Rando: Fix Winner PoH on skulltula's	2022-08-25 12:23:29 -04:00
briaguya	8a4c196566	Merge pull request #1312 from garrettjoecox/randomizer-inf ... Transition to randomizerInf flags	2022-08-25 12:19:55 -04:00
aMannus	c22951353e	Renamed function	2022-08-25 18:04:52 +02:00
briaguya	ed5a2d8a42	Merge pull request #1307 from aMannus/rando-menu-tweaks ... Rando: Small menu tweaks	2022-08-25 11:57:03 -04:00