Commit Graph

2224 Commits

Author SHA1 Message Date
Christopher Leggett ca3ecab835
Merge branch 'develop-rando' of https://github.com/HarbourMasters/Shipwright into rando-silver-rupee-shuffle 2024-04-09 18:09:36 -04:00
Garrett Cox 67ee5f8d0e
Merge pull request #4045 from HarbourMasters/develop
develop -> develop-rando
2024-04-08 16:02:22 +00:00
briaguya 897d3efbd0
rip out unused types (#4041) 2024-04-07 17:02:57 -04:00
briaguya 168323ebc9
bump LUS (#4042) 2024-04-07 14:27:50 -04:00
Archez fd7dfd8b6f
Support for new ucode loading patterns (#4038) 2024-04-04 12:26:14 -04:00
Archez 86c6013888
Remove macports upgrading (#4035) 2024-04-04 11:23:18 -04:00
Garrett Cox 01bcc4bb59
Merge pull request #4033 from HarbourMasters/develop
develop -> develop-rando
2024-04-04 13:13:58 +00:00
briaguya fb29c827ad
Update BUILDING.md (#4029) 2024-04-03 22:17:32 -04:00
briaguya 0f43d5de2d
bump lus (gfx refactor) (#4031) 2024-04-03 22:16:17 -04:00
Christopher Leggett 76b778a529
Shows all of the silver rupee flags in the save editor 2024-03-30 17:35:49 -04:00
Christopher Leggett cc4771b454
Changes a few of the longer names 2024-03-30 17:03:37 -04:00
Christopher Leggett c1d56a7d3d
Adds RCQUEST to the Position struct 2024-03-30 15:09:58 -04:00
Christopher Leggett 38be38d736
Adds RCQUEST to the Position struct 2024-03-29 20:19:45 -04:00
Christopher Leggett ddc7d1afb6
Adds Master Quest Silver Rupee location data. 2024-03-29 19:55:49 -04:00
Christopher Leggett 75018529fb
Merge branch 'develop-rando' of https://github.com/HarbourMasters/Shipwright into rando-silver-rupee-shuffle 2024-03-29 18:19:05 -04:00
Christopher Leggett c162af818d
Fix keysanity Any Dungeon setting. (#4020)
Due to a typo a few months ago, it was accidentally being ignored and
treated as Anywhere. Own Dungeon may have also been doing weird things,
but I'm not entirely sure.
2024-03-20 18:24:58 -04:00
Christopher Leggett 6cb373da1a
Makes the Own Dungeon, Any Dungeon, and Overworld options work. 2024-03-19 19:28:47 -04:00
Christopher Leggett 8e28316664
Adds Magical Silver Rupee 2024-03-19 17:25:38 -04:00
Christopher Leggett 9f036f4c74
Shuffled silver rupees now give you 5 rupees when collected. 2024-03-09 20:07:00 -05:00
Christopher Leggett cae433ddfa
Added Silver Rupee Counts to the GetItem Message 2024-03-09 20:05:21 -05:00
Christopher Leggett f26d954cf8
Merge branch 'rando-hint-bugfixes' into rando-silver-rupee-shuffle 2024-03-09 18:05:01 -05:00
Garrett Cox 8b3cfdb84f
Merge pull request #3986 from Archez/merge-macready-805
Merge MacReady 8.0.5 -> Develop
2024-03-06 04:12:02 +00:00
briaguya ef690e2ceb
support `LUS::Archive::LoadFileRaw` no longer being exposed (#3999) 2024-03-05 23:09:05 -05:00
briaguya 9fb2f26f1b
tts: use `RawJson` resource + add `SpeechLogger` (#3998)
* moved `tts.cpp` away from using `LoadFileRaw` by creating a new `RawJson` resource type
* added `SpeechLogger`
2024-03-05 22:21:15 -05:00
Christopher Leggett 36eb9c3cb6
Fix hint generation bugs on develop-rando
1. Fixed Ganon Non-hint text from loading as Saria's Magic Hint.
2. Fixed Ganon Non-hint text from not getting saved correctly.
3. Fixed gossip stone hint generation from not generating any non-always hints on No Logic.

For #3, the hint distribution and placement algorithm was bailing out too early when it wasn't able
to place a hint. For No Logic, what it was doing was failing to place WOTH hints (since No Logic seeds
don't calculate WOTH candidacy), returning the amount of hints it failed to place, and then it called
the function to redistribute the hints, but did not call the function to attempt to place the remaining hints.

Additionally, it was not accounting for the fact that we shouldn't redistribute the hints into the categories we failed to
place a hint in, so it would redistribute hints right back into those categories. I changed it so that when DistributeHints
gets called after PlaceHints fails to place the hint, it checks if the distribution settings copies attribute was set to 0.
In this case, it breaks while looping for the type distribution settings, and moves on to the next category. Also, it now repeatedly
attempts to distribute and place hints until PlaceHints returns 0 (meaning it placed all of its hints successfully).
2024-03-05 21:32:02 -05:00
briaguya 402a4db593
Bump LUS (#3996) 2024-03-04 23:56:26 -05:00
briaguya 375349e4f7
Support font as resource LUS changes (#3993) 2024-03-04 23:36:23 -05:00
briaguya ebde648c59
`.o2r` support (#3955) 2024-03-02 20:51:32 -05:00
Adam Bird 7bd2a7c3a6 Merge remote-tracking branch 'origin/develop' into merge-macready-805 2024-02-28 23:49:06 -05:00
Garrett Cox 612da023f0
Bump version to MacReady Foxtrot 8.0.5 (#3982) 2024-02-28 22:46:55 -05:00
Malkierian 368a9015ac
Add Unix timestamp to renamed corrupted file to prevent trying to copy over existing file. (#3984) 2024-02-28 22:46:32 -05:00
Malkierian ed9cb1dfd2
Fix CVar evaluation for scummed checks being hidden. (#3985) 2024-02-28 22:45:16 -05:00
Archez fb6ea42560
prevent remember save location in dungeons/boss rooms (#3983) 2024-02-28 22:33:51 -05:00
Malkierian b26f2b21da
[UX Improvement] Catch save loading errors and notify user (#3979)
* Add `SohModalWindow` and `SohModal`. Runs as window, always "visible", but not drawing if no popups are registered.

Adds error catching for save file corruption (malformed json) that renames the file in question to prevent future loading issues and uses `SohModalWindow` to inform the user of the error.

* Apply suggestions from code review

---------

Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
2024-02-28 21:12:23 -06:00
Archez 358dd47da7
remove zapd extraction from mac launch script (#3981) 2024-02-28 21:03:08 -06:00
Malkierian ea1ffdd041
Adds messageboxes to `no_ui` handling so they don't show if you have it on. (#3977) 2024-02-28 20:04:44 -06:00
Christopher Leggett f7e549e31a
Hint text for Vanilla Silver Rupees 2024-02-24 20:19:51 -05:00
Christopher Leggett 4795da14c2
Merge branch 'develop-rando' of https://github.com/HarbourMasters/Shipwright into rando-silver-rupee-shuffle 2024-02-24 14:21:56 -05:00
Christopher Leggett 6e01572e13
Add hint text for vanilla silver rupees. 2024-02-24 14:21:28 -05:00
Christopher Leggett fff2ec04ef
Shuffle vanilla silver rupees 2024-02-24 13:18:46 -05:00
Garrett Cox 854fb67797
Merge pull request #3964 from Archez/rando-dev-merge-feb
Merge develop -> develop-rando
2024-02-21 20:05:32 +00:00
Adam Bird b5c601f43e Merge remote-tracking branch 'origin/develop' into rando-dev-merge-feb 2024-02-21 02:01:25 -05:00
briaguya bcbe4cb1c3
we crash if we try to SPDLOG in the destructors (#3951)
* we crash if we try to SPDLOG in the destructors

* rip em out

* newline

* add to destroy

* Revert "rip em out"

This reverts commit 738a9b80f3.

* Revert "we crash if we try to SPDLOG in the destructors"

This reverts commit 327d305e00.
2024-02-21 00:21:26 -05:00
Archez cd25f1d3c1
Fix performance of dlist viewer (#3961) 2024-02-21 00:20:25 -05:00
Adam Bird 8b178f9386 RandoV3 fixes for mix/decouple boss entrances 2024-02-20 16:52:42 -05:00
Adam Bird 37b960ab0e Merge commit '13fce8258d92e80ea09900f83d338ccba2e7b1f9' into rando-dev-merge-feb 2024-02-20 16:51:05 -05:00
Adam Bird 1d61ba0b86 Merge commit '3187564f5b4120e159f5e506b4a3db88716b56aa' into rando-dev-merge-feb 2024-02-20 10:57:39 -05:00
Archez cd5d2589f7
Merge pull request #3958 from HarbourMasters/develop-macready
macready -> develop
2024-02-20 10:32:28 -05:00
Archez ef9fc0a9ec
fix endianess issue with camera setting data (#3950) 2024-02-20 08:38:10 -06:00
Archez 19af4481c0
fix object unload using wrong index (#3949) 2024-02-20 08:31:24 -06:00