Feat: Pickup Ingredient Animation #70
Open
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
…haracter-controller-assets
…t/third-person-character-controller-integration
…haracter-controller-assets
…t/third-person-character-controller-integration
…arms staying up after dropping something in a drop zone
…t disabled on out of focus devices)
…I' into feat/pickup-animation # Conflicts: # Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Scripts/ThirdPersonController.cs
…I' into feat/pickup-animation # Conflicts: # Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Character/Animations/StarterAssetsThirdPerson.controller # Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Scripts/ThirdPersonController.cs
…I' into feat/pickup-animation # Conflicts: # Basic/ClientDriven/Assets/Scripts/Dropzone.cs
fernando-cortez
force-pushed
the
feat/third-person-character-controller-integration-IP-UI
branch
from
1d77288
to
62ddb88
Compare
…I' into feat/pickup-animation # Conflicts: # Basic/ClientDriven/Assets/Scenes/Bootstrap.unity
Base automatically changed from
feat/third-person-character-controller-integration-IP-UI
to
develop
December 6, 2022 19:43
# Conflicts: # Basic/ClientDriven/Assets/Scripts/ClientPlayerMove.cs # Basic/ClientDriven/Packages/manifest.json # Basic/ClientDriven/Packages/packages-lock.json
…g off an ingredient
|
|
|
@jilfranco-unity @fernando-cortez can we close this PR? |
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.
This PR is for hooking up a pick up animation for when the players pick up ingredients. It's done procedurally by blending a pick up pose together with the locomotion animations using different animation masks. There are also some minor code changes to hook things up (which will definitely need to be reviewed)
Here's a preview! I've made the ingredients very small so you can see what's happening, but the animation is meant to match with the new round ingredients that will be merged in with the big art PR.
2022-11-30.16-42-44.mp4