Compare commits

base: triple-aaa-games:fc18d3f2eae5359909359db9a4c64ba240a39654

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:842b20eebc8ee8020eaa7891f0564e07736a8401

Branches Tags

triple-aaa-games:final-submission

triple-aaa-games:master

triple-aaa-games:DialogueSystemMerge

triple-aaa-games:v1.0.0

2 Commits

fc18d3f2ea ... 842b20eebc

Author	SHA1	Message	Date
alan	842b20eebc	Merge branch 'master' of https://git.alanocull.com/triple-aaa-games/hook-line-axe	2024-02-11 16:01:47 -05:00
alan	f25ec10c06	Reimport grapple, import Tommy's animations	2024-02-11 16:01:09 -05:00

44 changed files with 64 additions and 73 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/Characters/Insurrectionist/ABP_Insurrectionist.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) Normal file

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

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/Materials/M_GrappleBase.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/Insurrectionist/Materials/M_GrappleCoil.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/Insurrectionist/Materials/M_GrappleHook.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/Insurrectionist/Materials/mat_coil_arm.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/Insurrectionist/Materials/mat_coil_basecolor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/Insurrectionist/Materials/mat_coil_normal.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/Insurrectionist/Materials/mat_grapplebody_arm.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/Insurrectionist/Materials/mat_grapplebody_basecolor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/Insurrectionist/Materials/mat_grapplebody_normal.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/Insurrectionist/Materials/mat_grapplehook_arm.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/Insurrectionist/Materials/mat_grapplehook_basecolor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/Insurrectionist/Materials/mat_grapplehook_normal.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/Insurrectionist/Meshes/SKM_Insurrectionist.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/Meshes/mesh_grapple_coil.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/Insurrectionist/Meshes/mesh_grapple_hook.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Characters/Insurrectionist/Meshes/mesh_grapplebase.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Materials/M_GrappleBase.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Materials/M_GrappleCoil.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Materials/M_GrappleHook.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Meshes/Grapple/SM_GrappleBody.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Meshes/Grapple/SM_GrappleHook.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Meshes/Grapple/SM_TeslaCoil.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Textures/Grapple/GrappleBase/T_GrappleBody_AO.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Textures/Grapple/GrappleBase/T_GrappleBody_BaseColor.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Textures/Grapple/GrappleBase/T_GrappleBody_metalic.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Textures/Grapple/GrappleBase/T_GrappleBody_normal.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Textures/Grapple/GrappleBase/T_GrappleBody_roughness.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Textures/Grapple/GrappleHook/T_GrappleHook_AO.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Textures/Grapple/GrappleHook/T_GrappleHook_BaseColor.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Textures/Grapple/GrappleHook/T_GrappleHook_metalic.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Textures/Grapple/GrappleHook/T_GrappleHook_normal.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Textures/Grapple/GrappleHook/T_GrappleHook_roughtness.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Textures/Grapple/TeslaCoil/T_Coil_AO.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Textures/Grapple/TeslaCoil/T_Coil_BaseColor.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Textures/Grapple/TeslaCoil/T_Coil_Metalic.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Textures/Grapple/TeslaCoil/T_Coil_Roughness.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Textures/Grapple/TeslaCoil/T_Coil_normal.uasset (Stored with Git LFS)

View File

Binary file not shown.