Rafal/EndlessVendetta
Rafal/EndlessVendetta
1
0
Fork 0
Code Issues Pull Requests Releases 1 Activity
462 Commits 2 Branches 24 Tags 97 GiB
6f3d1cc47e
Commit Graph

462 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marcel Hara
a790a4a790 Added Shotgun Functionality Firing 2023-11-06 14:01:57 +00:00
Marcel Hara
425ceb05d0 Edited BaseShotgun Values for more Realism 2023-11-06 14:01:44 +00:00
REBECCA WYNN
64a07ab294 Merge branch 'asset-lights' into Blockout 
# Conflicts:
#	EndlessVendetta/Content/Assets/Objects/Tutorial-Level/ceiling_light_01.uasset
#	EndlessVendetta/Content/Assets/Objects/Tutorial-Level/ceiling_light_02.uasset
#	EndlessVendetta/Content/LevelPrototyping/Scenes/TutorialHit.umap
 2023-11-06 13:56:12 +00:00
REBECCA WYNN
caf1668b9c added all lights to tut level 2023-11-06 13:53:32 +00:00
LOUIS HORNE
42dab4464b Added assets to the tutorial hit 
added some bedroom assets
 2023-11-06 12:59:19 +00:00
PHILIP WHITE
b0229af645 Bugfix Unable to Compile due to Missing Comma 2023-11-06 12:42:20 +00:00
PHILIP WHITE
65f7112805 Merge pull request #5 from Games-Academy-Student-Work-23-24/dev 
Dev
 2023-11-03 19:17:41 +00:00
Rafal Swierczek
06a3dd04ad Updated List of Maps to Include in Build to Include New Miami Map 2023-11-03 17:57:50 +00:00
Rafal Swierczek
368a68a7e2 Fixed Crashes Caused By Destroying InValid Characters For Some Gadget Tutorials 2023-11-03 17:32:59 +00:00
Rafal Swierczek
384db6c241 Enabled Hidden In Game Settings for Example Areas in All Gadget Tutorials 2023-11-03 17:00:34 +00:00
Rafal Swierczek
d43053febe Fixed Checkpoint Confirmation UI Being Overriden Post Merge 2023-11-03 16:46:20 +00:00
Rafal Swierczek
a08f671114 Merge remote-tracking branch 'origin/Inventory-System' into dev 
# Conflicts:
#	EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset
#	EndlessVendetta/Content/Levels/TrainingFacility.umap
 2023-11-03 16:28:51 +00:00
Rafal Swierczek
9688c71a31 Merge remote-tracking branch 'origin/Shotgun-weapon-creation' into dev 2023-11-03 16:27:00 +00:00
Rafal Swierczek
c522a39410 Updated PickUpWeapon Checkpoint To Include Actual Pickupable Weapons 2023-11-03 16:19:53 +00:00
Rafal Swierczek
31b190208b Added Combat Gadget Training Checkpoint 2023-11-03 15:36:14 +00:00
Rafal Swierczek
345e5acd08 Implemented Overload Module Gadget Tutorial 2023-11-03 15:12:18 +00:00
Rafal Swierczek
61117272ef Added Go Downstairs Checkpoint 2023-11-03 13:49:00 +00:00
Rafal Swierczek
7ac557f166 Implemented Recon Tutorial Checkpoint 2023-11-03 13:35:26 +00:00
Rafal Swierczek
e78cc47989 Fixed Gadgets not Despawning After Being Switched Out 2023-11-03 13:22:30 +00:00
Rafal Swierczek
971e28bb61 Implemented Ring Module Gadget Tutorial 2023-11-02 18:57:01 +00:00
Rafal Swierczek
7ee592f1f0 Implemented Vision Link Gadget Tutorial 2023-11-02 02:27:04 +00:00
Rafal Swierczek
8694b8746b Implemented Base Gadget Tutorial Class 2023-11-01 21:52:47 +00:00
Rafal Swierczek
d705e61070 Implemented Gadget Switching Workbench 2023-11-01 21:18:18 +00:00
Rafal Swierczek
6a14693826 Implemented UGadgetMenu and it's Functionality 2023-10-30 18:00:41 +00:00
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
PHILIP WHITE
c794a905da Updated Inventory Component for Resising Functionality 2023-10-26 11:59:50 +01:00
PHILIP WHITE
2553f471e5 Updated Inventory for Cleanup 2023-10-26 11:27:03 +01:00
PHILIP WHITE
50791b67c3 Bugfix Able to Place Items Outside of Grid 2023-10-26 10:52:42 +01:00
PHILIP WHITE
58931ab222 Bugfix Inventory UI Not Refreshing on Dirty 2023-10-25 16:58:38 +01:00
PHILIP WHITE
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
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
PHILIP WHITE
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
PHILIP WHITE
8cfe3b97a9 Update Inventory Component for UI [WIP] 2023-10-23 06:35:59 +01:00