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

278 Commits

Author SHA1 Message Date
Sarge-117 05f7b65d28 Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows 2022-09-03 09:30:14 -07:00
briaguya 3a6d7fcfd0 and make it build 2022-09-03 04:23:25 -04:00
briaguya 975a854054 Merge branch 'develop-zhora' into z-to-rando-next 2022-09-03 03:47:09 -04:00
Christopher Leggett 36cc9d562c
Adds more options for Link's starting item. 2022-09-03 02:34:21 -04:00
briaguya 50daabb794
Merge pull request #1353 from Sarge-117/update-navi-hints-rando 
Rando: Navi text: Update German spellings, add some hints
 2022-09-03 00:53:39 -04:00
Christopher Leggett fba8fc2b74
Fix Ganons Trials coming from old save files. Fixes #1365 2022-09-03 00:20:07 -04:00
David Chavez 0ce0ab1260
Phase 1: Separate ImGui Drawing From LUS (#1310) 
* Update LUS imported paths

* Introduce GameMenuBar

* Fix imports after LUS import paths change

* Move Randomizer

* Replace needs_save

* Migrate Developer Tools

* Migrate Cheats

* Migrate Enhancements

* Separate UIWidgets

* Add missing Hooks.cpp file

* Migrate Settings

* Remove UI methods from LUS

* Cleanup imports and exposed properties

* Cleanup more methods

* Fix project generation

* Fix CI compilation

* Remove resolved TODO
 2022-09-03 00:00:04 -04:00
Sarge-117 9441b2ab1d Update logic Cvar names 2022-09-02 19:37:02 -07:00
Sarge-117 33779823c8 Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows 2022-09-02 19:10:28 -07:00
Garrett Cox f6fd116adb Cast randoGet for ganons boss key 2022-09-02 20:19:28 -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
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 1659f1f386 Re-add GetItemObtainabilityFromRandomizerCheck 2022-09-02 14:00:10 -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
Sarge-117 9b5774cca7 Merge remote-tracking branch 'upstream/rando-next' into rando-enhanced-magic-arrows 2022-09-01 17:05:48 -07: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 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 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
Sarge-117 75e5330263 Add German 2022-08-31 17:23:16 -07: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
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 f4e53c54b5 Correct German spellings, add 2 more hints 2022-08-29 18:17:23 -07: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