Commit Graph

274 Commits

Author SHA1 Message Date
Rafal Swierczek
c53b7c7988 Updated Base Gadget Class to Include UI Info 2023-10-28 17:36:54 +01:00
Rafal Swierczek
3b5a2b6119 Adjusted Parkour Areas Final Jump 2023-10-28 14:42:00 +01:00
Rafal Swierczek
54dc93ded0 Reduced Target Amount for Both Firing Ranges 2023-10-28 14:31:32 +01:00
Rafal Swierczek
ce5bde5f34 Added Checkpoint Completion Confirmation UI 2023-10-28 14:21:58 +01:00
MH261677
8678376ba6 Added Shotgun Base Weapon 2023-10-26 16:00:46 +01:00
MH261677
6c8e5276f9 Updating Magazine Size Back To Default 2023-10-26 15:50:25 +01:00
MH261677
848430aebd Finished Creating Sniper Weapon 2023-10-26 15:49:11 +01:00
c794a905da Updated Inventory Component for Resising Functionality 2023-10-26 11:59:50 +01:00
2553f471e5 Updated Inventory for Cleanup 2023-10-26 11:27:03 +01:00
50791b67c3 Bugfix Able to Place Items Outside of Grid 2023-10-26 10:52:42 +01:00
58931ab222 Bugfix Inventory UI Not Refreshing on Dirty 2023-10-25 16:58:38 +01:00
53ecbbb472 Bugfix Get Item At Index Returning Invaild Result 2023-10-23 17:24:58 +01:00
MARCEL HARA
d12573f6cc Added Sniper Weapon and started creating Base Functionality 2023-10-23 14:01:09 +01:00
Rafal Swierczek
7ab8735ed1 Fixed AI Gun Animations Merge Issue 2023-10-23 13:18:40 +01:00
Rafal Swierczek
4c04c45d49 Fixed Merge Issues 2023-10-23 11:50:20 +01:00
Rafal Swierczek
14fa4621e3 Merge remote-tracking branch 'origin/dev' into dev 2023-10-23 11:49:16 +01:00
MARCEL HARA
c5bf15f6fd Fixed not being able to fire after switching weapons when reloading 2023-10-23 11:46:23 +01:00
Rafal Swierczek
0ff4d76e00 Merge branch 'Inventory-System' into dev
# Conflicts:
#	EndlessVendetta/Content/AI/Enemy/Basic/BT_BasicEnemy.uasset
#	EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset
#	EndlessVendetta/Content/FirstPerson/Input/IMC_Default.uasset
2023-10-23 11:34:54 +01:00
MARCEL HARA
37c93fcfe8 Fixed weapon system information bug 2023-10-23 11:29:48 +01:00
Rafal Swierczek
fd41495cc7 Merge branch 'TutorialBounty' into dev
# Conflicts:
#	EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset
2023-10-23 11:16:06 +01:00
Rafal Swierczek
9c57740b45 Fixed Gun Stat Prompt Starting Spawned In 2023-10-23 11:13:23 +01:00
Rafal Swierczek
ddfb44b2e7 Merge branch 'WeaponPickupSystem' into TutorialBounty
# Conflicts:
#	EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset
#	EndlessVendetta/Content/LevelPrototyping/Scenes/TutorialHit.umap
2023-10-23 10:45:10 +01:00
8cfe3b97a9 Update Inventory Component for UI [WIP] 2023-10-23 06:35:59 +01:00
7191dd7302 Implemented Escape From The Area Checkpoint 2023-10-21 20:23:13 +01:00
b4c8ac75c6 Implemented Target Elimination Checkpoint 2023-10-21 17:08:53 +01:00
88f5824f24 Added Enter The Bounty Simulation Facility Checkpoint 2023-10-21 14:30:56 +01:00
3fe90716af Added Parkour Checkpoint to Tutorial 2023-10-21 12:36:17 +01:00
36daaaed16 Bugfix TTuple Error Cannot be Macroed 2023-10-20 23:10:10 +01:00
6609476eec Update Inventory Component for Helper Functions 2023-10-20 22:59:54 +01:00
fb8ebc5088 Implemented Temporary Gunrange Functionality to Tutorial Facility 2023-10-20 15:02:23 +01:00
bae8955a27 Fixed Waypoint Appearing for Inactive Checkpoints 2023-10-20 14:42:12 +01:00
97ac729dd5 Implemented First Two Checkpoints 2023-10-19 18:28:33 +01:00
MH261677
a45b7488ba Working weapon switching 2023-10-19 17:38:18 +01:00
MH261677
6c1c5ca12e Added New AR Test & Started working on switching system 2023-10-19 16:44:35 +01:00
aac09873f2 Implemented Waypoint Functionality and UI
To be reworked later down the line
2023-10-19 16:22:13 +01:00
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
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
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
c75125027b Add Structs for Inventory Grid 2023-10-13 21:25:01 +01:00
fbe820853c Add BP Widget Components for Inventory 2023-10-13 20:45:48 +01:00
9bd3b0c4e8 Update Base Item for Rotated Properties 2023-10-13 20:45:24 +01:00
17ecf7a3e6 Update Base Item for BP Properties 2023-10-13 20:10:51 +01:00
55e9321288 Merge branch 'dev' into Inventory-System 2023-10-13 15:54:27 +01:00
1746dad55c Bugfix Crashing After an Enemy is Killed
Handled Death in AI Control Hub
2023-10-13 15:47:25 +01:00
72ef4989c5 Prepared Scene for Peer Review Backup Build 2023-10-13 15:27:17 +01:00
Louis Horne
7ad9e95679 Update level blockout to include placeholder cover/furniture
Its just boxes mostly
2023-10-13 14:27:56 +01:00
5e322d35e1 Merge branch 'MergingBlockout' into BackupBuild
# Conflicts:
#	EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset
2023-10-13 13:37:40 +01:00
7296353c73 Fixed Being Unable to Complete a Main Bounty 2023-10-12 21:29:19 +01:00
58a2d791b4 Implemented a new Test Bounty with Side Bounties 2023-10-12 21:18:51 +01:00
3efc8f088d Implemented Load OS BP Implementable Event
Sets up what values the player sees on the in games pc's display, values such as what bounty they're on or how much a favour will cost them
2023-10-12 20:47:27 +01:00
80216b098e Implemented Navigating Bounty Directors PC Interface 2023-10-12 19:45:54 +01:00
e2561df38c Implemented Stand in Bounty Director PC Asset 2023-10-12 17:40:24 +01:00
9362f478aa Add Base Item Class for Inventory 2023-10-12 14:11:59 +01:00
Rafal Swierczek
82979e32e0 Added Bounty Directors PC Landing Page Layout 2023-10-12 12:01:18 +01:00
Rafal Swierczek
e29a753015 Deleted Old Test Bounties 2023-10-12 12:00:25 +01:00
280644da78 Update Enemy AI for Alert Level 2 - Hunt Player 2023-10-12 11:35:12 +01:00