diff --git a/Artemis/Artemis/App.config b/Artemis/Artemis/App.config index eb58324d3..c2fc93200 100644 --- a/Artemis/Artemis/App.config +++ b/Artemis/Artemis/App.config @@ -3,6 +3,8 @@ +
+
@@ -22,6 +24,49 @@ + + + True + + + + + True + + + + + + True + + + True + + + True + + + True + + + True + + + #FFFF0000 + + + #FF0000FF + + + Default + + + #FF00FF00 + + + #FF6A5ACD + + True @@ -243,6 +288,10 @@ + + + + diff --git a/Artemis/Artemis/App.xaml b/Artemis/Artemis/App.xaml index 110eccc23..bae7d6958 100644 --- a/Artemis/Artemis/App.xaml +++ b/Artemis/Artemis/App.xaml @@ -1,25 +1,25 @@ - - - - - - - - - - - - - - - - - - + xmlns:artemis="clr-namespace:Artemis" + DispatcherUnhandledException="Application_DispatcherUnhandledException" + ShutdownMode="OnExplicitShutdown"> + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Artemis/Artemis/App.xaml.cs b/Artemis/Artemis/App.xaml.cs index 29b2f9489..04e288836 100644 --- a/Artemis/Artemis/App.xaml.cs +++ b/Artemis/Artemis/App.xaml.cs @@ -1,6 +1,7 @@ using System; using System.Windows; using System.Windows.Threading; +using Artemis.Utilities; using WpfExceptionViewer; namespace Artemis @@ -12,6 +13,9 @@ namespace Artemis { public App() { + if (!GeneralHelpers.IsRunAsAdministrator()) + GeneralHelpers.RunAsAdministrator(); + InitializeComponent(); } diff --git a/Artemis/Artemis/Artemis.csproj b/Artemis/Artemis/Artemis.csproj index ef47f3c4b..1ea60910f 100644 --- a/Artemis/Artemis/Artemis.csproj +++ b/Artemis/Artemis/Artemis.csproj @@ -39,7 +39,7 @@ Artemis Artemis 0 - 1.0.2.0 + 1.0.3.0 false true true @@ -118,6 +118,7 @@ MinimumRecommendedRules.ruleset true + ..\packages\Autofac.4.0.0-rc1-177\lib\net45\Autofac.dll @@ -139,14 +140,18 @@ ..\packages\Colore.4.0.0\lib\net35\Corale.Colore.dll True - - ..\packages\CUE.NET.1.0.2.1\lib\net45\CUE.NET.dll + + ..\packages\CUE.NET.1.0.2.2\lib\net45\CUE.NET.dll True ..\packages\Hardcodet.NotifyIcon.Wpf.1.0.5\lib\net451\Hardcodet.Wpf.TaskbarNotification.dll True + + ..\packages\ImageLibrary.2.0.5\lib\net45\Kaliko.ImageLibrary.dll + True + ..\packages\log4net.2.0.5\lib\net45-full\log4net.dll True @@ -166,6 +171,22 @@ ..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll True + + ..\packages\Screna.0.1.3\lib\Screna.dll + True + + + ..\packages\SharpDX.3.0.2\lib\net45\SharpDX.dll + True + + + ..\packages\SharpDX.Direct3D11.3.0.2\lib\net45\SharpDX.Direct3D11.dll + True + + + ..\packages\SharpDX.DXGI.3.0.2\lib\net45\SharpDX.DXGI.dll + True + @@ -248,12 +269,21 @@ + + + + AmbientLightningEffectView.xaml + + + AudioVisualization.settings True True + + @@ -270,12 +300,32 @@ + + True + True + Dota2.settings + + + + RocketLeague.settings True True + + True + True + TheDivision.settings + + + + + + TheDivisionView.xaml + + True @@ -315,13 +365,15 @@ True Offsets.settings - - + + + + @@ -329,6 +381,7 @@ + @@ -405,6 +458,7 @@ ResXFileCodeGenerator Resources.Designer.cs + Designer SettingsSingleFileGenerator @@ -418,10 +472,18 @@ SettingsSingleFileGenerator CounterStrike.Designer.cs + + SettingsSingleFileGenerator + Dota2.Designer.cs + SettingsSingleFileGenerator RocketLeague.Designer.cs + + SettingsSingleFileGenerator + TheDivision.Designer.cs + SettingsSingleFileGenerator Witcher3.Designer.cs @@ -440,6 +502,8 @@ + + @@ -456,6 +520,14 @@ + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + MSBuild:Compile Designer @@ -529,10 +601,7 @@ PreserveNewest - - PreserveNewest - - + @@ -546,13 +615,14 @@ false + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + + +