Commit Graph

776 Commits

Author SHA1 Message Date
MARCEL HARA
d12573f6cc Added Sniper Weapon and started creating Base Functionality 2023-10-23 14:01:09 +01:00
RAFAL SWIERCZEK
d5fb505b90 Merge pull request #4 from Games-Academy-Student-Work-23-24/dev
Fixed AI Gun Animations Merge Issue
2023-10-23 13:19:52 +01:00
Rafal Swierczek
7ab8735ed1 Fixed AI Gun Animations Merge Issue 2023-10-23 13:18:40 +01:00
Louis Horne
d7b3368aab Added maya file of bedroom blockout for artists to look at
Have a look, it prolly wont scale correct in engine. But worth it for an idea of the space
2023-10-23 11:53:00 +01:00
ba6590e5ac Merge pull request #3 from Games-Academy-Student-Work-23-24/dev
Dev
2023-10-23 11:52:23 +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
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