680495ab2b
Merge branch 'GetItem-renaming' of github.com:garrettjoecox/OOT into shopsanity
2022-09-02 20:08:06 -05:00
e0b0776e02
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into GetItem-renaming
2022-09-02 20:07:34 -05:00
abfeb24ba8
Attempt to fix odd build issue
2022-09-02 20:06:37 -05:00
f69d9697e9
Struct instead of ImVec + basic comportment for all case
2022-09-03 01:30:47 +02:00
b98442cc9f
Move shopsanity option in GUI
2022-09-02 18:07:43 -05:00
c1894f108f
Merge pull request #1380 from leggettc18/rando-next-key-fix
...
Fixes Ganon's Boss Key setting discrepancy
2022-09-02 18:33:47 -04:00
e53ec33d85
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity
2022-09-02 17:27:07 -05:00
25ed66439e
Fix repeatable purchases and bottles rendering incorrectly
2022-09-02 17:23:37 -05:00
34d99441d6
Merge pull request #1321 from aMannus/rando-settings-menu-even-moar-changes
...
Rando: Even more randomizer settings menu changes
2022-09-02 17:00:52 -04:00
2ead2557f0
combobox title rename + no number tracking
2022-09-02 22:41:05 +02:00
d1dac2a2ee
Add obtainability checks correctly
2022-09-02 15:22:09 -05:00
069f7c98a6
Enum + combo box
2022-09-02 22:07:05 +02:00
0cdcc27e53
Fixes Ganon's Boss Key shuffled while regular boss Keys aren't.
2022-09-02 15:45:55 -04:00
0277db578f
Merge branch 'GetItem-renaming' of github.com:garrettjoecox/OOT into shopsanity
2022-09-02 14:33:32 -05:00
0c65a05ca8
Revert changes to GetItemFromGet
2022-09-02 14:32:25 -05:00
a95edd25de
Merge branch 'GetItemFromGet-changes' of github.com:garrettjoecox/OOT into GetItem-renaming
2022-09-02 14:18:18 -05:00
1aa33a7940
Remove comments in OTRGlobals
2022-09-02 14:17:45 -05:00
1659f1f386
Re-add GetItemObtainabilityFromRandomizerCheck
2022-09-02 14:00:10 -05:00
42858bf15e
Add shopsanity condition around shop changes
2022-09-02 13:27:59 -05:00
7a22763e55
Fix an issue with textId and with giving items with fanfare
2022-09-02 12:39:08 -05:00
64aca78450
Fixes Switch/Wii U crashes with Wonder Rupees and Bottleable Entities ( #1360 )
...
* Reorders switch statement to prevent some code that shouldn't execute.
* Potentially fixes bottleable entities crash
* Solves lack of ItemEntry for GI_MAX
* Adds comment clarifying new GetItemEntry
2022-09-02 19:19:12 +02:00
3aa0674c18
Handle bazaar as both child and adult
2022-09-02 12:07:30 -05:00
d60a82d67a
Use randomizerInf
2022-09-02 11:47:57 -05:00
73606edf4e
Use merchantMessageTableID
2022-09-02 11:08:48 -05:00
43d8a11de5
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity
2022-09-02 11:07:21 -05:00
32ea5ef564
Use randomizerMerchantPrices
2022-09-02 11:04:45 -05:00
ee2f38ad91
Renaming of some randomizer item/check/get methods
2022-09-02 10:34:20 -05:00
c7a7059db4
Minor adjustments from feedback and rename CanObtain to ItemObtainability
2022-09-02 09:38:41 -05:00
676f8945ab
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into GetItemFromGet-changes
2022-09-02 09:15:31 -05:00
164a43c9cb
Update logic for King Dodongo's room
...
Explicitly check for BlueFireAccess && HasBottle here, since using the Ice Arrows on the bombable floor is tricky due to its collision being very tiny
2022-09-01 22:00:46 -07:00
636f3f0703
Update tooltip
2022-09-01 19:10:40 -07:00
41256359f2
Update tooltip
2022-09-01 18:44:23 -07:00
b5a881f9ab
Add magic arrow enhancements, non-rando
...
Changes to red ice actor, sun switch actor, and mudwall actor to adjust their collision
2022-09-01 18:21:44 -07:00
83469f85e7
Move checkboxes to normal enhancement menu
...
Also comment clarity + capitalization
2022-09-01 17:47:25 -07:00
0626d80651
Fix missed comma
2022-09-01 17:13:34 -07:00
b4d14e708e
Check for CVar only
...
Instead of (Cvar && n64dd)
2022-09-01 17:08:34 -07:00
9b5774cca7
Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows
2022-09-01 17:05:48 -07:00
331ae90c4d
Merge pull request #1374 from leggettc18/rando-next
...
Added return statement in IsVanillaItem before keys
2022-09-01 18:27:11 -04:00
812a1e7970
Added return statement in IsVanillaItem before keys.
2022-09-01 17:50:12 -04:00
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
2f6e070223
Merge branch 'rando-next' into rando-settings-menu-even-moar-changes
2022-09-01 20:26:29 +02:00
38dca43b3f
Name changes and small layout changes
2022-09-01 20:25:10 +02:00
1e13879c6b
Removed name
2022-09-01 19:43:08 +02:00
26c41079bd
Merge pull request #1362 from lilDavid/rando_biggoron_fix
...
Randomizer: Fix Biggoron checks
2022-09-01 12:50:37 -04:00
7d7af07f10
Merge pull request #1368 from briaguya-ai/ztorn
...
zhora -> rando-next
2022-09-01 12:19:25 -04:00
a55eb572db
fix keysanity related build issue
2022-09-01 12:06:41 -04:00
5a009590fc
Merge remote-tracking branch 'origin/develop-zhora' into ztorn
2022-09-01 12:06:25 -04:00
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
b370e3f9b2
Merge pull request #1205 from lilDavid/bombchu-logic
...
Add Bombchus in Logic option
2022-09-01 10:00:02 -04:00
0a744cde01
Clarify comments
2022-09-01 08:11:17 -05:00
Garrett Cox