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

Feat: Pickup Ingredient Animation #70

Open
wants to merge 59 commits into
base: develop
Choose a base branch
from

Conversation

jilfranco-unity
Copy link
Contributor

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

fernando-cortez and others added 30 commits November 2, 2022 13:36
…t/third-person-character-controller-integration
…t/third-person-character-controller-integration
…arms staying up after dropping something in a drop zone
fernando-cortez and others added 10 commits November 30, 2022 17:14
…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 fernando-cortez force-pushed the feat/third-person-character-controller-integration-IP-UI branch from 1d77288 to 62ddb88 Compare December 2, 2022 16:41
Base automatically changed from feat/third-person-character-controller-integration-IP-UI to develop December 6, 2022 19:43
@jilfranco-unity jilfranco-unity added the wontfix This will not be worked on label Dec 12, 2022
@SamuelBellomo SamuelBellomo removed their request for review June 21, 2023 00:00
@unity-cla-assistant
Copy link

unity-cla-assistant commented Mar 12, 2024

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
2 out of 3 committers have signed the CLA.

✅ fernando-cortez
✅ jilfranco-unity
❌ SamuelBellomo
You have signed the CLA already but the status is still pending? Let us recheck it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request wontfix This will not be worked on
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants