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

Carrying - Enhance carrying, including dragging and loading casualties in vehicles #166

Open
wants to merge 8 commits into
base: core/animation-helper
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
BaseSource {
AnimSetTemplate "{2255EA04D2FD8565}Assets/Helpers/Workspace/ACE_AnimationHelperCompartment.ast"
AnimSetInstances {
"{4229AB2F2BCC9AD6}Assets/Helpers/Workspace/ACE_Carrying_Carried.asi"
"{79AB94DEA9896020}Assets/Helpers/Workspace/ACE_Carrying_Dragged.asi"
}
AnimGraph "{30A78C04E5385196}Assets/Helpers/Workspace/ACE_AnimationHelperCompartment.agr"
PreviewModels {
AnimSrcWorkspacePreviewModel "{622AE496C2CA9A82}" {
Model "{7297BDBDE223627F}Assets/Characters/Animation/AnimTestChar_USSR_01.xob"
}
}
AudioTesting AnimSrcWorkspaceAudioTesting "{61D1397096266D07}" {
}
AttachmentTesting AnimSrcWorkspaceAttachmentTesting "{61D1397096266D18}" {
}
IkTesting AnimSrcWorkspaceIkTesting "{61D1397096266D09}" {
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
MetaFileClass {
Name "{8DA4AA9146C29FF9}Prefabs/Helpers/ACE_Carrying_HelperCompartment.aw"
Name "{A10C278F23804320}Assets/Helpers/Workspace/ACE_AnimationHelperCompartment.aw"
Configurations {
AnimWorkspaceResourceClass PC {
}
Expand Down
Binary file not shown.
16 changes: 16 additions & 0 deletions addons/carrying/Assets/Helpers/Workspace/ACE_Carrying_Carried.asi
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
AnimSetInstanceSource "{64AB46D2DA3098FB}" {
Template "{2255EA04D2FD8565}Assets/Helpers/Workspace/ACE_AnimationHelperCompartment.ast"
Lines {
AnimSetInstanceSource_Line "Animation.Default.In" {
Resource "{F8867C8BA7155302}Assets/Helpers/Workspace/p_carried_in.anm"
}
AnimSetInstanceSource_Line "Animation.Default.Loop" {
Resource "{7DF9F463FB32FBBE}Assets/Helpers/Workspace/p_carried_loop.anm"
}
AnimSetInstanceSource_Line "Animation.Default.Out" {
Resource "{16F241A251F33FB3}Assets/Helpers/Workspace/p_carried_out.anm"
}
}
RBF AnimSetInstanceSourceRBFArray "{64AB46D1DF6B2A62}" {
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
MetaFileClass {
Name "{82255803EF1CA1D8}Prefabs/workspaces/ACE_Carrying_HelperCompartment.asi"
Name "{4229AB2F2BCC9AD6}Assets/Helpers/Workspace/ACE_Carrying_Carried.asi"
Configurations {
AnimSetInstanceResourceClass PC {
}
Expand Down
16 changes: 16 additions & 0 deletions addons/carrying/Assets/Helpers/Workspace/ACE_Carrying_Dragged.asi
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
AnimSetInstanceSource "{64AB46D1D623C15C}" {
Template "{2255EA04D2FD8565}Assets/Helpers/Workspace/ACE_AnimationHelperCompartment.ast"
Lines {
AnimSetInstanceSource_Line "Animation.Default.In" {
Resource "{A525ECB0D58860C7}Assets/Helpers/Workspace/p_dragged_in.anm"
}
AnimSetInstanceSource_Line "Animation.Default.Loop" {
Resource "{4ADB086D48F43C8A}Assets/Helpers/Workspace/p_dragged_loop.anm"
}
AnimSetInstanceSource_Line "Animation.Default.Out" {
Resource "{90FF4B1E0D605D81}Assets/Helpers/Workspace/p_dragged_out.anm"
}
}
RBF AnimSetInstanceSourceRBFArray "{64AB57252FE903ED}" {
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
MetaFileClass {
Name "{79AB94DEA9896020}Assets/Helpers/Workspace/ACE_Carrying_Dragged.asi"
Configurations {
AnimSetInstanceResourceClass PC {
}
AnimSetInstanceResourceClass XBOX_ONE : PC {
}
AnimSetInstanceResourceClass XBOX_SERIES : PC {
}
AnimSetInstanceResourceClass PS4 : PC {
}
AnimSetInstanceResourceClass PS5 : PC {
}
AnimSetInstanceResourceClass HEADLESS : PC {
}
}
}
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
MetaFileClass {
Name "{982832E0FF63F1EB}anims/InjuredCarry/p_erc_pose_injuredcarry.anm"
Name "{F8867C8BA7155302}Assets/Helpers/Workspace/p_carried_in.anm"
Configurations {
TXAResourceClass PC {
}
Expand All @@ -9,6 +9,8 @@ MetaFileClass {
}
TXAResourceClass PS4 : PC {
}
TXAResourceClass PS5 : PC {
}
TXAResourceClass HEADLESS : PC {
}
}
Expand Down
Loading