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.

Sign up for GitHub

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

Jump to bottom

Merge develop -> develop-rando #4343

Merged
merged 8 commits into from
Sep 15, 2024
Merged

Merge develop -> develop-rando #4343

merged 8 commits into from
Sep 15, 2024

Commits on Aug 18, 2024

  1. Bump LUS (HarbourMasters#4301) 

    * bump lus

* remove undeclared methods
    @Archez
    Archez authored Aug 18, 2024
    Configuration menu
    Copy the full SHA
    01245ae View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2024

  1. Add git info to title screen & gameplay stats (HarbourMasters#4053) 

    * 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
    @Pepe20129
    Pepe20129 authored Aug 23, 2024
    Configuration menu
    Copy the full SHA
    e07fc59 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2024

  1. Change Recommended VS build tools from 142 to 143 (HarbourMasters#4315) 

    * Changed references for VS build tools 142 to 143 to reflect current state of development.

* Remove VS 2019.
    @Malkierian
    Malkierian authored Aug 30, 2024
    Configuration menu
    Copy the full SHA
    48663d7 View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2024

  1. Gui window rework (HarbourMasters#4307) 

    * 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.
    @Malkierian
    Malkierian authored Sep 10, 2024
    Configuration menu
    Copy the full SHA
    b5037a0 View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2024

  1. Concurrency Fix (HarbourMasters#4318) 

    * 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.
    @Malkierian
    Malkierian authored Sep 15, 2024
    Configuration menu
    Copy the full SHA
    7f503c3 View commit details
    Browse the repository at this point in the history

  2. Bump LUS (HarbourMasters#4341)

    @Archez
    Archez authored Sep 15, 2024
    Configuration menu
    Copy the full SHA
    19dc4dc View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/develop' into merge-develop-rand… 

    …o-sep14
    @Archez
    Archez committed Sep 15, 2024
    Configuration menu
    Copy the full SHA
    8bd2f38 View commit details
    Browse the repository at this point in the history

  4. Update entrance tracker settings window for modern menu changes

    @Archez
    Archez committed Sep 15, 2024
    Configuration menu
    Copy the full SHA
    8359d2a View commit details
    Browse the repository at this point in the history