461 Commits

Author	SHA1	Message	Date
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
Christopher Leggett	9c43f7225b	Adds captilization to French spoilerfile strings.	2022-08-27 18:45:21 -04:00
Christopher Leggett	6aaef2179b	More Cleanup	2022-08-27 18:26:25 -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	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	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	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
Christopher Leggett	5043309c63	Adds basic german text for bean salesman	2022-08-25 16:43:57 -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
Garrett Cox	936513a9c4	Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into scrubsanity	2022-08-25 13:02:47 -05:00
Christopher Leggett	efd4ceb636	Colors keywords in bean salesman text.	2022-08-25 12:46:08 -04:00
Christopher Leggett	00838cb5b6	Adds french text for the bean salesman	2022-08-25 12:39:34 -04:00
briaguya	8a4c196566	Merge pull request #1312 from garrettjoecox/randomizer-inf ... Transition to randomizerInf flags	2022-08-25 12:19:55 -04:00
briaguya	ed5a2d8a42	Merge pull request #1307 from aMannus/rando-menu-tweaks ... Rando: Small menu tweaks	2022-08-25 11:57:03 -04:00
Garrett Cox	f7bd48aaca	Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into randomizer-inf	2022-08-25 10:27:34 -05:00
Garrett Cox	95372718a3	Transition a few things to randomizerInf flags	2022-08-25 10:27:31 -05:00
aMannus	9787f9d4f2	Swap hints & item pool	2022-08-25 16:34:48 +02:00
Christopher Leggett	5842beeb55	Fixes Bean Pack item from chest.	2022-08-25 10:11:35 -04:00
Christopher Leggett	ef1b662bf4	Finishes wiring up bean salesman settings and text.	2022-08-25 09:42:15 -04:00
briaguya	4ca146b4e1	Merge pull request #1299 from aMannus/bgs-dupe-fix ... Rando: Fix BGS dupe check	2022-08-25 07:49:10 -04:00
aMannus	7de2c584b4	Rando menu tweaks	2022-08-25 11:11:24 +02:00
aMannus	c41de36c46	Comment	2022-08-25 10:36:28 +02:00
aMannus	6fd22f50ab	Swapped logic to boss key	2022-08-25 10:35:04 +02:00
aMannus	954a96baeb	tha fix	2022-08-25 10:27:04 +02:00
aMannus	050a9db01d	Fix BGS dupe check	2022-08-25 08:38:42 +02:00
briaguya	d2fe83edf4	Merge pull request #1295 from HarbourMasters/develop-zhora ... quick zhora -> rando-next	2022-08-24 19:47:26 -04:00
Baoulettes	c0b9171f98	Cosmetics Editor Fixes (#1287)	2022-08-25 01:28:27 +02:00
Christopher Leggett	db6a397195	Adds new text for the bean salesman	2022-08-24 17:58:01 -04:00
Christopher Leggett	adf465c1a0	Sets up Magic Bean Salesman to sell a rando check for 60 rupees.	2022-08-24 17:20:45 -04:00
briaguya	0af2239473	Merge pull request #1290 from garrettjoecox/item-tracker-v3-fixes ... Item tracker v3 small fixes	2022-08-24 17:14:38 -04:00
Garrett Cox	27ced1feca	Move some comments around	2022-08-24 15:52:19 -05:00
Christopher Leggett	fe7aedc80d	Adds getItemEntry for Magic Bean Pack	2022-08-24 15:44:31 -04:00
Garrett Cox	29509341f9	Support hiding compasses and maps, move combo button behind floating window condition, add padding to windows mode	2022-08-24 13:15:00 -05:00
Christopher Leggett	02a8ba8bb9	Fixes incorrect key order in DrawSmallKeys.	2022-08-24 13:16:14 -04:00
Christopher Leggett	821c7948d6	Cleanup	2022-08-24 13:06:48 -04:00
Christopher Leggett	ecd0e3e8bb	Merge branch 'rando-next' of github.com:HarbourMasters/Shipwright into color-coded-keys	2022-08-24 13:03:44 -04:00
Garrett Cox	b7e3a72f85	Fix issue from bad merge and a few other small things	2022-08-24 11:00:02 -05:00