Commit Graph

441 Commits

Author SHA1 Message Date
LOUIS HORNE
cf856ee974 Lighting fixes
Fixed some lighting problems
2023-11-28 16:20:48 +00:00
d34b52f972 Add GameInstance for Global Session ID 2023-11-28 03:36:27 +00:00
e6015edc6f Merge pull request #8 from Games-Academy-Student-Work-23-24/dev
Dev
2023-11-27 13:29:44 +00:00
61018a044d Migrated Telemetry To GameMode 2023-11-27 13:25:20 +00:00
REBECCA WYNN
52f1869b6e Added textured sofa and adjusted living room layout
added lights to livingroom
2023-11-27 13:09:50 +00:00
80912566d3 Bugfix Creating Invaild Sessions on Startup 2023-11-27 11:48:15 +00:00
e7e9918daf Update Start Telemetry in Training Facility 2023-11-27 09:59:49 +00:00
e928131d89 Update Exit Telemetry 2023-11-27 09:55:49 +00:00
1707d13fb9 Add Base Telemetry Triggers 2023-11-27 09:41:18 +00:00
69bf3555e3 Merge remote-tracking branch 'origin/Tutorial-Enviroment' into dev
# Conflicts:
#	EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Button.uasset
#	EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Seat.uasset
#	EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Toilet.uasset
#	EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/lambert1.uasset
#	EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/standardSurface5.uasset
#	EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/M_Carpet.uasset
#	EndlessVendetta/Content/Levels/TrainingFacility.umap
#	EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset
#	EndlessVendetta/Content/StarterContent/Materials/M_Wood_Pine.uasset
#	EndlessVendetta/Content/StarterContent/Materials/M_Wood_Walnut.uasset
2023-11-27 02:03:30 +00:00
c9d5ab73a6 Merge remote-tracking branch 'origin/asset-lights' into dev 2023-11-27 01:22:33 +00:00
e0ac8804c7 Built Lighting for Training Facility 2023-11-27 01:22:00 +00:00
ce8a870eca Updated Waypoint UI for More Readability
Added Outline and Increased Size to 65
2023-11-27 01:18:52 +00:00
05679cc334 Bugfix Able to Equip Rifle Before Pickup 2023-11-27 01:10:36 +00:00
7aecf2a69c Merge remote-tracking branch 'origin/CheckpointUI' into Inventory-System
# Conflicts:
#	EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset
#	EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset
2023-11-27 00:45:32 +00:00
3ac6ea3a27 Updated Inventory Component for Dropping of Items 2023-11-27 00:43:10 +00:00
Rafal Swierczek
53c64e90f4 Fixed Mini Waypoint Being Stuck to Center of Screen When Main Waypoint Spawns Behind Player 2023-11-27 00:12:45 +00:00
Rafal Swierczek
797653132e Fixed Multiple Main Waypoints Becoming Focused When Looking at Just One 2023-11-26 23:59:53 +00:00
e4ff0735df Merge remote-tracking branch 'origin/Weapon-To-Inventory' into Inventory-System
# Conflicts:
#	EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset
#	EndlessVendetta/Content/Levels/TrainingFacility.umap
#	EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset
#	EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h
2023-11-26 23:48:30 +00:00
Rafal Swierczek
c51f2ab7b6 Added a Directional Arrow to Mini Waypoints 2023-11-26 23:26:01 +00:00
Rafal Swierczek
cbf89a2c93 Implemented Mini Waypoint Direction Toggle 2023-11-26 22:45:21 +00:00
Rafal Swierczek
5a8d8e8284 Implemented Mini Waypoint Appearing When Main Waypoint is Out of Focus 2023-11-26 21:23:54 +00:00
Rafal Swierczek
153e026354 Added New Mini Waypoint Class with Visibility Toggle 2023-11-26 16:39:39 +00:00
Rafal Swierczek
787c9c76f1 Removed Test Mini Waypoint BP 2023-11-26 16:16:45 +00:00
Rafal Swierczek
0e937e3e5e Implemented Main Waypoint Visibility Toggle 2023-11-26 16:14:01 +00:00
Rafal Swierczek
4c2ba9b3e5 Added New Object Collision Channel Waypoint 2023-11-26 15:14:48 +00:00
Rafal Swierczek
012328b34c Implemented Basic Screen Space UI For Checkpoint Icon 2023-11-25 19:29:07 +00:00
Rafal Swierczek
62d33c6856 Added Tips to All Checkpoints 2023-11-25 16:43:28 +00:00
Rafal Swierczek
9020cdb284 Implemented Text to Checkpoint Completed UI 2023-11-25 15:53:52 +00:00
Rafal Swierczek
c955020483 Re-Added Bounty Director to Tutorial Level and Fixed Missing Tag on ArtTest Rifle 2023-11-25 15:25:46 +00:00
LOUIS HORNE
f4deb1500f Added door. Colour can can be changed in the mat
Open the material, change the value from 1 - 3 to change the colour (whole numbers)
2023-11-23 12:05:54 +00:00
MARCEL HARA
ad2d62dc73 Added Start Functionality for weapons to inventory 2023-11-23 12:03:15 +00:00
MADELINE SPRUCE
db50bd002f Put bathroomassets in 2023-11-23 10:44:38 +00:00
MADELINE SPRUCE
39e71ac8f7 Added mirror to assets folder 2023-11-23 09:47:32 +00:00
MADELINE SPRUCE
84df2436da Added bathroom assets to assets folder 2023-11-23 09:43:38 +00:00
MH261677
5bdee1fbaf Merge branch 'door-mechanic' into dev 2023-11-21 14:36:24 +00:00
MH261677
a88faa3ef8 Changed Weapon Values to their True Values 2023-11-21 14:35:54 +00:00
MH261677
55e160eb80 Finished Door opening mechanic 2023-11-21 14:31:33 +00:00
a450f68d7c Merge branch 'main' into dev 2023-11-20 19:29:58 +00:00
LOUIS HORNE
7990224334 Added Kirstians modular kit, started putting it together 2023-11-20 15:38:34 +00:00
MARCEL HARA
14c1874c53 Added Cutout to doorwall to test door opening 2023-11-20 14:58:09 +00:00
MARCEL HARA
bbcf052b04 Added Basic Door to Level 2023-11-20 14:33:33 +00:00
MARCEL HARA
83beb696f2 Added Door Interact UI with FadeIns 2023-11-20 14:33:33 +00:00
MARCEL HARA
59f813050d Added Base Door Functionality 2023-11-20 14:33:32 +00:00
MARCEL HARA
0cf77cbcde Got rid of old Logs in BaseWeapon 2023-11-20 14:33:31 +00:00
KRISTIAN CHARNLEY-PARR
38b8de140d Merge pull request #7 from Games-Academy-Student-Work-23-24/Tutorial-Enviroment
Tutorial enviroment
2023-11-20 14:05:29 +00:00
KRISTIAN CHARNLEY-PARR
7a2156df26 Modular assets added 2023-11-20 14:04:24 +00:00
MADELINE SPRUCE
ae3341083b Put toilet in asset folder 2023-11-20 12:40:36 +00:00
REBECCA WYNN
932d485409 added table textures into unreal and adjusted lighting
added everything done over weekend into unreal
2023-11-20 12:18:06 +00:00
MARCEL HARA
ba11c7f12f Added Door Testing Level 2023-11-20 12:06:24 +00:00