mirror
/
Shipwright
mirror of https://github.com/HarbourMasters/Shipwright.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,497 Commits 3 Branches 36 Tags 132 MiB
Commit Graph

1497 Commits

Author SHA1 Message Date
Garrett Cox 680495ab2b Merge branch 'GetItem-renaming' of github.com:garrettjoecox/OOT into shopsanity 2022-09-02 20:08:06 -05:00
Garrett Cox e0b0776e02 Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into GetItem-renaming 2022-09-02 20:07:34 -05:00
Garrett Cox abfeb24ba8 Attempt to fix odd build issue 2022-09-02 20:06:37 -05:00
Garrett Cox b98442cc9f Move shopsanity option in GUI 2022-09-02 18:07:43 -05:00
briaguya 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
Garrett Cox e53ec33d85 Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity 2022-09-02 17:27:07 -05:00
Garrett Cox 25ed66439e Fix repeatable purchases and bottles rendering incorrectly 2022-09-02 17:23:37 -05:00
briaguya 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
Garrett Cox d1dac2a2ee Add obtainability checks correctly 2022-09-02 15:22:09 -05:00
Christopher Leggett 0cdcc27e53
Fixes Ganon's Boss Key shuffled while regular boss Keys aren't. 2022-09-02 15:45:55 -04:00
Garrett Cox 0277db578f Merge branch 'GetItem-renaming' of github.com:garrettjoecox/OOT into shopsanity 2022-09-02 14:33:32 -05:00
Garrett Cox 0c65a05ca8 Revert changes to GetItemFromGet 2022-09-02 14:32:25 -05:00
Garrett Cox a95edd25de Merge branch 'GetItemFromGet-changes' of github.com:garrettjoecox/OOT into GetItem-renaming 2022-09-02 14:18:18 -05:00
Garrett Cox 1aa33a7940 Remove comments in OTRGlobals 2022-09-02 14:17:45 -05:00
Garrett Cox 1659f1f386 Re-add GetItemObtainabilityFromRandomizerCheck 2022-09-02 14:00:10 -05:00
Garrett Cox 42858bf15e Add shopsanity condition around shop changes 2022-09-02 13:27:59 -05:00
Garrett Cox 7a22763e55 Fix an issue with textId and with giving items with fanfare 2022-09-02 12:39:08 -05:00
Garrett Cox 3aa0674c18 Handle bazaar as both child and adult 2022-09-02 12:07:30 -05:00
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
Garrett Cox ee2f38ad91 Renaming of some randomizer item/check/get methods 2022-09-02 10:34:20 -05:00
Garrett Cox c7a7059db4 Minor adjustments from feedback and rename CanObtain to ItemObtainability 2022-09-02 09:38:41 -05:00
Garrett Cox 676f8945ab Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into GetItemFromGet-changes 2022-09-02 09:15:31 -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 2f6e070223 Merge branch 'rando-next' into rando-settings-menu-even-moar-changes 2022-09-01 20:26:29 +02:00
aMannus 38dca43b3f Name changes and small layout changes 2022-09-01 20:25:10 +02: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
aMannus 3502cea422 Renamed tabs 2022-08-31 10:10:28 +02:00
aMannus c10693d281 Merge branch 'rando-next' into rando-settings-menu-even-moar-changes 2022-08-31 10:02:13 +02:00