-
Notifications
You must be signed in to change notification settings - Fork 7
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
Update from upstream dev, August 10 2024 #65
Open
out-of-phaze
wants to merge
652
commits into
OpaqueSunset:master
Choose a base branch
from
out-of-phaze:lighthouse-update/08-07-2024
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Update from upstream dev, August 10 2024 #65
out-of-phaze
wants to merge
652
commits into
OpaqueSunset:master
from
out-of-phaze:lighthouse-update/08-07-2024
+22,580
−13,896
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Shaded Hills tweaks.
Tweaks and fixes to drying racks.
Adding pillars and pedestals.
Adding horses and saddles.
Updating doe icons to use PlayerDeer's new standing icon.
Adding several new clothes and fantasy armor.
Reworking how condiments are handled.
Staging update from stable
Adds drinking and hand washing, adds a wall fountain prop.
Respriting rabbits and adding wolves.
Porting butter from Polaris and redoing cheese.
Dev update from staging
…house-update/08-07-2024
jesus fuck just kill me now. i made it compile but aurora cooking needs to be torn out and redone entirely once upstream has cooking heat mechanics in. the food is good the code is not |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Things fell behind a bit because I was waiting on the sprite accessory rework to get in. This means that most of our ear/tail code is upstream now! Unfortunately this also means ear/tail prefs are reset because I'm too lazy to write a migration since we haven't even officially launched.