Skip to content
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

Conversation

Malkierian
Copy link
Contributor

@Malkierian Malkierian commented Apr 19, 2024

inspectredc and others added 11 commits April 7, 2024 17:28
* 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.
Copy link
Contributor

@garrettjoecox garrettjoecox left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No squash

@Archez
Copy link
Contributor

Archez commented Apr 19, 2024

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

@Malkierian Malkierian force-pushed the dev-to-dev-rando-4-19 branch from 96ea539 to f4fc366 Compare April 19, 2024 16:51
@garrettjoecox garrettjoecox merged commit 565a62a into HarbourMasters:develop-rando Apr 19, 2024
8 checks passed
@Malkierian Malkierian deleted the dev-to-dev-rando-4-19 branch May 7, 2024 00:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants