Compare commits

base: triple-aaa-games:1f28cc9db9fd817a475083b26983ec6c14e2ed14

Branches Tags

triple-aaa-games:master

triple-aaa-games:final-submission

triple-aaa-games:DialogueSystemMerge

triple-aaa-games:v1.0.0

...

compare: triple-aaa-games:f35d02dde62c49f570db88ee1ddf05e8caf91d25

Branches Tags

triple-aaa-games:final-submission

triple-aaa-games:master

triple-aaa-games:DialogueSystemMerge

triple-aaa-games:v1.0.0

3 Commits

1f28cc9db9 ... f35d02dde6

Author	SHA1	Message	Date
Alan O'Cull	f35d02dde6	Implement flying and shock animations	2024-04-03 13:18:04 -04:00
Alan O'Cull	d27979f102	Implement death and critical hit animations into ThirdPersonCharacter blueprint	2024-04-03 12:25:53 -04:00
Alan O'Cull	1133370de6	Reimport and update animations	2024-04-03 12:25:31 -04:00

73 changed files with 165 additions and 108 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Expand all files Collapse all files

BIN

Content/Blueprints/Enemys/BP_BossEnemy.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/Enemys/CharacterEnemies/BP_Enemy_Character.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/Player/BP_ThirdPersonCharacter.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/Infantry/ABP_Infantry_Base.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/Infantry/Animations/anims_infantry_alan_skeleton_infantry_basis.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/Infantry/Animations/anims_infantry_alan_skeleton_infantry_electrocute.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/Infantry/Animations/anims_infantry_shelby_skeleton_infantry_Elie_backwards.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/Infantry/Animations/anims_infantry_shelby_skeleton_infantry_Elite_forward.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/Infantry/Animations/anims_infantry_shelby_skeleton_infantry_Elite_idle.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/Infantry/Animations/anims_infantry_shelby_skeleton_infantry_Elite_left_strafe.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/Infantry/Animations/anims_infantry_shelby_skeleton_infantry_Elite_right_strafe.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/Infantry/Animations/anims_infantry_shelby_skeleton_infantry_Range_L_flinch.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/Infantry/Animations/anims_infantry_shelby_skeleton_infantry_Range_R_flinch.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/Infantry/Animations/anims_infantry_shelby_skeleton_infantry_Range_back_flinch.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/Infantry/Animations/anims_infantry_shelby_skeleton_infantry_Range_chest_flinch.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/Infantry/Animations/anims_infantry_shelby_skeleton_infantry_anim_aiming_idle.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/Infantry/Animations/anims_infantry_shelby_skeleton_infantry_anim_elite_grenade.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/Infantry/Animations/anims_infantry_shelby_skeleton_infantry_anim_fall.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/Infantry/Animations/anims_infantry_shelby_skeleton_infantry_anim_idle.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/Infantry/Animations/anims_infantry_shelby_skeleton_infantry_anim_rocket_atk.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/Infantry/Animations/anims_infantry_shelby_skeleton_infantry_anim_run.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/Infantry/Animations/anims_infantry_shelby_skeleton_infantry_anim_run_001.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/Infantry/Animations/anims_infantry_shelby_skeleton_infantry_anim_shoot_atk.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/Infantry/Animations/anims_infantry_shelby_skeleton_infantry_anim_walk.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/Infantry/Animations/anims_infantry_tommy_skeleton_infantry_attack_var1.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/Infantry/Animations/anims_infantry_tommy_skeleton_infantry_attack_var2.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/Infantry/Animations/anims_infantry_tommy_skeleton_infantry_fall.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/Infantry/Animations/anims_infantry_tommy_skeleton_infantry_flinch_L_behind.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/Infantry/Animations/anims_infantry_tommy_skeleton_infantry_flinch_L_hip.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/Infantry/Animations/anims_infantry_tommy_skeleton_infantry_flinch_L_shoulder.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/Infantry/Animations/anims_infantry_tommy_skeleton_infantry_flinch_R_behind.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/Infantry/Animations/anims_infantry_tommy_skeleton_infantry_flinch_R_hip.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/Infantry/Animations/anims_infantry_tommy_skeleton_infantry_flinch_R_shoulder.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/Infantry/Animations/anims_infantry_tommy_skeleton_infantry_idle.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/Infantry/Animations/anims_infantry_tommy_skeleton_infantry_idle_fly.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/Infantry/Animations/anims_infantry_tommy_skeleton_infantry_mid_attack_var.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/Infantry/Animations/anims_infantry_tommy_skeleton_infantry_run.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/Infantry/Animations/anims_infantry_tommy_skeleton_infantry_walk.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/Insurrectionist/ABP_Insurrectionist.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/Insurrectionist/Animations/anims_insurrectionist_shelby_skeleton_insurrectionist_CUBE_mantle.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/Insurrectionist/Animations/anims_insurrectionist_shelby_skeleton_insurrectionist_anim_H_aerial.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/Insurrectionist/Animations/anims_insurrectionist_shelby_skeleton_insurrectionist_anim_H_atk_1.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/Insurrectionist/Animations/anims_insurrectionist_shelby_skeleton_insurrectionist_anim_L_aerial.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/Insurrectionist/Animations/anims_insurrectionist_shelby_skeleton_insurrectionist_anim_L_atk_1.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/Insurrectionist/Animations/anims_insurrectionist_shelby_skeleton_insurrectionist_anim_L_atk_2.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/Insurrectionist/Animations/anims_insurrectionist_shelby_skeleton_insurrectionist_anim_L_atk_3.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/Insurrectionist/Animations/anims_insurrectionist_shelby_skeleton_insurrectionist_anim_axe_catch.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/Insurrectionist/Animations/anims_insurrectionist_shelby_skeleton_insurrectionist_anim_axe_spin.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/Insurrectionist/Animations/anims_insurrectionist_shelby_skeleton_insurrectionist_anim_axe_throw.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/Insurrectionist/Animations/anims_insurrectionist_shelby_skeleton_insurrectionist_anim_axethrow_hold.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/Insurrectionist/Animations/anims_insurrectionist_shelby_skeleton_insurrectionist_anim_death.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/Insurrectionist/Animations/anims_insurrectionist_shelby_skeleton_insurrectionist_anim_fall_shelby.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/Insurrectionist/Animations/anims_insurrectionist_shelby_skeleton_insurrectionist_idle.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/Insurrectionist/Animations/anims_insurrectionist_shelby_skeleton_insurrectionist_mantle.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/Insurrectionist/Animations/anims_insurrectionist_tommy_skeleton_insurrectionist_Flinch_L_Hip.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/Insurrectionist/Animations/anims_insurrectionist_tommy_skeleton_insurrectionist_Flinch_L_Shoulder.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/Insurrectionist/Animations/anims_insurrectionist_tommy_skeleton_insurrectionist_Flinch_L_behind.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/Insurrectionist/Animations/anims_insurrectionist_tommy_skeleton_insurrectionist_Flinch_R_Hip.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/Insurrectionist/Animations/anims_insurrectionist_tommy_skeleton_insurrectionist_Flinch_R_Shoulder.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/Insurrectionist/Animations/anims_insurrectionist_tommy_skeleton_insurrectionist_Flinch_R_behind.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/Insurrectionist/Animations/anims_insurrectionist_tommy_skeleton_insurrectionist_anim_idle.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/Insurrectionist/Animations/anims_insurrectionist_tommy_skeleton_insurrectionist_critical_hit.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/Insurrectionist/Animations/anims_insurrectionist_tommy_skeleton_insurrectionist_dash_forward.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/Insurrectionist/Animations/anims_insurrectionist_tommy_skeleton_insurrectionist_fall.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/Insurrectionist/Animations/anims_insurrectionist_tommy_skeleton_insurrectionist_grapple_reel.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/Insurrectionist/Animations/anims_insurrectionist_tommy_skeleton_insurrectionist_jump.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/Insurrectionist/Animations/anims_insurrectionist_tommy_skeleton_insurrectionist_land.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/Insurrectionist/Animations/anims_insurrectionist_tommy_skeleton_insurrectionist_run_forward.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/Insurrectionist/Animations/anims_insurrectionist_tommy_skeleton_insurrectionist_strafe_left.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/Insurrectionist/Animations/anims_insurrectionist_tommy_skeleton_insurrectionist_strafe_right.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/Insurrectionist/Meshes/SK_Insurrectionist.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Characters/Insurrectionist/Montages/MONT_Insurrectionist_CriticalHit.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/Insurrectionist/Montages/MONT_Insurrectionist_Death.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.