Skip to content

feat: Distributed Authority Sample - interactions animation integration [MTT-9016] #219

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 21 commits into from
Sep 4, 2024
Merged

feat: Distributed Authority Sample - interactions animation integration [MTT-9016] #219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
3c2d04f
asmdefs generated with dependencies mapped
fernando-cortez Aug 14, 2024
ad2404d
one unnecessary dependency removed
fernando-cortez Aug 14, 2024
c7787f2
renaming asmdefs & adding input assemblyinfo
fernando-cortez Aug 14, 2024
609c59d
avatar-side pickup/toss of pickupable object
fernando-cortez Aug 15, 2024
d7e70f8
adding a pickupable object, EnvironmentTransform, to scene with a spa…
fernando-cortez Aug 15, 2024
301856b
adding explicitly inputsystem to player assembly
fernando-cortez Aug 15, 2024
57d5f19
merge feat/distributed-authority-sample/assembly-definitions
fernando-cortez Aug 15, 2024
3884131
Merge branch 'develop' into feat/distributed-authority-sample/avatar-…
fernando-cortez Aug 15, 2024
985d6d6
destructible object created, physics scripts imported
fernando-cortez Aug 21, 2024
5f12e5c
phyics base classes refactor & damage dealt to DestructibleObject
fernando-cortez Aug 26, 2024
726d1c4
adding SO for player movement
fernando-cortez Aug 26, 2024
d18cff2
merge develop
fernando-cortez Aug 26, 2024
32b1160
prefabs updated post-merge, debug log removed
fernando-cortez Aug 26, 2024
b1c1dae
creating AvatarAnimator to integrate locomotion animations, Market sc…
fernando-cortez Aug 27, 2024
cb6ef02
merge develop
fernando-cortez Aug 30, 2024
a3d55ac
WIP - animations invoked for pickup, drop, throw
fernando-cortez Sep 3, 2024
2350f4a
sending sprint input to animator
fernando-cortez Sep 3, 2024
f4aaa3e
Merge branch 'develop' into feat/distributed-authority-sample/locomot…
fernando-cortez Sep 3, 2024
f976d14
Merge branch 'feat/distributed-authority-sample/locomotion-animation-…
fernando-cortez Sep 3, 2024
ba83dd8
hand bone position updated on all instances, handling despawn & owner…
fernando-cortez Sep 3, 2024
8a9eedb
merge develop
fernando-cortez Sep 4, 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
2 changes: 1 addition & 1 deletion Experimental/DistributedAuthoritySample/Assets/NetworkPrefabs.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ MonoBehaviour:
IsDefault: 1
List:
- Override: 0
Prefab: {fileID: 893974733110552042, guid: 1c6ec0a7b92244c349d83ba9b4a1c8ab, type: 3}
Prefab: {fileID: 291901203331741842, guid: 8ffbe97c92069e545b7875b5bfbdb80b, type: 3}
SourcePrefabToOverride: {fileID: 0}
SourceHashToOverride: 0
OverridingTargetPrefab: {fileID: 0}
107 changes: 87 additions & 20 deletions Experimental/DistributedAuthoritySample/Assets/Prefabs/Avatar.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Actions: {fileID: -944628639613478452, guid: dcd1b4eb76b964f40afe6c0a3ca65c82, type: 3}
m_Actions: {fileID: -944628639613478452, guid: dcd1b4eb76b964f40afe6c0a3ca65c82,
type: 3}
m_NotificationBehavior: 0
m_UIInputModule: {fileID: 0}
m_DeviceLostEvent:
Expand Down Expand Up @@ -193,7 +194,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 7e9f71718dd134b14b300e378e98c718, type: 3}
m_Name:
m_EditorClassIdentifier:
m_InteractActionReference: {fileID: 1781555164194001046, guid: dcd1b4eb76b964f40afe6c0a3ca65c82, type: 3}
m_InteractActionReference: {fileID: 1781555164194001046, guid: dcd1b4eb76b964f40afe6c0a3ca65c82,
type: 3}
Move: {x: 0, y: 0}
Look: {x: 0, y: 0}
Sprint: 0
Expand All @@ -212,9 +214,14 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: b47efef44cef74d9ca00f4913607f988, type: 3}
m_Name:
m_EditorClassIdentifier:
m_AvatarNetworkAnimator: {fileID: 7543523986693376117}
m_AnimationEventRelayer: {fileID: 3050276823525430539}
m_MainCollider: {fileID: 36137897785899347}
m_AvatarInputs: {fileID: 8197190117666738524}
m_NetworkRigidbody: {fileID: -8100831418301897270}
m_PickupLocFixedJoint: {fileID: 3522541554063944713}
m_PickupLocChild: {fileID: 1191881578848548316}
m_LeftHandContact: {fileID: 8336303498504233401}
m_RightHandContact: {fileID: 4756851392954789958}
m_HoldTransform: {fileID: 3820763517226122587}
m_InteractCollider: {fileID: 4881592427634173612}
m_MinTossForce: 500
Expand All @@ -232,7 +239,8 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Rigidbody: {fileID: 4745766379562620470}
m_PhysicsPlayerControllerSettings: {fileID: 11400000, guid: 1dd99ce80f3e54d03b20bf78d6ff2a40, type: 2}
m_PhysicsPlayerControllerSettings: {fileID: 11400000, guid: 1dd99ce80f3e54d03b20bf78d6ff2a40,
type: 2}
--- !u!114 &7543523986693376117
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -352,51 +360,63 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 378099091213283077}
m_Modifications:
- target: {fileID: 4653874547743315895, guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3}
- target: {fileID: 4653874547743315895, guid: d1d89ad5a0ed99e499fe819ca87ae4c8,
type: 3}
propertyPath: m_ProvidesContacts
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8353930243667998089, guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3}
- target: {fileID: 8353930243667998089, guid: d1d89ad5a0ed99e499fe819ca87ae4c8,
type: 3}
propertyPath: m_Name
value: PigChef_RigSetup
objectReference: {fileID: 0}
- target: {fileID: 8693301772691271475, guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3}
- target: {fileID: 8693301772691271475, guid: d1d89ad5a0ed99e499fe819ca87ae4c8,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8693301772691271475, guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3}
- target: {fileID: 8693301772691271475, guid: d1d89ad5a0ed99e499fe819ca87ae4c8,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8693301772691271475, guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3}
- target: {fileID: 8693301772691271475, guid: d1d89ad5a0ed99e499fe819ca87ae4c8,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8693301772691271475, guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3}
- target: {fileID: 8693301772691271475, guid: d1d89ad5a0ed99e499fe819ca87ae4c8,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8693301772691271475, guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3}
- target: {fileID: 8693301772691271475, guid: d1d89ad5a0ed99e499fe819ca87ae4c8,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8693301772691271475, guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3}
- target: {fileID: 8693301772691271475, guid: d1d89ad5a0ed99e499fe819ca87ae4c8,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8693301772691271475, guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3}
- target: {fileID: 8693301772691271475, guid: d1d89ad5a0ed99e499fe819ca87ae4c8,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8693301772691271475, guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3}
- target: {fileID: 8693301772691271475, guid: d1d89ad5a0ed99e499fe819ca87ae4c8,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8693301772691271475, guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3}
- target: {fileID: 8693301772691271475, guid: d1d89ad5a0ed99e499fe819ca87ae4c8,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8693301772691271475, guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3}
- target: {fileID: 8693301772691271475, guid: d1d89ad5a0ed99e499fe819ca87ae4c8,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
Expand All @@ -405,20 +425,67 @@ PrefabInstance:
- {fileID: 363683212551861616, guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3}
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_AddedComponents: [{targetCorrespondingSourceObject: {fileID: 8353930243667998089,
guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3}, insertIndex: -1, addedObject: {
fileID: 3050276823525430539}}]
m_SourcePrefab: {fileID: 100100000, guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3}
--- !u!136 &36137897785899347 stripped
CapsuleCollider:
m_CorrespondingSourceObject: {fileID: 4653874547743315895, guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3}
m_CorrespondingSourceObject: {fileID: 4653874547743315895, guid: d1d89ad5a0ed99e499fe819ca87ae4c8,
type: 3}
m_PrefabInstance: {fileID: 4617738848981348068}
m_PrefabAsset: {fileID: 0}
--- !u!4 &4085133075368149463 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 8693301772691271475, guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3}
m_CorrespondingSourceObject: {fileID: 8693301772691271475, guid: d1d89ad5a0ed99e499fe819ca87ae4c8,
type: 3}
m_PrefabInstance: {fileID: 4617738848981348068}
m_PrefabAsset: {fileID: 0}
--- !u!95 &7006295767383679619 stripped
Animator:
m_CorrespondingSourceObject: {fileID: 2391092429025954919, guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3}
m_CorrespondingSourceObject: {fileID: 2391092429025954919, guid: d1d89ad5a0ed99e499fe819ca87ae4c8,
type: 3}
m_PrefabInstance: {fileID: 4617738848981348068}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1191881578848548316 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 5809618227429677880, guid: d1d89ad5a0ed99e499fe819ca87ae4c8,
type: 3}
m_PrefabInstance: {fileID: 4617738848981348068}
m_PrefabAsset: {fileID: 0}
--- !u!138 &3522541554063944713 stripped
FixedJoint:
m_CorrespondingSourceObject: {fileID: 8139998925785744109, guid: d1d89ad5a0ed99e499fe819ca87ae4c8,
type: 3}
m_PrefabInstance: {fileID: 4617738848981348068}
m_PrefabAsset: {fileID: 0}
--- !u!1 &3745480105526614893 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 8353930243667998089, guid: d1d89ad5a0ed99e499fe819ca87ae4c8,
type: 3}
m_PrefabInstance: {fileID: 4617738848981348068}
m_PrefabAsset: {fileID: 0}
--- !u!114 &3050276823525430539
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3745480105526614893}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4f398d1c0abd4744eb035893ea7619cf, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &4756851392954789958 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 150371580926074530, guid: d1d89ad5a0ed99e499fe819ca87ae4c8,
type: 3}
m_PrefabInstance: {fileID: 4617738848981348068}
m_PrefabAsset: {fileID: 0}
--- !u!1 &8336303498504233401 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 3721660875845472093, guid: d1d89ad5a0ed99e499fe819ca87ae4c8,
type: 3}
m_PrefabInstance: {fileID: 4617738848981348068}
m_PrefabAsset: {fileID: 0}
Loading