LevelBlockout, Character update

Revert "Resolve conflict"
This reverts commit cec4138768.
2023-04-29 21:18:02 +03:00 · 2023-04-29 20:51:07 +03:00 · 2023-04-29 20:47:51 +03:00
137 changed files with 36 additions and 18 deletions
--- a/Content/Characters/Mannequins/Animations/ABP_Manny.uasset
+++ b/Content/Characters/Mannequins/Animations/ABP_Manny.uasset
--- a/Content/Characters/Mannequins/Animations/ABP_Quinn.uasset
+++ b/Content/Characters/Mannequins/Animations/ABP_Quinn.uasset
--- a/Content/Characters/Mannequins/Animations/Manny/BS_MM_WalkRun.uasset
+++ b/Content/Characters/Mannequins/Animations/Manny/BS_MM_WalkRun.uasset
--- a/Content/Characters/Mannequins/Animations/Manny/MM_Fall_Loop.uasset
+++ b/Content/Characters/Mannequins/Animations/Manny/MM_Fall_Loop.uasset
--- a/Content/Characters/Mannequins/Animations/Manny/MM_Idle.uasset
+++ b/Content/Characters/Mannequins/Animations/Manny/MM_Idle.uasset
--- a/Content/Characters/Mannequins/Animations/Manny/MM_Jump.uasset
+++ b/Content/Characters/Mannequins/Animations/Manny/MM_Jump.uasset
--- a/Content/Characters/Mannequins/Animations/Manny/MM_Land.uasset
+++ b/Content/Characters/Mannequins/Animations/Manny/MM_Land.uasset
--- a/Content/Characters/Mannequins/Animations/Manny/MM_Run_Fwd.uasset
+++ b/Content/Characters/Mannequins/Animations/Manny/MM_Run_Fwd.uasset
--- a/Content/Characters/Mannequins/Animations/Manny/MM_Walk_Fwd.uasset
+++ b/Content/Characters/Mannequins/Animations/Manny/MM_Walk_Fwd.uasset
--- a/Content/Characters/Mannequins/Animations/Manny/MM_Walk_InPlace.uasset
+++ b/Content/Characters/Mannequins/Animations/Manny/MM_Walk_InPlace.uasset
--- a/Content/Characters/Mannequins/Animations/Quinn/BS_MF_Unarmed_WalkRun.uasset
+++ b/Content/Characters/Mannequins/Animations/Quinn/BS_MF_Unarmed_WalkRun.uasset
--- a/Content/Characters/Mannequins/Animations/Quinn/MF_Idle.uasset
+++ b/Content/Characters/Mannequins/Animations/Quinn/MF_Idle.uasset
--- a/Content/Characters/Mannequins/Animations/Quinn/MF_Run_Fwd.uasset
+++ b/Content/Characters/Mannequins/Animations/Quinn/MF_Run_Fwd.uasset
--- a/Content/Characters/Mannequins/Animations/Quinn/MF_Walk_Fwd.uasset
+++ b/Content/Characters/Mannequins/Animations/Quinn/MF_Walk_Fwd.uasset
--- a/Content/Characters/Mannequins/Materials/Functions/CA_Mannequin.uasset
+++ b/Content/Characters/Mannequins/Materials/Functions/CA_Mannequin.uasset
--- a/Content/Characters/Mannequins/Materials/Functions/ChromaticCurve.uasset
+++ b/Content/Characters/Mannequins/Materials/Functions/ChromaticCurve.uasset
--- a/Content/Characters/Mannequins/Materials/Functions/MF_Diffraction.uasset
+++ b/Content/Characters/Mannequins/Materials/Functions/MF_Diffraction.uasset
--- a/Content/Characters/Mannequins/Materials/Functions/MF_logo3layers.uasset
+++ b/Content/Characters/Mannequins/Materials/Functions/MF_logo3layers.uasset
--- a/Content/Characters/Mannequins/Materials/Functions/ML_BaseColorFallOff.uasset
+++ b/Content/Characters/Mannequins/Materials/Functions/ML_BaseColorFallOff.uasset
--- a/Content/Characters/Mannequins/Materials/Instances/Manny/MI_Manny_01.uasset
+++ b/Content/Characters/Mannequins/Materials/Instances/Manny/MI_Manny_01.uasset
--- a/Content/Characters/Mannequins/Materials/Instances/Manny/MI_Manny_02.uasset
+++ b/Content/Characters/Mannequins/Materials/Instances/Manny/MI_Manny_02.uasset
--- a/Content/Characters/Mannequins/Materials/Instances/Quinn/MI_Quinn_01.uasset
+++ b/Content/Characters/Mannequins/Materials/Instances/Quinn/MI_Quinn_01.uasset
--- a/Content/Characters/Mannequins/Materials/Instances/Quinn/MI_Quinn_02.uasset
+++ b/Content/Characters/Mannequins/Materials/Instances/Quinn/MI_Quinn_02.uasset
--- a/Content/Characters/Mannequins/Materials/M_Mannequin.uasset
+++ b/Content/Characters/Mannequins/Materials/M_Mannequin.uasset
--- a/Content/Characters/Mannequins/Meshes/SKM_Manny.uasset
+++ b/Content/Characters/Mannequins/Meshes/SKM_Manny.uasset
--- a/Content/Characters/Mannequins/Meshes/SKM_Manny_Simple.uasset
+++ b/Content/Characters/Mannequins/Meshes/SKM_Manny_Simple.uasset
--- a/Content/Characters/Mannequins/Meshes/SKM_Quinn.uasset
+++ b/Content/Characters/Mannequins/Meshes/SKM_Quinn.uasset
--- a/Content/Characters/Mannequins/Meshes/SKM_Quinn_Simple.uasset
+++ b/Content/Characters/Mannequins/Meshes/SKM_Quinn_Simple.uasset
--- a/Content/Characters/Mannequins/Meshes/SK_Mannequin.uasset
+++ b/Content/Characters/Mannequins/Meshes/SK_Mannequin.uasset
--- a/Content/Characters/Mannequins/Rigs/ABP_Manny_PostProcess.uasset
+++ b/Content/Characters/Mannequins/Rigs/ABP_Manny_PostProcess.uasset
--- a/Content/Characters/Mannequins/Rigs/ABP_Quinn_PostProcess.uasset
+++ b/Content/Characters/Mannequins/Rigs/ABP_Quinn_PostProcess.uasset
--- a/Content/Characters/Mannequins/Rigs/CR_Mannequin_BasicFootIK.uasset
+++ b/Content/Characters/Mannequins/Rigs/CR_Mannequin_BasicFootIK.uasset
--- a/Content/Characters/Mannequins/Rigs/CR_Mannequin_Body.uasset
+++ b/Content/Characters/Mannequins/Rigs/CR_Mannequin_Body.uasset
--- a/Content/Characters/Mannequins/Rigs/CR_Mannequin_Procedural.uasset
+++ b/Content/Characters/Mannequins/Rigs/CR_Mannequin_Procedural.uasset
--- a/Content/Characters/Mannequins/Rigs/PA_Mannequin.uasset
+++ b/Content/Characters/Mannequins/Rigs/PA_Mannequin.uasset
--- a/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_calf_l_anim.uasset
+++ b/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_calf_l_anim.uasset
--- a/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_calf_l_pose.uasset
+++ b/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_calf_l_pose.uasset
--- a/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_calf_r_anim.uasset
+++ b/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_calf_r_anim.uasset
--- a/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_calf_r_pose.uasset
+++ b/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_calf_r_pose.uasset
--- a/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_clavicle_l_anim.uasset
+++ b/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_clavicle_l_anim.uasset
--- a/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_clavicle_l_pose.uasset
+++ b/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_clavicle_l_pose.uasset
--- a/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_clavicle_r_anim.uasset
+++ b/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_clavicle_r_anim.uasset
--- a/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_clavicle_r_pose.uasset
+++ b/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_clavicle_r_pose.uasset
--- a/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_foot_l_anim.uasset
+++ b/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_foot_l_anim.uasset
--- a/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_foot_l_pose.uasset
+++ b/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_foot_l_pose.uasset
--- a/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_foot_r_anim.uasset
+++ b/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_foot_r_anim.uasset
--- a/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_foot_r_pose.uasset
+++ b/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_foot_r_pose.uasset
--- a/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_hand_l_anim.uasset
+++ b/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_hand_l_anim.uasset
--- a/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_hand_l_pose.uasset
+++ b/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_hand_l_pose.uasset
--- a/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_hand_r_anim.uasset
+++ b/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_hand_r_anim.uasset
--- a/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_hand_r_pose.uasset
+++ b/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_hand_r_pose.uasset
--- a/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_lowerarm_l_anim.uasset
+++ b/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_lowerarm_l_anim.uasset
--- a/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_lowerarm_l_pose.uasset
+++ b/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_lowerarm_l_pose.uasset
--- a/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_lowerarm_r_anim.uasset
+++ b/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_lowerarm_r_anim.uasset
--- a/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_lowerarm_r_pose.uasset
+++ b/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_lowerarm_r_pose.uasset
--- a/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_thigh_l_anim.uasset
+++ b/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_thigh_l_anim.uasset
--- a/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_thigh_l_pose.uasset
+++ b/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_thigh_l_pose.uasset
--- a/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_thigh_r_anim.uasset
+++ b/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_thigh_r_anim.uasset
--- a/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_thigh_r_pose.uasset
+++ b/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_thigh_r_pose.uasset
--- a/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_upperarm_l_anim.uasset
+++ b/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_upperarm_l_anim.uasset
--- a/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_upperarm_l_pose.uasset
+++ b/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_upperarm_l_pose.uasset
--- a/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_upperarm_r_anim.uasset
+++ b/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_upperarm_r_anim.uasset
--- a/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_upperarm_r_pose.uasset
+++ b/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_upperarm_r_pose.uasset
--- a/Content/Characters/Mannequins/Rigs/Poses/Quinn/Quinn_calf_l_anim.uasset
+++ b/Content/Characters/Mannequins/Rigs/Poses/Quinn/Quinn_calf_l_anim.uasset
--- a/Content/Characters/Mannequins/Rigs/Poses/Quinn/Quinn_calf_l_pose.uasset
+++ b/Content/Characters/Mannequins/Rigs/Poses/Quinn/Quinn_calf_l_pose.uasset
--- a/Content/Characters/Mannequins/Rigs/Poses/Quinn/Quinn_calf_r_anim.uasset
+++ b/Content/Characters/Mannequins/Rigs/Poses/Quinn/Quinn_calf_r_anim.uasset
--- a/Content/Characters/Mannequins/Rigs/Poses/Quinn/Quinn_calf_r_pose.uasset
+++ b/Content/Characters/Mannequins/Rigs/Poses/Quinn/Quinn_calf_r_pose.uasset
--- a/Content/Characters/Mannequins/Rigs/Poses/Quinn/Quinn_clavicle_l_anim.uasset
+++ b/Content/Characters/Mannequins/Rigs/Poses/Quinn/Quinn_clavicle_l_anim.uasset
--- a/Content/Characters/Mannequins/Rigs/Poses/Quinn/Quinn_clavicle_l_pose.uasset
+++ b/Content/Characters/Mannequins/Rigs/Poses/Quinn/Quinn_clavicle_l_pose.uasset
--- a/Content/Characters/Mannequins/Rigs/Poses/Quinn/Quinn_clavicle_r_anim.uasset
+++ b/Content/Characters/Mannequins/Rigs/Poses/Quinn/Quinn_clavicle_r_anim.uasset
--- a/Content/Characters/Mannequins/Rigs/Poses/Quinn/Quinn_clavicle_r_pose.uasset
+++ b/Content/Characters/Mannequins/Rigs/Poses/Quinn/Quinn_clavicle_r_pose.uasset
--- a/Content/Characters/Mannequins/Rigs/Poses/Quinn/Quinn_foot_l_anim.uasset
+++ b/Content/Characters/Mannequins/Rigs/Poses/Quinn/Quinn_foot_l_anim.uasset
--- a/Content/Characters/Mannequins/Rigs/Poses/Quinn/Quinn_foot_l_pose.uasset
+++ b/Content/Characters/Mannequins/Rigs/Poses/Quinn/Quinn_foot_l_pose.uasset
--- a/Content/Characters/Mannequins/Rigs/Poses/Quinn/Quinn_foot_r_anim.uasset
+++ b/Content/Characters/Mannequins/Rigs/Poses/Quinn/Quinn_foot_r_anim.uasset
--- a/Content/Characters/Mannequins/Rigs/Poses/Quinn/Quinn_foot_r_pose.uasset
+++ b/Content/Characters/Mannequins/Rigs/Poses/Quinn/Quinn_foot_r_pose.uasset
--- a/Content/Characters/Mannequins/Rigs/Poses/Quinn/Quinn_hand_l_anim.uasset
+++ b/Content/Characters/Mannequins/Rigs/Poses/Quinn/Quinn_hand_l_anim.uasset
--- a/Content/Characters/Mannequins/Rigs/Poses/Quinn/Quinn_hand_l_pose.uasset
+++ b/Content/Characters/Mannequins/Rigs/Poses/Quinn/Quinn_hand_l_pose.uasset
--- a/Content/Characters/Mannequins/Rigs/Poses/Quinn/Quinn_hand_r_anim.uasset
+++ b/Content/Characters/Mannequins/Rigs/Poses/Quinn/Quinn_hand_r_anim.uasset
--- a/Content/Characters/Mannequins/Rigs/Poses/Quinn/Quinn_hand_r_pose.uasset
+++ b/Content/Characters/Mannequins/Rigs/Poses/Quinn/Quinn_hand_r_pose.uasset
--- a/Content/Characters/Mannequins/Rigs/Poses/Quinn/Quinn_lowerarm_l_anim.uasset
+++ b/Content/Characters/Mannequins/Rigs/Poses/Quinn/Quinn_lowerarm_l_anim.uasset
--- a/Content/Characters/Mannequins/Rigs/Poses/Quinn/Quinn_lowerarm_l_pose.uasset
+++ b/Content/Characters/Mannequins/Rigs/Poses/Quinn/Quinn_lowerarm_l_pose.uasset
--- a/Content/Characters/Mannequins/Rigs/Poses/Quinn/Quinn_lowerarm_r_anim.uasset
+++ b/Content/Characters/Mannequins/Rigs/Poses/Quinn/Quinn_lowerarm_r_anim.uasset
--- a/Content/Characters/Mannequins/Rigs/Poses/Quinn/Quinn_lowerarm_r_pose.uasset
+++ b/Content/Characters/Mannequins/Rigs/Poses/Quinn/Quinn_lowerarm_r_pose.uasset
--- a/Content/Characters/Mannequins/Rigs/Poses/Quinn/Quinn_thigh_l_anim.uasset
+++ b/Content/Characters/Mannequins/Rigs/Poses/Quinn/Quinn_thigh_l_anim.uasset
--- a/Content/Characters/Mannequins/Rigs/Poses/Quinn/Quinn_thigh_l_pose.uasset
+++ b/Content/Characters/Mannequins/Rigs/Poses/Quinn/Quinn_thigh_l_pose.uasset
--- a/Content/Characters/Mannequins/Rigs/Poses/Quinn/Quinn_thigh_r_anim.uasset
+++ b/Content/Characters/Mannequins/Rigs/Poses/Quinn/Quinn_thigh_r_anim.uasset
--- a/Content/Characters/Mannequins/Rigs/Poses/Quinn/Quinn_thigh_r_pose.uasset
+++ b/Content/Characters/Mannequins/Rigs/Poses/Quinn/Quinn_thigh_r_pose.uasset
--- a/Content/Characters/Mannequins/Rigs/Poses/Quinn/Quinn_upperarm_l_anim.uasset
+++ b/Content/Characters/Mannequins/Rigs/Poses/Quinn/Quinn_upperarm_l_anim.uasset
--- a/Content/Characters/Mannequins/Rigs/Poses/Quinn/Quinn_upperarm_l_pose.uasset
+++ b/Content/Characters/Mannequins/Rigs/Poses/Quinn/Quinn_upperarm_l_pose.uasset
--- a/Content/Characters/Mannequins/Rigs/Poses/Quinn/Quinn_upperarm_r_anim.uasset
+++ b/Content/Characters/Mannequins/Rigs/Poses/Quinn/Quinn_upperarm_r_anim.uasset
--- a/Content/Characters/Mannequins/Rigs/Poses/Quinn/Quinn_upperarm_r_pose.uasset
+++ b/Content/Characters/Mannequins/Rigs/Poses/Quinn/Quinn_upperarm_r_pose.uasset
--- a/Content/Characters/Mannequins/Textures/Manny/T_Manny_01_ASAOPMASK_MSK.uasset
+++ b/Content/Characters/Mannequins/Textures/Manny/T_Manny_01_ASAOPMASK_MSK.uasset
--- a/Content/Characters/Mannequins/Textures/Manny/T_Manny_01_BN.uasset
+++ b/Content/Characters/Mannequins/Textures/Manny/T_Manny_01_BN.uasset
--- a/Content/Characters/Mannequins/Textures/Manny/T_Manny_01_CCRCCPlastic_MSK.uasset
+++ b/Content/Characters/Mannequins/Textures/Manny/T_Manny_01_CCRCCPlastic_MSK.uasset
--- a/Content/Characters/Mannequins/Textures/Manny/T_Manny_01_D.uasset
+++ b/Content/Characters/Mannequins/Textures/Manny/T_Manny_01_D.uasset
--- a/Content/Characters/Mannequins/Textures/Manny/T_Manny_01_MSR_MSK.uasset
+++ b/Content/Characters/Mannequins/Textures/Manny/T_Manny_01_MSR_MSK.uasset
--- a/Content/Characters/Mannequins/Textures/Manny/T_Manny_01_N.uasset
+++ b/Content/Characters/Mannequins/Textures/Manny/T_Manny_01_N.uasset
--- a/Content/Characters/Mannequins/Textures/Manny/T_Manny_01_Tan.uasset
+++ b/Content/Characters/Mannequins/Textures/Manny/T_Manny_01_Tan.uasset
--- a/Content/Characters/Mannequins/Textures/Manny/T_Manny_02_ASAOPMASK_MSK.uasset
+++ b/Content/Characters/Mannequins/Textures/Manny/T_Manny_02_ASAOPMASK_MSK.uasset
--- a/Content/Characters/Mannequins/Textures/Manny/T_Manny_02_BN.uasset
+++ b/Content/Characters/Mannequins/Textures/Manny/T_Manny_02_BN.uasset
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
$DESKTOP-7F3F9NR\admin$ DESKTOP-7F3F9NR\admin	15617aca89	LevelBlockout, Character update	2023-04-29 21:18:02 +03:00
$DESKTOP-1SC3M4D\admin$ DESKTOP-1SC3M4D\admin	138cd90990	Revert "Resolve conflict" This reverts commit `cec4138768`.	2023-04-29 20:51:07 +03:00
$DESKTOP-1SC3M4D\admin$ DESKTOP-1SC3M4D\admin	cec4138768	Resolve conflict	2023-04-29 20:47:51 +03:00