From b53bdd2c26b30c03fca2a2b36ad4580a10fc6923 Mon Sep 17 00:00:00 2001
From: Rafal Swierczek <RS258946@falmouth.ac.uk>
Date: Sun, 14 Jan 2024 21:31:16 +0000
Subject: [PATCH] Merged Open World into Training Facility

---
 .../.idea.EndlessVendetta/.idea/workspace.xml | 20 ++++++++++---------
 EndlessVendetta/Config/DefaultEngine.ini      |  2 +-
 .../Checkpoints/CP_EnterSpaceShip.uasset      |  2 +-
 .../Waypoint/WaypointArrow_Spare.uasset       |  3 +++
 .../Content/Levels/ControlTutorialLevel.umap  |  4 ++--
 .../Architecture/Floor_400x400.uasset         |  4 ++--
 .../HDRI/HDRI_Epic_Courtyard_Daylight.uasset  |  4 ++--
 7 files changed, 22 insertions(+), 17 deletions(-)
 create mode 100644 EndlessVendetta/Content/BountySystem/Waypoint/WaypointArrow_Spare.uasset

diff --git a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml
index 3916127c..f1bd0652 100644
--- a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml
+++ b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml
@@ -7,12 +7,14 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="42162083-13f4-4956-90b7-146c4a08f785" name="Changes" comment="">
+    <list default="true" id="26816b31-ccb2-4b63-a865-e10119357d61" 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/ControlsTutorial/Bounty/MB_Training.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/BountySystem/ControlsTutorial/Bounty/MB_Training.uasset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Config/DefaultEngine.ini" beforeDir="false" afterPath="$PROJECT_DIR$/Config/DefaultEngine.ini" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_EnterSpaceShip.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_EnterSpaceShip.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/Ships/WBP_LandingZone.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Ships/WBP_LandingZone.uasset" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Content/StarterContent/Architecture/Floor_400x400.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/StarterContent/Architecture/Floor_400x400.uasset" 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" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -29,7 +31,7 @@
   "customColor": "",
   "associatedIndex": 5
 }]]></component>
-  <component name="ProjectId" id="2auydcK0pfqmRApN6dV8N1lcbgi" />
+  <component name="ProjectId" id="2axj7VLo5mt3MtbJCpe8p4iUfFz" />
   <component name="ProjectViewState">
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
@@ -39,7 +41,7 @@
     "C++ Project.EndlessVendetta.executor": "Run",
     "RunOnceActivity.OpenProjectViewOnStart": "true",
     "RunOnceActivity.ShowReadmeOnStart": "true",
-    "git-widget-placeholder": "GunRange-2.0",
+    "git-widget-placeholder": "dev",
     "ignore.virus.scanning.warn.message": "true",
     "node.js.detected.package.eslint": "true",
     "node.js.detected.package.tslint": "true",
@@ -122,12 +124,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="42162083-13f4-4956-90b7-146c4a08f785" name="Changes" comment="" />
-      <created>1705182847910</created>
+      <changelist id="26816b31-ccb2-4b63-a865-e10119357d61" name="Changes" comment="" />
+      <created>1705266956958</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
-      <updated>1705182847910</updated>
-      <workItem from="1705182850227" duration="29925000" />
+      <updated>1705266956958</updated>
+      <workItem from="1705266959805" duration="639000" />
     </task>
     <servers />
   </component>
diff --git a/EndlessVendetta/Config/DefaultEngine.ini b/EndlessVendetta/Config/DefaultEngine.ini
index 86791774..92c03963 100644
--- a/EndlessVendetta/Config/DefaultEngine.ini
+++ b/EndlessVendetta/Config/DefaultEngine.ini
@@ -82,7 +82,7 @@ r.Mobile.EnableNoPrecomputedLightingCSMShader=1
 r.DefaultFeature.AutoExposure.ExtendDefaultLuminanceRange=True
 r.DefaultFeature.AutoExposure.ExtendDefaultLuminanceRange=true
 r.Shadow.Virtual.Enable=1
-r.DefaultFeature.AutoExposure=True
+r.DefaultFeature.AutoExposure=False
 r.DefaultFeature.AutoExposure.Method=1
 r.DefaultFeature.AutoExposure.Bias=1.000000
 
diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_EnterSpaceShip.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_EnterSpaceShip.uasset
index 21d83b4f..0dacf6c4 100644
--- a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_EnterSpaceShip.uasset
+++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_EnterSpaceShip.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1987343e366409151ef7c36e30631fc38f37b77053f1be1d9c7b00702cf6efa4
+oid sha256:ed613e63504155e721996dea2f3180730a6b814cd3711ec6c49d2ed3f923cdf0
 size 30859
diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/WaypointArrow_Spare.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/WaypointArrow_Spare.uasset
new file mode 100644
index 00000000..5615bcf8
--- /dev/null
+++ b/EndlessVendetta/Content/BountySystem/Waypoint/WaypointArrow_Spare.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6b708b6b30eb850215814c477dde66f4a44cfcb6ab341740def05e06fa0789c3
+size 33744
diff --git a/EndlessVendetta/Content/Levels/ControlTutorialLevel.umap b/EndlessVendetta/Content/Levels/ControlTutorialLevel.umap
index adaa5976..2c2fd5ff 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:ff1376a8e80f10f69029821050f774faf8df4b6e31f394427eb93e319f097609
-size 3337229
+oid sha256:6042fc04821defc7b720e765d99816d4495ce8eda673104cc68a3f2bac0cb39d
+size 17250071
diff --git a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset
index 5662d4ec..c2a34afc 100644
--- a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset
+++ b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a23c4554fd388edf54a5da5402c2429f7d107d68c509eebcf096eed04617c45d
-size 14831
+oid sha256:4c0ecf0ac0702cc2bd355ec050232a61c49e10f102448efbeb735a51824adef6
+size 14948
diff --git a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset
index 0f990580..21158bbe 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:03320b24096353c95362945fb369bf45ee3c786efb531352bd8765cfd7c76926
+size 66790690