merge-fix #50

Merged

connor merged 2 commits from merge-fix into master 2024-02-06 16:22:39 -05:00

Conversation 0 Commits 2 Files Changed 2 +48 -24

21 changed files with 48 additions and 24 deletions

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

Show Stats Download Patch File Download Diff File Expand all files Collapse all files Hide outdated comments

Showing only changes of commit 179a5c59a6 - Show all commits

BIN

Content/Blueprints/Enemys/Basics/BP_Enemy_Base.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/LevelDesign/World/BP_Airship.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/LevelDesign/World/BP_EnemySpawningHut.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/Player/BP_GrapplePoint.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/Blueprints/Player/Msc/BPI_PlayerAttack.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/Player/Msc/Skills/Struct_AxeSpin.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Blueprints/Player/Msc/Skills/Struct_AxeThrow.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Blueprints/Player/Msc/Skills/Struct_ElectricGrapple.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Blueprints/Player/Msc/Skills/Struct_Grapple.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Blueprints/Player/Msc/Skills/Struct_Melee.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Blueprints/Player/Msc/Skills/Struct_UpgradeLevels.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Blueprints/Projectile/BP_ThrownProjectile.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Maps/L_ConnorTestAscent.umap

View File

Binary file not shown.

BIN

Content/Sounds/VFX/SC_Explosion.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Sounds/VFX/SW_Explosion.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/UI/SkillTree/Struct_SkillUpgrade.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/UI/SkillTree/WB_SkillMenu.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/UI/SkillTree/WB_SkillTree.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/UI/SkillTree/WB_SkillUpgrade.uasset (Stored with Git LFS)

View File

Binary file not shown.