EndlessVendetta/EndlessVendetta
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
..
.idea Update Base Item for BP Properties 2023-10-13 20:10:51 +01:00
Config Add GameInstance for Global Session ID 2023-11-28 03:36:27 +00:00
Content Merge remote-tracking branch 'origin/LevelDesign2' into Tutorial-Enviroment 2024-01-10 09:20:56 +00:00
Platforms/HoloLens/Config Add EQS for AI to Find Valid Cover Locations 2023-09-29 00:07:12 +01:00
Source Merge branch 'player-movement' into dev 2023-11-30 16:03:54 +00:00
.gitattributes Add Empty Unreal Project for Inital Setup 2023-09-26 20:22:20 +01:00
.gitignore Add Empty Unreal Project for Inital Setup 2023-09-26 20:22:20 +01:00
EndlessVendetta.uproject More Tv work 2023-11-28 18:47:03 +00:00
readme.md Add Empty Unreal Project for Inital Setup 2023-09-26 20:22:20 +01:00