LOUIS HORNE 7b5aff2f60 Merge remote-tracking branch 'origin/LevelDesign2' into Tutorial-Enviroment ... # 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/cofffee_table/coffee_table_re.uasset # EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/side_table/side_table_bl.uasset # EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_02/ceiling_light_02_orange.uasset # EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/lamp_01/lamp_01_orange.uasset # EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/wall_light_01/wall_light_01_orange.uasset # EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/wall_light_02/wall_light_02_orange.uasset # EndlessVendetta/Content/Levels/TrainingFacility.umap # EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset		2024-01-10 09:20:56 +00:00
..
__ExternalActors__	Finished Door opening mechanic	2023-11-21 14:31:33 +00:00
__ExternalObjects__	Added Door Testing Level	2023-11-20 12:06:24 +00:00
AI	Update Enemy Character for Rifle Animations	2023-10-19 11:59:56 +01:00
AnimStarterPack	Add Animation Starter Pack for Basic Animations	2023-10-16 12:39:25 +01:00
Assets/Objects/Tutorial-Level	Merge remote-tracking branch 'origin/LevelDesign2' into Tutorial-Enviroment	2024-01-10 09:20:56 +00:00
BountySystem	Merge remote-tracking branch 'origin/LevelDesign2' into Tutorial-Enviroment	2024-01-10 09:20:56 +00:00
Characters	Update Enemy Character for Rifle Animations	2023-10-19 11:59:56 +01:00
ControlRig/Characters/Mannequins	Add Blockout for Tutrorial	2023-10-05 18:52:21 +01:00
FirstPerson	Merge remote-tracking branch 'origin/LevelDesign2' into Tutorial-Enviroment	2024-01-10 09:20:56 +00:00
FirstPersonArms	Added Aim In Functionality for weapons	2023-10-06 17:21:17 +01:00
FPWeapon	Added Basic weapon scope in functionality	2023-10-06 16:11:28 +01:00
Gadgets	Set Dressing	2023-11-30 11:41:24 +00:00
Inventory	Add UI for Weapon Slots	2023-11-16 10:52:19 +00:00
LevelPrototyping	Added some more textures to the tutorial hit	2023-11-08 18:10:56 +00:00
Levels	Merge remote-tracking branch 'origin/LevelDesign2' into Tutorial-Enviroment	2024-01-10 09:20:56 +00:00
Ships	Implemented Escape From The Area Checkpoint	2023-10-21 20:23:13 +01:00
StarterContent	Merge remote-tracking branch 'origin/LevelDesign2' into Tutorial-Enviroment	2024-01-10 09:20:56 +00:00
SuperGrid/StarterPack	Level Design Changes	2023-12-11 16:39:21 +00:00
ThirdPerson	Add Third Person Character Starter Pack	2023-09-28 17:21:57 +01:00
UI	Added Starter Pack Explosion Effect to Explosion BP	2023-10-08 16:18:36 +01:00