Garrett Cox
|
d60a82d67a
|
Use randomizerInf
|
2022-09-02 11:47:57 -05:00 |
|
Garrett Cox
|
73606edf4e
|
Use merchantMessageTableID
|
2022-09-02 11:08:48 -05:00 |
|
Garrett Cox
|
43d8a11de5
|
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity
|
2022-09-02 11:07:21 -05:00 |
|
Garrett Cox
|
32ea5ef564
|
Use randomizerMerchantPrices
|
2022-09-02 11:04:45 -05:00 |
|
briaguya
|
331ae90c4d
|
Merge pull request #1374 from leggettc18/rando-next
Added return statement in IsVanillaItem before keys
|
2022-09-01 18:27:11 -04:00 |
|
Christopher Leggett
|
812a1e7970
|
Added return statement in IsVanillaItem before keys.
|
2022-09-01 17:50:12 -04:00 |
|
briaguya
|
f391505b0e
|
Merge pull request #1344 from aMannus/more-random-rupee-names
Rando: German and more English random rupee names
|
2022-09-01 15:18:29 -04:00 |
|
aMannus
|
1e13879c6b
|
Removed name
|
2022-09-01 19:43:08 +02:00 |
|
briaguya
|
26c41079bd
|
Merge pull request #1362 from lilDavid/rando_biggoron_fix
Randomizer: Fix Biggoron checks
|
2022-09-01 12:50:37 -04:00 |
|
briaguya
|
7d7af07f10
|
Merge pull request #1368 from briaguya-ai/ztorn
zhora -> rando-next
|
2022-09-01 12:19:25 -04:00 |
|
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 |
|
lil David
|
c84654b202
|
Always check n64ddFlag before bgsFlag
that order is consistent with the existing condition in EnGo2_GetStateGoronDmtBiggoron
|
2022-09-01 09:23:08 -05: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 |
|
aMannus
|
354905fb7d
|
Added 1 more name
|
2022-09-01 11:06:05 +02:00 |
|
lilDavid
|
cfaed3ded0
|
Make Biggoron ignore whether you have BGS in rando
|
2022-08-31 22:07:34 -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 |
|
aMannus
|
1161873044
|
Moar names
|
2022-08-29 21:51:42 +02: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 |
|