Skip to content

[MTT-8908] Feat: Adding PigChef character and necessary animations #205

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.

Sign up for GitHub

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

Merged
merged 55 commits into from
Aug 22, 2024
Merged

[MTT-8908] Feat: Adding PigChef character and necessary animations #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
00e06b9
import PigChef plus dependencies, deleted scripts, WIP cleanup PigChe…
Elfi0Kuhndorf Jul 29, 2024
07550e2
removed unnecessary assets, adjusted AnimatorController for PigChef, …
Elfi0Kuhndorf Jul 29, 2024
c37f4e4
feat: adjusted Animator settings (adding parameters and states), crea…
Elfi0Kuhndorf Jul 29, 2024
c8c4625
added: pickup animation
Elfi0Kuhndorf Jul 29, 2024
4d95cb0
adding source animation files
davehunt-unity Jul 30, 2024
1677678
Updated pickup animation
davehunt-unity Jul 30, 2024
7285cf9
animation update
davehunt-unity Jul 30, 2024
c01bc81
Added: set up pickup functionality with fixedjoint, added PickUpItem …
Elfi0Kuhndorf Jul 30, 2024
009fd91
added ThirdPersonRBController script
Elfi0Kuhndorf Jul 30, 2024
579917c
Updates to prop carrying
davehunt-unity Jul 30, 2024
3334b02
removed: cloudproject link
Elfi0Kuhndorf Jul 31, 2024
5ac3fc8
added throw animation
davehunt-unity Jul 31, 2024
e3cc42e
Merge branch 'feat/distributed-athority-sample/protagonist-animations…
davehunt-unity Jul 31, 2024
9427f98
walk and run animation updates
davehunt-unity Jul 31, 2024
e95506e
animation update
davehunt-unity Jul 31, 2024
b83a2ef
feat: Added carry, drop and throw functionality, adjusted idle animat…
Elfi0Kuhndorf Jul 31, 2024
f45921a
adjusting rotations and positions of pottery hand locations
Elfi0Kuhndorf Jul 31, 2024
5d872b5
animation updates
davehunt-unity Jul 31, 2024
f571e6d
fixed animator bug with throw not playing and polished walk and run a…
davehunt-unity Jul 31, 2024
34fea7d
adjusted colliders from items, angle of pickup and pickup collider
Elfi0Kuhndorf Aug 1, 2024
c7355a4
animation updates for carrying and throwing, AnimatorController state…
davehunt-unity Aug 1, 2024
abb582c
Merge branch 'feat/distributed-athority-sample/protagonist-animations…
davehunt-unity Aug 1, 2024
c7822b2
pottery prefab update
davehunt-unity Aug 1, 2024
7b41c1b
created AnimationEvent for ThrowAction
Elfi0Kuhndorf Aug 1, 2024
0b0a726
chest prefab updates
davehunt-unity Aug 1, 2024
2da65d7
added PickupLocation to PigChef prefab, adjusted throw logic to enabl…
Elfi0Kuhndorf Aug 8, 2024
eba67f6
Animation clip updates and Animator Controller updates for throwing o…
davehunt-unity Aug 8, 2024
56c5228
face animation fixes
davehunt-unity Aug 8, 2024
c88a731
animation polish
davehunt-unity Aug 8, 2024
9689c6a
deleting unnecessary transition in controller, slight controller scri…
Elfi0Kuhndorf Aug 8, 2024
f922150
fixing throw force proportional to heldTime
Elfi0Kuhndorf Aug 8, 2024
8bb7f59
animation polish
davehunt-unity Aug 8, 2024
7f8ed45
fix: cleaned up script and added dead zone to remove unwanted auto ro…
Elfi0Kuhndorf Aug 9, 2024
b23f629
removed unneeded extra idle layer
Elfi0Kuhndorf Aug 9, 2024
4fefc30
fixed transition conditions
davehunt-unity Aug 9, 2024
61f6d47
added groundLayer
Elfi0Kuhndorf Aug 9, 2024
299598c
Merge branch 'feat/distributed-athority-sample/protagonist-animations…
Elfi0Kuhndorf Aug 9, 2024
86d821e
removed debugs and adjusted dead zone value
Elfi0Kuhndorf Aug 9, 2024
bf00b32
animator controller updates
davehunt-unity Aug 9, 2024
184248d
fixed the problem where jump detached the hands from the carry object
davehunt-unity Aug 9, 2024
678abe8
deleting unused assets and changing asset location of CarryableObject…
Elfi0Kuhndorf Aug 9, 2024
e247db2
Merge branch 'develop' into feat/distributed-athority-sample/protagon…
Elfi0Kuhndorf Aug 12, 2024
94503b0
set Input in Player settings to both input systems
Elfi0Kuhndorf Aug 12, 2024
e606b00
Merge branch 'develop' into feat/distributed-athority-sample/protagon…
Elfi0Kuhndorf Aug 12, 2024
9f2393b
reset PlayModeOptions and TimeManager to default, removed .vsconfig
Elfi0Kuhndorf Aug 14, 2024
def63b1
Removed: unneeded cane and chick related assets
Elfi0Kuhndorf Aug 14, 2024
bda4af6
Added: created Testing scene folder and moved CharacterTest over
Elfi0Kuhndorf Aug 14, 2024
4b8d8a2
Test: creation a new controller to fix errors
Elfi0Kuhndorf Aug 16, 2024
6d591df
Changed: delete old controller, fixed + changed name of new animation…
Elfi0Kuhndorf Aug 16, 2024
9705cf5
moved ThirdPersonRBController into temp folder and removed audio files
Elfi0Kuhndorf Aug 16, 2024
19540fa
Merge branch 'develop' into feat/distributed-athority-sample/protagon…
Elfi0Kuhndorf Aug 16, 2024
f1205b2
reset time and project settings
Elfi0Kuhndorf Aug 16, 2024
286cf53
Fixed: inconsistent naming
Elfi0Kuhndorf Aug 19, 2024
a0c9305
fixed object name (have to take name from original asset which cannot…
Elfi0Kuhndorf Aug 21, 2024
71e8664
Merge branch 'develop' into feat/distributed-athority-sample/protagon…
Elfi0Kuhndorf Aug 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Experimental/DistributedAuthoritySample/Assets/Art/Characters.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Experimental/DistributedAuthoritySample/Assets/Art/Characters/PigChef.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added ...uthoritySample/Assets/Art/Characters/PigChef/.mayaSwatches/eyes_base_color.png_hcm.swatch
View file
Open in desktop
Binary file not shown.
Binary file added ...thoritySample/Assets/Art/Characters/PigChef/.mayaSwatches/mouth_base_color.png_hcm.swatch
View file
Open in desktop
Binary file not shown.
8 changes: 8 additions & 0 deletions Experimental/DistributedAuthoritySample/Assets/Art/Characters/PigChef/Animation.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added ...e/Assets/Art/Characters/PigChef/Animation/.Working/.mayaSwatches/PIgChef_Idle.ma.swatches
View file
Open in desktop
Binary file not shown.
Binary file added ...sets/Art/Characters/PigChef/Animation/.Working/.mayaSwatches/PigChef_Idle_new.ma.swatches
View file
Open in desktop
Binary file not shown.
Binary file added ...Assets/Art/Characters/PigChef/Animation/.Working/.mayaSwatches/PigChef_Pickup.ma.swatches
View file
Open in desktop
Binary file not shown.
160,918 changes: 160,918 additions & 0 deletions ...stributedAuthoritySample/Assets/Art/Characters/PigChef/Animation/.Working/PIgChef_Idle.ma
View file
Open in desktop

Large diffs are not rendered by default.

136,695 changes: 136,695 additions & 0 deletions ...edAuthoritySample/Assets/Art/Characters/PigChef/Animation/.Working/PIgChef_Idle_export.ma
View file
Open in desktop

Large diffs are not rendered by default.

42,631 changes: 42,631 additions & 0 deletions ...butedAuthoritySample/Assets/Art/Characters/PigChef/Animation/.Working/PigChef_Idle_new.ma
View file
Open in desktop

Large diffs are not rendered by default.

50,079 changes: 50,079 additions & 0 deletions ...ributedAuthoritySample/Assets/Art/Characters/PigChef/Animation/.Working/PigChef_Pickup.ma
View file
Open in desktop

Large diffs are not rendered by default.

25,658 changes: 25,658 additions & 0 deletions ...AuthoritySample/Assets/Art/Characters/PigChef/Animation/.Working/PigChef_Pickup_export.ma
View file
Open in desktop

Large diffs are not rendered by default.

50,336 changes: 50,336 additions & 0 deletions ...tributedAuthoritySample/Assets/Art/Characters/PigChef/Animation/.Working/PigChef_Throw.ma
View file
Open in desktop

Large diffs are not rendered by default.

50,373 changes: 50,373 additions & 0 deletions ...oritySample/Assets/Art/Characters/PigChef/Animation/.Working/PigChef_ThrowAnticipation.ma
View file
Open in desktop

Large diffs are not rendered by default.

25,583 changes: 25,583 additions & 0 deletions ...mple/Assets/Art/Characters/PigChef/Animation/.Working/PigChef_ThrowAnticipation_export.ma
View file
Open in desktop

Large diffs are not rendered by default.

25,955 changes: 25,955 additions & 0 deletions ...dAuthoritySample/Assets/Art/Characters/PigChef/Animation/.Working/PigChef_Throw_export.ma
View file
Open in desktop

Large diffs are not rendered by default.

33,964 changes: 33,964 additions & 0 deletions ...uthoritySample/Assets/Art/Characters/PigChef/Animation/PIgChef_ThrowAnticipation_Rig.anim
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions ...itySample/Assets/Art/Characters/PigChef/Animation/PIgChef_ThrowAnticipation_Rig.anim.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading