Merge branch 'Ability' into dev

# Conflicts: # Content/Levels/PrototypeLevel.umap
Finished ability 1
2024-12-04 12:49:54 +00:00 · 2024-12-04 12:46:29 +00:00 · 2024-12-04 12:04:01 +00:00 · 2024-12-03 21:48:58 +00:00 · 2024-12-03 12:53:38 +00:00 · 2024-12-02 19:15:43 +00:00
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": [
Author	SHA1	Message	Date
Kacper Szelest	d450238bae	Merge branch 'Ability' into dev # Conflicts: # Content/Levels/PrototypeLevel.umap	2024-12-04 12:49:54 +00:00
Kacper Szelest	2298912e66	Finished ability 1 I finished the ability one by giving the ability knockback, allowing for the large enemy hit by the attack to get thrown back away. I added in a print string into flats monster to check if the apply damage was working	2024-12-04 12:46:29 +00:00
Kacper Szelest	4a69b5e40f	Bump Unreal version to 5.5 on this branch	2024-12-04 12:04:01 +00:00
Kacper Szelest	4c47b7cbeb	Fixed mapping controller bug Added a clear mapping node before changing the input map so that it doesnt break the game anymore	2024-12-03 21:48:58 +00:00
Kacper Szelest	cf509a1ea2	Added monolith ability boolean Added a boolean for the monolith so that when the monolith is in an animation, it isnt able to move or do any other actions. Added the boolean to the flats monster too.	2024-12-03 12:53:38 +00:00
Kacper Szelest	f040467f21	IDK	2024-12-02 19:15:43 +00:00
Kacper Szelest	eea95f8eee	Fixed play montage not working	2024-12-02 19:14:46 +00:00
Kacper Szelest	3ba86a0d80	IDk tbh	2024-11-30 20:32:26 +00:00
Kacper Szelest	a492419199	Changed the rig for the monolith	2024-11-30 20:29:59 +00:00
Kacper Szelest	f2616a24a9	Added ability 1 animation montage	2024-11-30 20:29:29 +00:00
Kacper Szelest	48a5df9a3d	Added in flats monster Added in the flats monster blueprint	2024-11-30 20:19:58 +00:00
Kacper Szelest	efca89e169	Added in the flats monster Added in the flats monster into the game	2024-11-30 19:04:30 +00:00
Kacper Szelest	d76b47630f	Added in socket to monolith mesh Added in a socket to the monolith mesh so that the ability 1 would attach the enemy mesh to the socket and play their retrospective animations	2024-11-30 19:02:34 +00:00
Kacper Szelest	cb9fef137a	Added in ability 1 animation Added in the animation for ability one to pair it with the actual ability 1	2024-11-30 19:01:40 +00:00
Kacper Szelest	bc36eafe11	Changed input mapping for abilities I changed the input mapping for the abilities so it uses the new enhanced version	2024-11-29 15:52:20 +00:00
Kacper Szelest	e0a1361439	Fixed the weapons and abilities Fixed the melee and ability 1 so that they despawn and would apply damage etc	2024-11-29 15:51:39 +00:00
Kacper Szelest	d284012315	Fixed the monolith not jumping I fixed the jumping by replacing the IA node with the correct one so it works	2024-11-29 15:37:26 +00:00