Merge branch 'Ability' into dev

# Conflicts: # Content/Levels/PrototypeLevel.umap
2024-12-04 12:49:54 +00:00 · 2024-12-04 12:49:54 +00:00 · d450238bae
commit d450238bae
parent 42870b149e 2298912e66
18 changed files with 44 additions and 17 deletions
--- a/Content/Assets/BlockoutAssets/MonolithBlockout/Monolith_blockout_Rig.uasset
+++ b/Content/Assets/BlockoutAssets/MonolithBlockout/Monolith_blockout_Rig.uasset
--- a/Content/Assets/BlockoutAssets/MonolithBlockout/Monolith_blockout_Rig_Skeleton.uasset
+++ b/Content/Assets/BlockoutAssets/MonolithBlockout/Monolith_blockout_Rig_Skeleton.uasset
--- a/Content/Enemies/Flats/BP_FlatsMonster.uasset
+++ b/Content/Enemies/Flats/BP_FlatsMonster.uasset
--- a/Content/Enemies/Flats/FlatsMonsterRigged.uasset
+++ b/Content/Enemies/Flats/FlatsMonsterRigged.uasset
--- a/Content/Enemies/Flats/FlatsMonsterRigged_PhysicsAsset.uasset
+++ b/Content/Enemies/Flats/FlatsMonsterRigged_PhysicsAsset.uasset
--- a/Content/Enemies/Flats/FlatsMonsterRigged_Skeleton.uasset
+++ b/Content/Enemies/Flats/FlatsMonsterRigged_Skeleton.uasset
--- a/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset
+++ b/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset
--- a/Content/Levels/PrototypeLevel.umap
+++ b/Content/Levels/PrototypeLevel.umap
--- a/Content/Monolith/Animations/Ability_1.uasset
+++ b/Content/Monolith/Animations/Ability_1.uasset
--- a/Content/Monolith/Animations/Ability_1Montage.uasset
+++ b/Content/Monolith/Animations/Ability_1Montage.uasset
--- a/Content/Monolith/Animations/MonolithAnimBlueprint.uasset
+++ b/Content/Monolith/Animations/MonolithAnimBlueprint.uasset
--- a/Content/Monolith/BPI_AOverheat.uasset
+++ b/Content/Monolith/BPI_AOverheat.uasset
--- a/Content/Monolith/BPI_MeeleWeapon.uasset
+++ b/Content/Monolith/BPI_MeeleWeapon.uasset
--- a/Content/Monolith/BPI_Monolith.uasset
+++ b/Content/Monolith/BPI_Monolith.uasset
--- a/Content/Monolith/Input/IA_MAbilitySelection.uasset
+++ b/Content/Monolith/Input/IA_MAbilitySelection.uasset
--- a/Content/Monolith/Input/IA_Mability1.uasset
+++ b/Content/Monolith/Input/IA_Mability1.uasset
--- a/Content/Monolith/Input/IMC_Monolith.uasset
+++ b/Content/Monolith/Input/IMC_Monolith.uasset
--- a/Monolith.uproject
+++ b/Monolith.uproject
@ -1,6 +1,6 @@
 {
 	"FileVersion": 3,
-	"EngineAssociation": "5.4",
+	"EngineAssociation": "5.5",
 	"Category": "",
 	"Description": "",
 	"Modules": [