Skip to content

Merge (8.0.4) develop-macready -> develop#3539

Merged
briaguya0 merged 17 commits intoHarbourMasters:developfrom
Archez:merge-echo-develop
Dec 18, 2023
Merged

Merge (8.0.4) develop-macready -> develop#3539
briaguya0 merged 17 commits intoHarbourMasters:developfrom
Archez:merge-echo-develop

Conversation

@Archez
Copy link
Contributor

@Archez Archez commented Dec 18, 2023

MERGE COMMIT, NO SQUASH

Archez and others added 17 commits December 16, 2023 20:50
…le without restart. (HarbourMasters#3505)

Made "Hide right-side shop checks" toggleable without restart.
* Fix JSON parsing every frame on file select

* string (HarbourMasters#73)

---------

Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
…ers#3501)

* improve kd lava performance and stability

* enum typo

* account for rock tex size
)

* first pass implement dungeon maps

* wrap up map dungeon implementation

* add comments and enums, rename vars

* bump lus
)

* Add player state dead check to Player_UseTunicBoots

* Update soh/src/overlays/actors/ovl_player_actor/z_player.c

---------

Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
@briaguya0 briaguya0 merged commit 9b94761 into HarbourMasters:develop Dec 18, 2023
@Archez Archez deleted the merge-echo-develop branch December 18, 2023 06:01
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.

5 participants