Commit Graph

1444 Commits

Author SHA1 Message Date
briaguya a55eb572db fix keysanity related build issue 2022-09-01 12:06:41 -04:00
briaguya 5a009590fc Merge remote-tracking branch 'origin/develop-zhora' into ztorn 2022-09-01 12:06:25 -04:00
briaguya b370e3f9b2 Merge pull request #1205 from lilDavid/bombchu-logic
Add Bombchus in Logic option
2022-09-01 10:00:02 -04:00
lil David 0a744cde01 Clarify comments 2022-09-01 08:11:17 -05:00
lil David ea9db56914 Merge remote-tracking branch 'upstream/rando-next' into bombchu-logic 2022-09-01 07:59:09 -05:00
louist103 584a4ad818 Linux crash handler (#1209)
* crash handler linux

* cleanups

* missing underscore

* more cleanups

* cleanups

* 32 bit
2022-08-31 22:59:38 -04:00
briaguya e5817e1fff Merge pull request #1359 from briaguya-ai/oot-check-linux-optimization-fix
fix oot ice trap check optimization issues
2022-08-31 20:09:23 -04:00
briaguya 1f12caa5c9 fix oot ice trap check optimization issues 2022-08-31 18:15:09 -04:00
briaguya 32c36eb5c4 Merge pull request #1355 from leggettc18/rando-next-chest-fixes
Randomizer: Fixes a few bugs related to chests.
2022-08-31 16:15:46 -04:00
Christopher Leggett 042d6f3865 Fixes a few bugs related to chests. 2022-08-31 10:57:59 -04:00
Christopher Leggett bf505dba5c Fixes keys, maps, and compasses on develop-zhora rando (#1338)
* Fixes keys, maps, and compasses on develop-zhora rando.

* Adds randotodo comment as a note to adapt for the keysanity situation.
2022-08-31 15:25:58 +02:00
Christopher Leggett 776219fb52 Backports a fix for sheik checks from rando-next (#1340)
* Fixes some Sheik checks I had accidentally set the wrong flag for.

* Removes duplicate switch case from cherry-pick
2022-08-31 15:25:47 +02:00
briaguya 22f67cb258 Merge pull request #1350 from leggettc18/rando-next-key-fix
Fixed small key case that was behind an else and shouldn't have been
2022-08-30 11:33:09 -04: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
briaguya bb57479732 Merge pull request #1339 from leggettc18/rando-next-key-fix
Randomizer: When Shuffled to Own Dungeon or Vanilla, Give Vanilla Keys, Maps and Compasses
2022-08-30 10:19:48 -04: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 b9aee7085e Adds note to key colors enhancement about this change. 2022-08-29 19:12:19 -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
briaguya c9755cd05e Merge pull request #1330 from leggettc18/malon-missed-check
Changes Malon's behavior to so she won't leave Hyrule Castle until you've obtained her item.
2022-08-27 14:43:35 -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 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 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
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