Commit Graph

505 Commits

Author SHA1 Message Date
MH261677
e59fa152c8 Fixed rotation and positioning of silencer on pistols 2024-02-01 18:48:45 +00:00
MH261677
e218a28e22 Created SilencerImage placeholder for UI 2024-02-01 18:48:28 +00:00
MH261677
64fa82b2da Created Attachment Tag to all attachments 2024-02-01 18:48:15 +00:00
MH261677
8aa0b69436 Added Primary and Secondary weapon meshes to workbench 2024-02-01 17:26:02 +00:00
MH261677
9ae158b4e8 Fixed BaseWeapon Recoil Crash Bug 2024-02-01 17:24:33 +00:00
MH261677
eaf5f6ca46 Added Camera to Workbench for creating better UI 2024-02-01 16:30:27 +00:00
MH261677
98bf5288ed Added Widget Vars and UI State Checks to stop Idle Anims 2024-02-01 16:30:10 +00:00
MH261677
cec0b54b1a Fixed Silencer for Rifles not positioned and rotated properly 2024-02-01 15:49:52 +00:00
MH261677
9329454318 Reworked Attachment spawning code to be more universal 2024-02-01 14:24:31 +00:00
MARCEL HARA
3990cefbc0 Added Sockets to weapons for Silencer Attachment 2024-01-26 18:36:03 +00:00
MARCEL HARA
e3af853bdd Re-Worked Workbench code to use sockets instead of mesh loc 2024-01-26 18:35:44 +00:00
MARCEL HARA
57c55fb762 Fixed Bench Not recognizing secondary weapon only 2024-01-26 18:35:24 +00:00
MARCEL HARA
1edfa037a1 Changed Actor Tags & Removed Manual Mesh Attachment 2024-01-26 18:35:03 +00:00
MARCEL HARA
f402fde148 Created Temp Silencer Mesh 2024-01-26 18:34:14 +00:00
MH261677
c3c1eee87d Fixed sniper model being gone 2024-01-24 16:03:03 +00:00
ad94db81c7 Merge branch 'dev' into Dialogue-System
# Conflicts:
#	EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset
#	EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h
2024-01-22 23:11:39 +00:00
649c364c27 Update Dialogue UI for Interact Events 2024-01-22 23:04:56 +00:00
e6b7edcf8c Update Character Interact to Include Dialogue 2024-01-22 23:04:39 +00:00
d30425d6e5 Merge remote-tracking branch 'origin/Dialogue-implementation' into Dialogue-System 2024-01-22 18:30:39 +00:00
MH261677
27b27699d6 Edited and changed pistol to have art asset 2024-01-22 17:47:43 +00:00
MH261677
086c187ca5 Created a new pistol socket on character skeleton 2024-01-22 17:46:39 +00:00
MH261677
7a68f52979 Added all weapons to test level for testing 2024-01-22 17:46:24 +00:00
MH261677
091b60cbe9 Imported Pistol asset from artist 2024-01-22 17:46:14 +00:00
MH261677
fb003af73f Added FOV Changes back for proper zooming 2024-01-22 17:46:04 +00:00
MH261677
31e492e026 Added Un-ADS for all Primary Weapons 2024-01-22 17:14:48 +00:00
MH261677
81a3fe895f Added Weapon Aiming for all primary and secondary weapons 2024-01-22 17:10:53 +00:00
701e42bcf5 Update Tutorial Target Material for Targets 2024-01-22 09:16:01 +00:00
fd980c7e96 Merge branch 'dev' into Dialogue-System 2024-01-22 08:58:02 +00:00
Rafal Swierczek
82261b8c44 Testing Random Guns Spawning at World Center
Turns out, when a weapon is dropped it goes to world center
2024-01-22 01:46:14 +00:00
Rafal Swierczek
46cb303b6a Updated First Tutorial Checkpoint to Include Game Intro 2024-01-22 01:19:58 +00:00
Rafal Swierczek
fe7b253233 Updated Waypoint Icons 2024-01-22 00:49:37 +00:00
Rafal Swierczek
1e0dc49e5a Bugfix Landing Zone Interaction Range 2024-01-21 17:56:01 +00:00
Rafal Swierczek
b167dcca01 Optimised LandingZone Waypoint Transform Update from BP to C++ 2024-01-20 14:23:05 +00:00
Rafal Swierczek
542b09012b Implemented Sensitivity Settings for Devs 2024-01-20 14:21:46 +00:00
Rafal Swierczek
a84391c377 Disabled Motion Blur 2024-01-20 13:33:48 +00:00
Rafal Swierczek
d203b89320 Bugfix Head Bobbing Merge Conflicts 2024-01-19 18:01:13 +00:00
Rafal Swierczek
d5f98d5d39 Merge branch 'head-bobbing' into dev
# Conflicts:
#	EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset
#	EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset
#	EndlessVendetta/Content/Levels/TrainingFacility.umap
2024-01-19 15:55:14 +00:00
Rafal Swierczek
50f4b46549 Merge branch 'weapon-workbench' into dev
# Conflicts:
#	EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset
#	EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset
#	EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp
#	EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp
2024-01-19 15:10:47 +00:00
Rafal Swierczek
10fc559eb9 Deleted Corrupted Arrow Icon 2024-01-19 15:05:05 +00:00
954d0ce7c3 Merge branch 'dev' 2024-01-15 03:48:06 +00:00
9458d574e3 Update Dialogue for Choices UI & Events 2024-01-15 03:44:31 +00:00
5145b69009 Update Dialogue Tree for Proper Choice Interpretation 2024-01-15 03:44:09 +00:00
Rafal Swierczek
521e08d07f Populated Apartment Hit with Enemies 2024-01-14 22:31:12 +00:00
Rafal Swierczek
1b922accb3 Bugfix Corrupted Arrow 2024-01-14 22:20:19 +00:00
Rafal Swierczek
8d0f5534ce Merge branch 'Tutorial-Enviroment' into dev
# Conflicts:
#	EndlessVendetta/Content/BountySystem/Waypoint/WaypointArrow.uasset
#	EndlessVendetta/Content/Levels/TrainingFacility.umap
#	EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset
#	EndlessVendetta/EndlessVendetta.uproject
2024-01-14 22:01:42 +00:00
Rafal Swierczek
7fe18c2e8c Implemented the rest of the Open World Checkpoints 2024-01-14 21:57:55 +00:00
Rafal Swierczek
b53bdd2c26 Merged Open World into Training Facility 2024-01-14 21:31:16 +00:00
Rafal Swierczek
b1383864a6 Merge branch 'Open-world-blockout' into dev 2024-01-14 20:29:39 +00:00
Rafal Swierczek
e4f955744e Added Enter Space Ship Checkpoint 2024-01-14 20:28:18 +00:00
Rafal Swierczek
195ff80dea Implemented Landing Zone Landing Functionality 2024-01-14 20:13:17 +00:00