Commit Graph

300 Commits

Author SHA1 Message Date
MH261677
feeb0f36d6 Finished Creating Weapon Stat UI for all Weapons 2023-10-19 15:30:39 +01:00
81105bf0d1 Added Skip Cutscene Functionality 2023-10-19 13:59:16 +01:00
MARCEL HARA
c68c1b70dc Started adding WeaponStats UI 2023-10-19 12:08:25 +01:00
Rafal Swierczek
3631fbe5ba Implemented Intro Cutscene 2023-10-19 12:03:23 +01:00
f4dad6675f Merge branch 'AI-Attack-Animation' into dev
# Conflicts:
#	EndlessVendetta/Content/AI/Enemy/Basic/BP_BasicEnemyCharacter.uasset
#	EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset
2023-10-19 12:03:01 +01:00
9a94719541 Update Enemy Character for Rifle Animations 2023-10-19 11:59:56 +01:00
0fb24cd386 Add BT Services and Tasks for Animation Triggers 2023-10-19 11:59:28 +01:00
7a9488e13a Add Rifle Animation Locomotion for AI 2023-10-19 11:58:47 +01:00
MARCEL HARA
a9eb6e3eea Updated all Classes to have new Interface Function 2023-10-19 11:19:12 +01:00
KRISTIAN CHARNLEY-PARR
15b73d8749 Added fridge asset 2023-10-19 09:58:54 +01:00
393b01fdcf Implemented Intro Cutscene Stand in Frames (Partially) 2023-10-18 21:57:29 +01:00
14107df96c Created Training Facility Level 2023-10-18 18:40:13 +01:00
5d009904f8 Add Function Stubs for Inventory Component 2023-10-18 18:34:05 +01:00
dec1d761bf Replaced Interactable Actor Class with Interaction Interface 2023-10-18 00:02:16 +01:00
ab76177b16 Merge remote-tracking branch 'origin/WeaponPickupSystem' into TutorialBounty
# Conflicts:
#	EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_AmmoCount.uasset
2023-10-17 22:45:52 +01:00
9ef4894aa8 Merge branch 'Blockout' into TutorialBounty
# Conflicts:
#	EndlessVendetta/Content/LevelPrototyping/Materials/M_Concrete.uasset
#	EndlessVendetta/Content/LevelPrototyping/Scenes/TutorialHit.umap
2023-10-17 15:44:42 +01:00
RAFAL SWIERCZEK
370cff50c9 Merge pull request #2 from Games-Academy-Student-Work-23-24/dev
Dev
2023-10-16 16:54:13 +01:00
RAFAL SWIERCZEK
aba399c20a Merge pull request #1 from Games-Academy-Student-Work-23-24/BackupBuild
Backup build
2023-10-16 16:50:27 +01:00
Chris Farrer
ce25923886 Added Kitchen Props to tutorial 2023-10-16 16:25:50 +01:00
rebecca wynn
fa0d15aa53 added lights assets (ceiling 1 and 2) 2023-10-16 16:23:55 +01:00
7f879a526e Added Mixamo Pistol Locomotion for AI 2023-10-16 16:16:08 +01:00
MARCEL HARA
b239012411 Added Reload Text To Weapons When Reloading 2023-10-16 16:14:23 +01:00
MARCEL HARA
a3021a2722 Added Reload Wait Timer To All Weapons 2023-10-16 15:54:53 +01:00
Louis Horne
f34d7500f9 Added Placeholder props to tutorial level
Added: bed, bookshelf, wardrobe, desk, small desk
2023-10-16 15:53:46 +01:00
Rafal Swierczek
05ca404a7f Deleted Doors from Tutorial Hit 2023-10-16 15:27:22 +01:00
MARCEL HARA
055356ec01 Tweaked Weapon Values & Added Tick func to Char.cpp 2023-10-16 15:16:57 +01:00
Louis Horne
776bfc8275 Updated Conrete texture 2023-10-16 15:05:48 +01:00
96a1b74d1d Updated AI Test Scene for New Animation BP 2023-10-16 14:37:01 +01:00
975818c157 Update Control Rig to Use Inverse Kinematics 2023-10-16 14:34:48 +01:00
d932cd7e70 Add Pistol Reload and Idle Animations for AI 2023-10-16 14:31:49 +01:00
Rafal Swierczek
131b1977ba Added AI Control HUB to Tutorial Hit Level 2023-10-16 14:00:13 +01:00
Rafal Swierczek
8f951c3927 Merge branch 'BackupBuild' into dev
# Conflicts:
#	EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset
#	EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset
2023-10-16 13:33:10 +01:00
Rafal Swierczek
4219d01ae7 Merge branch 'WeaponSystem' into BackupBuild 2023-10-16 13:31:46 +01:00
Rafal Swierczek
e741b3c17a Preppared Build 2023-10-16 13:31:10 +01:00
MARCEL HARA
e5cc2ad9f7 Changed DebugLine to Grey and Lowered Timer To Create Bullet Trail 2023-10-16 13:23:03 +01:00
MARCEL HARA
fad7da57f8 Fixed Tap Fire Rate On All Pistols 2023-10-16 13:18:39 +01:00
774b1f696e Add Pistol Equip Animation for AI 2023-10-16 12:47:01 +01:00
e82bf8d68c Add Animation Blueprint for Custom AI Animations 2023-10-16 12:40:54 +01:00
1b89a119f9 Retargeted Animations for UE5 Manny 2023-10-16 12:39:56 +01:00
2d7ef92630 Add Animation Starter Pack for Basic Animations 2023-10-16 12:39:25 +01:00
Rafal Swierczek
f641053ce9 Merge branch 'WeaponSystem' into BackupBuild 2023-10-16 11:41:42 +01:00
MARCEL HARA
e62345d690 Updated Recoil Pitch to Stop Being Perfect for Guns 2023-10-16 11:40:53 +01:00
Rafal Swierczek
07b6f9aeac Merge branch 'WeaponSystem' into BackupBuild
# Conflicts:
#	EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset
#	EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp
2023-10-16 11:23:56 +01:00
e71d022e65 Merge branch 'FavourSystem' into dev
# Conflicts:
#	EndlessVendetta/EndlessVendetta.uproject
2023-10-15 13:20:15 +01:00
8ad1393ffb Fixed Buying a Bounty Alteration Multiple Times
Player can now only buy each bounty alteration once per bounty
2023-10-15 13:16:59 +01:00
d32b2fc6f5 Implemented All Favour Buying Buttons 2023-10-15 13:07:20 +01:00
8b4a78435d Added First Buy Buttons Delegate 2023-10-14 17:54:03 +01:00
d922ceec10 Fixed Missing Custom Bounty Alteration Behaviour 2023-10-14 17:20:17 +01:00
d2481e79b8 Fixed Text Formatting Issues for PC_Display Widget 2023-10-14 17:10:29 +01:00
MH261677
73fa607cfb Fixed and Added Ammo UI for Both Pistol and AR 2023-10-14 15:48:59 +01:00