From d203b8932007c7523db165b4d84b8608a8ba5885 Mon Sep 17 00:00:00 2001
From: Rafal Swierczek <RS258946@falmouth.ac.uk>
Date: Fri, 19 Jan 2024 18:01:13 +0000
Subject: [PATCH] Bugfix Head Bobbing Merge Conflicts

---
 .../.idea.EndlessVendetta/.idea/workspace.xml    | 16 +++++++++-------
 .../Blueprints/BP_FirstPersonCharacter.uasset    |  4 ++--
 .../Content/Levels/ControlTutorialLevel.umap     |  4 ++--
 .../HDRI/HDRI_Epic_Courtyard_Daylight.uasset     |  4 ++--
 .../Particles/P_Ambient_Dust.uasset              |  4 ++--
 5 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml
index 92e001be..85b48aee 100644
--- a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml
+++ b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml
@@ -7,9 +7,11 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="540e0aa0-3712-4a9f-939c-2afb74f5ba60" name="Changes" comment="">
+    <list default="true" id="8acc2658-cb31-4c49-857f-282cfee74640" name="Changes" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/.idea.EndlessVendetta/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.EndlessVendetta/.idea/misc.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/.idea.EndlessVendetta/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.EndlessVendetta/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Content/BountySystem/Waypoint/WaypointArrow.uasset" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Content/Levels/ControlTutorialLevel.umap" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Levels/ControlTutorialLevel.umap" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Content/StarterContent/Particles/P_Ambient_Dust.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/StarterContent/Particles/P_Ambient_Dust.uasset" afterDir="false" />
     </list>
@@ -28,7 +30,7 @@
   "customColor": "",
   "associatedIndex": 5
 }]]></component>
-  <component name="ProjectId" id="2axphwqVLfBYoH0vSLbNM1tQPuB" />
+  <component name="ProjectId" id="2bBQ5ZFjKADdlvCf2VePqJdIy1m" />
   <component name="ProjectViewState">
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
@@ -121,12 +123,12 @@
   <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-      <changelist id="540e0aa0-3712-4a9f-939c-2afb74f5ba60" name="Changes" comment="" />
-      <created>1705270207676</created>
+      <changelist id="8acc2658-cb31-4c49-857f-282cfee74640" name="Changes" comment="" />
+      <created>1705685810960</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
-      <updated>1705270207676</updated>
-      <workItem from="1705270210657" duration="1288000" />
+      <updated>1705685810960</updated>
+      <workItem from="1705685813496" duration="640000" />
     </task>
     <servers />
   </component>
diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset
index 9e824917..1ab24b43 100644
--- a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset
+++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c99ec2b828cf671d0d33afa160e745375f0b82d79a8b49f2e9e74c0b68aedd7f
-size 76231
+oid sha256:c182872cb17e069eefba39d0dcef2e3b70854cffe669e8192658b1b529b96c8c
+size 135928
diff --git a/EndlessVendetta/Content/Levels/ControlTutorialLevel.umap b/EndlessVendetta/Content/Levels/ControlTutorialLevel.umap
index 9748e914..3f162a92 100644
--- a/EndlessVendetta/Content/Levels/ControlTutorialLevel.umap
+++ b/EndlessVendetta/Content/Levels/ControlTutorialLevel.umap
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a86a917f878f965f58aa3bf308f3fdb2c29dd30ddc5d7f261b2dd0447ee3c44c
-size 17258822
+oid sha256:d0c7c578c43e2605d3764bc7ac575ada04d89043fc837f4c5e942431c460cd24
+size 17258870
diff --git a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset
index 0f990580..7844ff33 100644
--- a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset
+++ b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bc35eb2d43a47427d30aba0196f9eac90d089dd3abca319528c5d25c83510d0d
-size 72364642
+oid sha256:6ed4f40be65e3378a6aa30ae08f1347dc20a31e522d7b5bf73df9a59b7a149dd
+size 66790690
diff --git a/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset b/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset
index 6bf92200..bf2e4391 100644
--- a/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset
+++ b/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:50573b1db83529bf6fe3f718bf4fe1e8008ad675a7865d2507d362fc399595f2
-size 53268
+oid sha256:01ef616c7a8bd90cd1b7a13efb18a56f33346efbae51efa31f09804478b7621d
+size 43456