1182 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
briaguya	4a35b9e798	fix: correctly parse custom nocturne warp text (#2116) ... This was causing an issue where hints were not being properly parsed, because ParseHintLocationsFile was erroring out when trying to read from a part of the json that didn't exist. Since that method is using pokemon exception handling, it was failing silently. This just makes it so the key in the spoiler log matches the key we're trying to read (and brings it in line with the rest of the warp text names) Co-authored-by: briaguya <briaguya>	2022-12-08 10:44:30 -05:00
briaguya	fa4ffb5913	fix: ensure play isn't null when reading from it (#2115) ... Co-authored-by: briaguya <briaguya>	2022-12-08 10:44:08 -05:00
Adam Bird	025e18e7e5	clear the rando generating cvar on launch to prevent softlocking generating a new seed (#2109)	2022-12-08 00:17:05 +01:00
aMannus	b593e27384	ER - Shabom timer fix (#2110)	2022-12-08 00:16:08 +01:00
Adam Bird	924e9147aa	Update OTRGui to extract MQ roms with the correct name (#2114) ... * Extract MQ roms to oot-mq.otr as the game expects * correctly export mq otrs and handle outside soh folder properly * support mq export on old export method Co-authored-by: Garrett Cox <garrettjcox@gmail.com>	2022-12-07 16:40:12 -05:00
louist103	31947cd51b	Copy cleanups (#1932)	2022-12-07 00:28:35 -05:00
Adam Bird	8337e4e24f	Rando: Entrance Tracker v1 (#2005) ... * initial pass for entrance tracker * add search meta tags to entrance tracker data; clear entrance tracker on title screen * rename to use playstate/play * fix lus imports * move discovered entrance info to SohStats struct * Add scene info and highlighting to entrance tracker * hide undiscovered text when searching * add comments for entrance tracker * fix merge conflict error * account for zora river -> hyrule field water entrance in tracker * fix assignement error * remove unneeded defaults from debug file init * adjust entrance tracker settings and add more search tags * convert magic numbers to defines; add more comments to entrance tracker; clarify variable names * add reverse index to entrance tracker data to compare with instead of using strings * rename variables	2022-12-06 23:44:14 -05:00
briaguya	f9fe3f8fb3	Merge Flynn Charlie into develop	2022-12-06 21:51:53 -05:00
briaguya	4f109178ff	Merge branch 'develop-flynn' into flynn-to-dev	2022-12-06 21:29:27 -05:00
briaguya	00cbd347b2	bump version (#2104) ... Co-authored-by: briaguya <briaguya@alice>	2022-12-06 20:21:38 -05:00
Adam Bird	77123196d1	fix lake hylia water level raised flag not being set in rando (#2103)	2022-12-06 20:09:05 -05:00
Amaro Martínez	52b896271c	Fix Ganondorf boss battle ending (MQ only) (#2072)	2022-12-06 19:24:09 -05:00
Adam Bird	d9f3844b2d	[Feature] Entrance Rando v2 (#2071)	2022-12-07 00:37:50 +01:00
PurpleHato	7f4a19461c	ADD: Rando German Custom Messages (#2102) ... * ADD: Rando German Custom Messages Thanks to Timmy_GamerNepgear on Discord for the translation, I basically just formatted the text * TWEAK: Forgot a small breakline	2022-12-06 22:54:54 +01:00
PurpleHato	b8465a9ef9	TWEAK: Rando french typos	2022-12-06 15:00:55 -05:00
lilDavid	db4af238f2	Kaleidoscope: Fix C buttons when closing the menu (#2100)	2022-12-06 14:17:07 -05:00
aMannus	598cac725e	[Feature] Rando: Enemy Randomizer V1 (#1781)	2022-12-06 10:33:50 +01:00
Oliver Schall	d9a08d0747	Added bombchu minigame difficulty menu (#2080) ... * Added bombchu bowling difficulty menu * Removed incorrect diff * Added bombchu bowling difficulty presets * Shortened cucco removal logic	2022-12-06 01:17:20 -05:00
briaguya	3921f15264	use enum for boss keysanity (#2096) ... * use enum for boss keysanity * merge Co-authored-by: briaguya <briaguya@alice>	2022-12-06 01:03:55 -05:00
briaguya	767b707a8c	use enum for keyrings (#2095) ... Co-authored-by: briaguya <briaguya@alice>	2022-12-06 01:00:36 -05:00
briaguya	dbfdb42406	use enum for hint clarity (#2092) ... Co-authored-by: briaguya <briaguya@alice>	2022-12-06 01:00:24 -05:00
briaguya	541d1d35a4	use enum for shuffle scrubs (#2089) ... Co-authored-by: briaguya <briaguya@alice>	2022-12-06 01:00:12 -05:00
briaguya	ca4875befc	use enums for tokensanity (#2088) ... Co-authored-by: briaguya <briaguya@alice>	2022-12-06 00:59:59 -05:00
briaguya	a93728599d	use enum values for maps and compasses (#2086) ... Co-authored-by: briaguya <briaguya@alice>	2022-12-06 00:59:48 -05:00
briaguya	d03e876289	use enum for logic (#2098) ... Co-authored-by: briaguya <briaguya@alice>	2022-12-06 00:37:07 -05:00
briaguya	4ee0ddaa15	use enum for language (#2097) ... Co-authored-by: briaguya <briaguya@alice>	2022-12-06 00:36:53 -05:00
briaguya	1e0e80f580	use enum for hint distribution (#2093) ... Co-authored-by: briaguya <briaguya@alice>	2022-12-06 00:36:28 -05:00
briaguya	8b96c023fb	use enum for gerudo keys (#2094) ... * use enum for gerudo keys * don't use cvar that doesn't exist Co-authored-by: briaguya <briaguya@alice>	2022-12-06 00:36:13 -05:00
briaguya	52bf2d600b	use enum for gossip stone hints (#2091) ... Co-authored-by: briaguya <briaguya@alice>	2022-12-06 00:35:59 -05:00
briaguya	306183aa1b	use enum for shuffle merchants (#2090) ... * use enum for shuffle merchants * remove comment that isn't needed anymore Co-authored-by: briaguya <briaguya@alice>	2022-12-06 00:35:44 -05:00
briaguya	22c4b1afa3	use enum for shuffle songs (#2087) ... Co-authored-by: briaguya <briaguya@alice>	2022-12-06 00:35:08 -05:00
briaguya	321e563c82	use enum for starting age (#2085) ... Co-authored-by: briaguya <briaguya@alice>	2022-12-06 00:34:30 -05:00
briaguya	acd07f2a07	add/use enum values for rando mq dungeon options (#2056) ... Co-authored-by: briaguya <briaguya@alice>	2022-12-06 00:32:53 -05:00
aMannus	d3bfc102fe	[Fix} Small Crowd Control fixes (#2061)	2022-12-06 06:28:50 +01:00
Amaro Martínez	1a9898b918	Fix Ganondorf title card (#2082)	2022-12-05 14:38:28 -05:00
frizzle101101	da1aa270ad	making edit and continue compiling in vs possible (#1988) ... * making edit and continue compiling in vs possible * fix tab spacing	2022-12-04 23:25:24 -05:00
Josh Bodner	656dcd2021	Don't autosave after obtaining bombchus if bombchu drops are enabled (#2077)	2022-12-04 20:54:23 -05:00
Josh Bodner	39b80137f6	Don't autosave in the Chamber of Sages (#2076)	2022-12-04 20:13:29 -05:00
aMannus	5d2b794c00	Fix hookshot retraction on dpad (#2065)	2022-12-04 19:27:15 -05:00
aMannus	5b5310ea92	Disable bunny hood NPC interactions with MM bunny hood on (#2058) ... * Disable bunny hood NPC interactions * Enum	2022-12-04 19:03:04 -05:00
aMannus	d4aeb79341	Fix jabu skulltula check (#2062)	2022-11-30 10:13:00 -05:00
briaguya	8d398f7130	refactor: separate RandoOption enum, use max (#2055) ... * refactor: separate RandoOption enum, use max * missed a couple magic array sizes * couple more Co-authored-by: briaguya <briaguya@alice>	2022-11-30 01:40:55 -05:00
briaguya	d6c528d9d0	use shopsanity enum (#2054) ... * enums for rainbow bridge * reorder enum * use enums for shopsanity * remove space Co-authored-by: briaguya <briaguya@alice>	2022-11-30 00:30:51 -05:00
briaguya	e193f0dc0e	enums for rainbow bridge (#2052) ... * enums for rainbow bridge * reorder enum Co-authored-by: briaguya <briaguya@alice>	2022-11-29 23:41:46 -05:00
briaguya	00a862a252	use trial enum instead of magic numbers (#2039) ... * use trial enum instead of magic numbers * simplify trial count/random trial logic * set default to set number Co-authored-by: briaguya <briaguya@alice>	2022-11-29 22:43:05 -05:00
Christopher Leggett	806b9dc84b	Re-implements Ninja and CCache for Windows Builds (#2051) ... * Keeps default compiler flags. * Updates github actions to use ninja and ccache for windows builds. * Fixes ghactions to use MSVC. * Removes commented out CMake code.	2022-11-29 22:33:43 -05:00
briaguya	06df45efc7	use forest enum values instead of magic numbers (#2038)	2022-11-30 02:32:22 +01:00
briaguya	17c6a3653c	use enum for keysanity (#2044)	2022-11-30 02:05:11 +01:00
briaguya	b976ef58fe	use enum for ganon's boss key (#2046)	2022-11-30 02:01:41 +01:00
briaguya	a15f89a3e4	Use enum values for ice trap setting (#2041) ... Co-authored-by: briaguya <briaguya@alice> Co-authored-by: David Chavez <david@dcvz.io>	2022-11-30 00:40:35 +01:00