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

bradley -> dev #2187

Merged
merged 6 commits into from
Dec 14, 2022
Merged

bradley -> dev #2187

merged 6 commits into from
Dec 14, 2022

Conversation

briaguya-ai
Copy link
Contributor

@briaguya-ai briaguya-ai commented Dec 14, 2022

leggettc18 and others added 6 commits December 13, 2022 14:55
* Revert json key changes in save v1 and v2

* Introduce save v3

* Add workaround for breaking save compatibility in 5.1.0

* Handle scarecrow long song a bit differently since the array is never empty
* fix: populate merchant prices with vanilla scrub prices

* temporary expensive scrub workaround

Co-authored-by: briaguya <briaguya@alice>
…t. (#2183)

* Fixes receiving the wrong item when picking up ammo drops near a chest.

Still shows the wrong model above links head but does give the right
item and shows the right text.

* Fixes get item model during first time pickup anim near chest.
Co-authored-by: briaguya <briaguya@alice>
Co-authored-by: briaguya <briaguya@alice>
@briaguya-ai briaguya-ai merged commit a612081 into develop Dec 14, 2022
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.

None yet

3 participants