diff --git a/Artemis/Artemis/Artemis.csproj b/Artemis/Artemis/Artemis.csproj
index 4284da4c1..e74a5a795 100644
--- a/Artemis/Artemis/Artemis.csproj
+++ b/Artemis/Artemis/Artemis.csproj
@@ -629,10 +629,12 @@
Code
+
SettingsSingleFileGenerator
UnrealTournament.Designer.cs
+
SettingsSingleFileGenerator
WoW.Designer.cs
@@ -716,7 +718,6 @@
-
SettingsSingleFileGenerator
Offsets.Designer.cs
diff --git a/Artemis/Artemis/Managers/MainManager.cs b/Artemis/Artemis/Managers/MainManager.cs
index bec1c129d..ff7695383 100644
--- a/Artemis/Artemis/Managers/MainManager.cs
+++ b/Artemis/Artemis/Managers/MainManager.cs
@@ -25,8 +25,8 @@ namespace Artemis.Managers
private readonly IEventAggregator _events;
private readonly Timer _processTimer;
- public MainManager(IEventAggregator events, ILogger logger, LoopManager loopManager,
- DeviceManager deviceManager, EffectManager effectManager, ProfileManager profileManager)
+ public MainManager(IEventAggregator events, ILogger logger, LoopManager loopManager, DeviceManager deviceManager,
+ EffectManager effectManager, ProfileManager profileManager, PipeServer pipeServer)
{
_events = events;
@@ -35,6 +35,7 @@ namespace Artemis.Managers
DeviceManager = deviceManager;
EffectManager = effectManager;
ProfileManager = profileManager;
+ PipeServer = pipeServer;
_processTimer = new Timer(1000);
_processTimer.Elapsed += ScanProcesses;
@@ -48,7 +49,6 @@ namespace Artemis.Managers
GameStateWebServer.Start();
// Start the named pipe
- PipeServer = new PipeServer();
PipeServer.Start("artemis");
Logger.Info("Intialized MainManager");
diff --git a/Artemis/Artemis/Modules/Games/Overwatch/OverwatchView.xaml b/Artemis/Artemis/Modules/Games/Overwatch/OverwatchView.xaml
index 6408374cd..a3b7186aa 100644
--- a/Artemis/Artemis/Modules/Games/Overwatch/OverwatchView.xaml
+++ b/Artemis/Artemis/Modules/Games/Overwatch/OverwatchView.xaml
@@ -17,8 +17,8 @@
-
+
+
diff --git a/Artemis/Artemis/Modules/Games/UnrealTournament/Resources/ut-plugin.zip b/Artemis/Artemis/Modules/Games/UnrealTournament/Resources/ut-plugin.zip
new file mode 100644
index 000000000..c013a0f6f
Binary files /dev/null and b/Artemis/Artemis/Modules/Games/UnrealTournament/Resources/ut-plugin.zip differ
diff --git a/Artemis/Artemis/Modules/Games/UnrealTournament/UnrealTournamentSettings.cs b/Artemis/Artemis/Modules/Games/UnrealTournament/UnrealTournamentSettings.cs
index f172da3e3..9b27c884a 100644
--- a/Artemis/Artemis/Modules/Games/UnrealTournament/UnrealTournamentSettings.cs
+++ b/Artemis/Artemis/Modules/Games/UnrealTournament/UnrealTournamentSettings.cs
@@ -9,16 +9,20 @@ namespace Artemis.Modules.Games.UnrealTournament
Load();
}
+ public string GameDirectory { get; set; }
+
public sealed override void Load()
{
Enabled = UnrealTournament.Default.Enabled;
LastProfile = UnrealTournament.Default.LastProfile;
+ GameDirectory = UnrealTournament.Default.GameDirectory;
}
public sealed override void Save()
{
UnrealTournament.Default.Enabled = Enabled;
UnrealTournament.Default.LastProfile = LastProfile;
+ UnrealTournament.Default.GameDirectory = GameDirectory;
UnrealTournament.Default.Save();
}
@@ -26,6 +30,7 @@ namespace Artemis.Modules.Games.UnrealTournament
public sealed override void ToDefault()
{
Enabled = true;
+ GameDirectory = string.Empty;
}
}
}
\ No newline at end of file
diff --git a/Artemis/Artemis/Modules/Games/UnrealTournament/UnrealTournamentView.xaml b/Artemis/Artemis/Modules/Games/UnrealTournament/UnrealTournamentView.xaml
index 8f25cab9b..1da2e2589 100644
--- a/Artemis/Artemis/Modules/Games/UnrealTournament/UnrealTournamentView.xaml
+++ b/Artemis/Artemis/Modules/Games/UnrealTournament/UnrealTournamentView.xaml
@@ -15,15 +15,12 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+