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

Merge develop -> develop-rando #4343

Merged
merged 8 commits into from
Sep 15, 2024

Conversation

Archez
Copy link
Contributor

@Archez Archez commented Sep 15, 2024

No squash

Merge develop -> develop-rando

Build Artifacts

Archez and others added 8 commits August 18, 2024 15:25
* bump lus

* remove undeclared methods
* Add git info to title screen & gameplay stats

* Change the branch criteria to starting with `develop`

* Update z_title.c

* Change the branch criteria to not having a tag

* Always show both when not a release build

* Only show build version in tagged releases
* Changed references for VS build tools 142 to 143 to reflect current state of development.

* Remove VS 2019.
* Converted all GuiWindows to the new separate Begin/End format in current LUS except InputViewer, CheckTracker, ItemTracker and Modals.

* Setup Check, Entrance, Item trackers and Input Viewer to override `Draw()` to bypass the ImGui Begin and End, as they're not intended to go in the modern menu.

* Cleanup.
* Removed all CVarLoad uses from code to prevent thread concurrency issues.

* Add mutext locks to save and load functions to prevent concurrent operations between those two.
@Archez Archez merged commit e75400a into HarbourMasters:develop-rando Sep 15, 2024
5 checks passed
@Archez Archez deleted the merge-develop-rando-sep14 branch September 15, 2024 04:16
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.

4 participants