mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-14 21:45:16 -05:00
Code Issues Projects Releases Wiki Activity
1,535 Commits 3 Branches 37 Tags 141 MiB
9afe3ca746
Commit Graph

1535 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Christopher Leggett
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
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
Sarge-117
75e5330263 Add German 2022-08-31 17:23:16 -07: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
Sarge-117
55fa913c78 Couple more 
Just need German for these

Co-Authored-By: PurpleHato <47987542+PurpleHato@users.noreply.github.com>
 2022-08-30 15:24:44 -07:00
Sarge-117
d9ad01174b Merge remote-tracking branch 'upstream/rando-next' into update-navi-hints-rando 2022-08-30 14:22:11 -07:00
Sarge-117
b803c77f58 Add French translation 
Thanks to PurpleHato
 2022-08-30 14:22:02 -07: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
Sarge-117
f4e53c54b5 Correct German spellings, add 2 more hints 2022-08-29 18:17:23 -07: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
Garrett Cox
c7207d2e0a Move obtainability check up higher 2022-08-29 17:42:48 -05:00
Garrett Cox
8c6774fa35 More small changes 2022-08-29 16:00:47 -05:00
Garrett Cox
ded7ccab3f Minor fixes 2022-08-29 15:35:37 -05:00
Garrett Cox
5961c33ba9 Rename GetItemFromGet and move obtainability checks to a separate function 2022-08-29 15:26:27 -05:00