1462 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Christopher Leggett	90067be132	Fixes Dungeon Rewards from Song from Impa (#1311)	2022-08-25 17:19:17 +02: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
briaguya	9b972c6e4a	Merge pull request #1304 from aMannus/item-tracker-v3-ganonkey-fix ... Rando: Item Tracker V3 Ganon's Castle small key fix	2022-08-25 07:21:45 -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	bc5ec24889	Ice trap fix	2022-08-25 09:54:08 +02:00
aMannus	2626f6c7e3	Fixed Winner PoH on skulltula's	2022-08-25 09:34:46 +02:00
aMannus	cc6e4238cf	Fixes BGS on skull tokens	2022-08-25 08:49:15 +02:00
aMannus	050a9db01d	Fix BGS dupe check	2022-08-25 08:38:42 +02:00
Kenix3	80863fc7f2	Moves class member functions from headers to compilation units.	2022-08-24 23:06:23 -04: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	c4de29b7f1	Correctly sets BEANS_BOUGHT as a "flag" for the bean salesman	2022-08-24 17:24:50 -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	f15b3880f3	Merge pull request #1292 from aMannus/custom-key-colors-fix ... Rando: Custom key colors fix	2022-08-24 17:17:54 -04:00
briaguya	1d77b7fd24	Merge pull request #1293 from aMannus/rando-lost-woods-target-crash-fix ... Rando: Lost Woods target crash fix	2022-08-24 17:16:15 -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
aMannus	a48ac71762	Fixed lost woods target crash	2022-08-24 23:02:48 +02:00
Garrett Cox	27ced1feca	Move some comments around	2022-08-24 15:52:19 -05:00
aMannus	179c432ee1	Comment	2022-08-24 22:20:20 +02:00
aMannus	d5074c3e77	Fixes double def and split second wrong colors	2022-08-24 22:18:24 +02:00
Ada	b70ad81f57	Add platform specific OTR instructions to readme (#1291)	2022-08-24 22:02:20 +02:00
Christopher Leggett	fe7aedc80d	Adds getItemEntry for Magic Bean Pack	2022-08-24 15:44:31 -04:00
briaguya	f88e7fabd5	Merge pull request #1283 from leggettc18/color-coded-keys ... Implements Color Coded Keysanity keys and easier custom draw functions	2022-08-24 14:46:52 -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	37fe5491b2	Always color in Double Defense	2022-08-24 13:58:25 -04: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
Garrett Cox	693dc479d2	Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into scrubsanity	2022-08-24 10:22:57 -05:00
briaguya	96d7602761	Merge pull request #1261 from garrettjoecox/item-tracker-v3 ... Item tracker v3	2022-08-24 11:20:47 -04:00
Garrett Cox	c6c08522e6	Custom message for free items	2022-08-24 10:19:41 -05:00
briaguya	61b6d162e8	Merge pull request #1288 from leggettc18/grass-chest-fix ... Fixes rando-next exclusive grass-chest bug I inadvertently introduced.	2022-08-24 10:58:34 -04:00
briaguya	f62ffe57a9	Merge pull request #1243 from aMannus/rando-rupee-names ... Rando: Random rupee names in textboxes	2022-08-24 10:49:25 -04:00
Christopher Leggett	69a7012b5a	Fixes grass-chest bug I inadvertently introduced.	2022-08-24 10:45:39 -04:00
aMannus	bfc524c6ef	Merge fix, tooltip tweak	2022-08-24 15:57:54 +02:00
aMannus	0e288fc55d	Merge branch 'rando-next' into rando-rupee-names	2022-08-24 15:51:02 +02:00
aMannus	684cd862f1	Renamed function	2022-08-24 15:29:45 +02:00
Christopher Leggett	e3ae302a64	Adds padding to a few checkboxes in rando menu that were missing it	2022-08-24 00:17:47 -04:00
Christopher Leggett	855147b265	Merge branch 'rando-next' into color-coded-keys	2022-08-24 00:17:37 -04:00
Christopher Leggett	6561073c7b	Implements ImGui Checkbox to enable or disable color-coded-keys.	2022-08-24 00:07:16 -04:00