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

1723 Commits

Author SHA1 Message Date
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
Sarge-117 0a2bbabbed First pass on logic 2022-08-31 21:13:09 -07: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
Sarge-117 d117b13c46 Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows 2022-08-31 16:58:40 -07: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
Sarge-117 c4c15e91bf Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows 2022-08-30 11:06:51 -07:00
Sarge-117 8e2f035278 Split into two enhancements 
"Blue Fire Arrows" and "Sunlight Arrows"
 2022-08-30 11:06:42 -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
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
aMannus fdc0aa9ab4 Code Cleanup 2022-08-28 21:07:18 +02:00
aMannus 2456473f49 Merge fix 2022-08-28 20:21:32 +02:00
aMannus 1c59995feb Merge branch 'rando-next' into rando-settings-menu-even-moar-changes 2022-08-28 20:19:19 +02:00
aMannus 77f4472902 Redone layout tabs/columns 2022-08-28 19:40:46 +02:00
Sarge-117 12ae59d133 Change bool name 
To make jenkins happy (I hope)
 2022-08-28 10:39:53 -07:00
Sarge-117 dc44dc9ef6 Add rando enhancement checkbox 2022-08-28 10:15:39 -07:00
Sarge-117 d510d8cde0 Comment clarity 2022-08-28 09:45:00 -07:00
Sarge-117 ee4cdf3317 Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows 2022-08-28 09:08:44 -07: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
Sarge-117 669f76d2f4 Implement Enhanced Magic Arrows 
Currently as a rando-only enhancement until it can be accounted for in logic
 2022-08-27 22:49:13 -07:00
Christopher Leggett 9c43f7225b
Adds captilization to French spoilerfile strings. 2022-08-27 18:45:21 -04:00