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

macready -> dev (2024/2/2) #3897

Merged

Conversation

briaguya-ai
Copy link
Contributor

@briaguya-ai briaguya-ai commented Feb 2, 2024

Pepper0ni and others added 8 commits February 1, 2024 19:15
Adds helper info for invert, distance, and transition speed options.
* Adds `FormatLocations` and `PRESET_ENTRY_TYPE_CPP_STRING` to allow for feeding `RandomizerCheck` values directly in presets instead of a string with magic numbers.

* Switch to concatenation with `std::to_string`.

* Forgot to remove <format> include XD
* cullzone

* better cvar name

* Update soh/src/code/z_actor.c

* Update soh/src/code/z_actor.c

---------

Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
…sters#3878)

* Account for removed object dependency in Deku Scrub Leader

* Update soh/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c

---------

Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
@garrettjoecox garrettjoecox merged commit 8cac9b4 into HarbourMasters:develop Feb 2, 2024
8 checks passed
@briaguya-ai briaguya-ai deleted the macready-to-dev-2-2 branch March 3, 2024 01:57
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.

7 participants