-
Notifications
You must be signed in to change notification settings - Fork 521
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Dev to dev rando 4 19 #4059
Merged
garrettjoecox
merged 12 commits into
HarbourMasters:develop-rando
from
Malkierian:dev-to-dev-rando-4-19
Apr 19, 2024
Merged
Dev to dev rando 4 19 #4059
garrettjoecox
merged 12 commits into
HarbourMasters:develop-rando
from
Malkierian:dev-to-dev-rando-4-19
Apr 19, 2024
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* make lod cvar affect everything * add to more functions * re-add to player * only add to necessary funcs
* Clean up grayed out items in file select. Tie personal notes saving to `OnExitGame()` to account for save scum resets. Hide text input box (but not window) for personal notes when a save isn't loaded to prevent saving over a save's notes while in file select. * Allow check tracker window to be visible and show the "Waiting for file load..." text in file select (ease of positioning). * Fix key label text placement. * Persist `areasSpoiled`, change trigger to `OnSceneTransition`. Add `IsAreaSpoiled` for tie-in to Item Tracker. Add `SetAreaSpoiled` to unify bitmagic. * Add proper spoiling evaluation based on specific entrance IDs, or first check collection. Add light yellow color for vanilla dungeon abbreviations to match the purple for MQ. * Initialize `areasSpoiled` to 0, so 0 gets saved on file create. * All new conditional statements around `GameInteractor::IsSaveLoaded()` were inverted. Fixed that. * Change some c-style casts to `static_cast`. * Few more cleanups, plus clarifying comment.
garrettjoecox
approved these changes
Apr 19, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No squash
I'm not sure why, but the diff viewer here is showing more changes than the commits list. It's almost like it is including the changes from the previous dev->dev-rando merge.. The changes appear to be caused by the last merge commit 96ea539 |
96ea539
to
f4fc366
Compare
Archez
approved these changes
Apr 19, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
null
Build Artifacts