Skip to content

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

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
Merged
merged 17 commits into from
Dec 18, 2023
Merged

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

merged 17 commits into from
Dec 18, 2023

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
@Archez
fix jabu mq minimap mark points (HarbourMasters#3494)
fb0f716
@Malkierian
Added "Always show gold skulltula" to check tracker options. Toggleab…
3530155 
…le without restart. (HarbourMasters#3505)

Made "Hide right-side shop checks" toggleable without restart.
@Archez
change adult shooting gallery reward and add message (HarbourMasters#…
269e9fa 
…3506)
@Archez
fix led crash when set to health (HarbourMasters#3507)
f65b711
@Archez
retain gameplay stats window size (HarbourMasters#3508)
ea49196
@Archez
more swordless fixes when time traveling (HarbourMasters#3510)
907b770
@Archez
fix condition causing enemies to always be small (HarbourMasters#3512)
e2f1ceb
@garrettjoecox @briaguya-ai
Fix JSON parsing every frame on file select (HarbourMasters#3513)
fcf2141 
* Fix JSON parsing every frame on file select

* string (HarbourMasters#73)

---------

Co-authored-by: briaguya <[email protected]>
@Archez
[Tweak] Improve KD lava effect performance and stability (HarbourMast…
d370ca9 
…ers#3501)

* improve kd lava performance and stability

* enum typo

* account for rock tex size
@briaguya-ai
bump lus to latest 1.x (HarbourMasters#3528)
e6fc34e
@Archez
Re-implement Pause menu Dungeon map texture effects (HarbourMasters#3496
f655ab5 
)

* first pass implement dungeon maps

* wrap up map dungeon implementation

* add comments and enums, rename vars

* bump lus
@garrettjoecox
Initialize GameInteractor before SaveManager so it can correctly set …
b5caf33 
…up a hook (HarbourMasters#3535)
@inspectredc
Fix Logical Error With Darunias Door Entrance (HarbourMasters#3529)
865bcc5
@inspectredc @garrettjoecox
Add player state dead check to Player_UseTunicBoots (HarbourMasters#3530
f607afc 
)

* Add player state dead check to Player_UseTunicBoots

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

---------

Co-authored-by: Garrett Cox <[email protected]>
@garrettjoecox
Remove use of static variable in en_box (HarbourMasters#3536)
ef910a0
@garrettjoecox
Bump version to MacReady Echo 8.0.4 (HarbourMasters#3537)
60faf3f
@Archez
Merge tag '8.0.4' into HEAD
03da69d 
MacReady Echo
@briaguya-ai briaguya-ai 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
Reviewers

@briaguya-ai briaguya-ai briaguya-ai approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@Archez @briaguya-ai @Malkierian @garrettjoecox @inspectredc