diff --git a/Artemis/Artemis.sln b/Artemis/Artemis.sln index 7fe9f29c7..180e87f3f 100644 --- a/Artemis/Artemis.sln +++ b/Artemis/Artemis.sln @@ -7,8 +7,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Artemis", "Artemis\Artemis. EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Razer2Artemis", "Razer2Artemis\Razer2Artemis.vcxproj", "{39711909-C1D5-46CE-A9EA-2D561692EA47}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnrealTournament2Artemis", "UnrealTournament2Artemis\UnrealTournament2Artemis.vcxproj", "{3541864F-1662-4BD6-8328-2C87AE61D152}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ColorBox", "ColorBox\ColorBox.csproj", "{40085232-ACED-4CBE-945B-90BA8153C151}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LogiLed2Artemis", "LogiLed2Artemis\LogiLed2Artemis.vcxproj", "{D2EDB8F3-F0CB-4670-B472-0B46D5800D2C}" @@ -90,34 +88,6 @@ Global {39711909-C1D5-46CE-A9EA-2D561692EA47}.SingleImage|x64.Build.0 = Release|x64 {39711909-C1D5-46CE-A9EA-2D561692EA47}.SingleImage|x86.ActiveCfg = Release|Win32 {39711909-C1D5-46CE-A9EA-2D561692EA47}.SingleImage|x86.Build.0 = Release|Win32 - {3541864F-1662-4BD6-8328-2C87AE61D152}.CD_ROM|Any CPU.ActiveCfg = Release|x64 - {3541864F-1662-4BD6-8328-2C87AE61D152}.CD_ROM|Any CPU.Build.0 = Release|x64 - {3541864F-1662-4BD6-8328-2C87AE61D152}.CD_ROM|x64.ActiveCfg = Release|x64 - {3541864F-1662-4BD6-8328-2C87AE61D152}.CD_ROM|x64.Build.0 = Release|x64 - {3541864F-1662-4BD6-8328-2C87AE61D152}.CD_ROM|x86.ActiveCfg = Release|Win32 - {3541864F-1662-4BD6-8328-2C87AE61D152}.CD_ROM|x86.Build.0 = Release|Win32 - {3541864F-1662-4BD6-8328-2C87AE61D152}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {3541864F-1662-4BD6-8328-2C87AE61D152}.Debug|x64.ActiveCfg = Debug|x64 - {3541864F-1662-4BD6-8328-2C87AE61D152}.Debug|x64.Build.0 = Debug|x64 - {3541864F-1662-4BD6-8328-2C87AE61D152}.Debug|x86.ActiveCfg = Debug|Win32 - {3541864F-1662-4BD6-8328-2C87AE61D152}.Debug|x86.Build.0 = Debug|Win32 - {3541864F-1662-4BD6-8328-2C87AE61D152}.DVD-5|Any CPU.ActiveCfg = Release|x64 - {3541864F-1662-4BD6-8328-2C87AE61D152}.DVD-5|Any CPU.Build.0 = Release|x64 - {3541864F-1662-4BD6-8328-2C87AE61D152}.DVD-5|x64.ActiveCfg = Debug|x64 - {3541864F-1662-4BD6-8328-2C87AE61D152}.DVD-5|x64.Build.0 = Debug|x64 - {3541864F-1662-4BD6-8328-2C87AE61D152}.DVD-5|x86.ActiveCfg = Debug|Win32 - {3541864F-1662-4BD6-8328-2C87AE61D152}.DVD-5|x86.Build.0 = Debug|Win32 - {3541864F-1662-4BD6-8328-2C87AE61D152}.Release|Any CPU.ActiveCfg = Release|Win32 - {3541864F-1662-4BD6-8328-2C87AE61D152}.Release|x64.ActiveCfg = Release|x64 - {3541864F-1662-4BD6-8328-2C87AE61D152}.Release|x64.Build.0 = Release|x64 - {3541864F-1662-4BD6-8328-2C87AE61D152}.Release|x86.ActiveCfg = Release|Win32 - {3541864F-1662-4BD6-8328-2C87AE61D152}.Release|x86.Build.0 = Release|Win32 - {3541864F-1662-4BD6-8328-2C87AE61D152}.SingleImage|Any CPU.ActiveCfg = Release|x64 - {3541864F-1662-4BD6-8328-2C87AE61D152}.SingleImage|Any CPU.Build.0 = Release|x64 - {3541864F-1662-4BD6-8328-2C87AE61D152}.SingleImage|x64.ActiveCfg = Release|x64 - {3541864F-1662-4BD6-8328-2C87AE61D152}.SingleImage|x64.Build.0 = Release|x64 - {3541864F-1662-4BD6-8328-2C87AE61D152}.SingleImage|x86.ActiveCfg = Release|Win32 - {3541864F-1662-4BD6-8328-2C87AE61D152}.SingleImage|x86.Build.0 = Release|Win32 {40085232-ACED-4CBE-945B-90BA8153C151}.CD_ROM|Any CPU.ActiveCfg = Release|Any CPU {40085232-ACED-4CBE-945B-90BA8153C151}.CD_ROM|Any CPU.Build.0 = Release|Any CPU {40085232-ACED-4CBE-945B-90BA8153C151}.CD_ROM|x64.ActiveCfg = Release|Any CPU diff --git a/Artemis/Artemis/Modules/Games/UnrealTournament/Resources/ut-plugin.zip b/Artemis/Artemis/Modules/Games/UnrealTournament/Resources/ut-plugin.zip index 68f048c55..80d8f3fbc 100644 Binary files a/Artemis/Artemis/Modules/Games/UnrealTournament/Resources/ut-plugin.zip and b/Artemis/Artemis/Modules/Games/UnrealTournament/Resources/ut-plugin.zip differ diff --git a/Artemis/Artemis/ViewModels/Profiles/ProfileEditorViewModel.cs b/Artemis/Artemis/ViewModels/Profiles/ProfileEditorViewModel.cs index 2903c27d7..f1ea13fa0 100644 --- a/Artemis/Artemis/ViewModels/Profiles/ProfileEditorViewModel.cs +++ b/Artemis/Artemis/ViewModels/Profiles/ProfileEditorViewModel.cs @@ -740,7 +740,7 @@ namespace Artemis.ViewModels.Profiles } _saving = false; - Execute.OnUIThread(() => UpdateLayerList(ProfileViewModel.SelectedLayer)); + //Execute.OnUIThread(() => UpdateLayerList(ProfileViewModel.SelectedLayer)); } } } \ No newline at end of file diff --git a/Artemis/UnrealTournament2Artemis/Artemis.uplugin b/Artemis/UnrealTournament2Artemis/Artemis.uplugin index 8ea2a6467..1e48f9cd3 100644 --- a/Artemis/UnrealTournament2Artemis/Artemis.uplugin +++ b/Artemis/UnrealTournament2Artemis/Artemis.uplugin @@ -2,10 +2,10 @@ "Version" : 1, "FileVersion": 3, "FriendlyName": "Artemis Plugin", - "VersionName": "1.0", + "VersionName": "1", "CreatedBy": "Robert Beekman", "CreatedByURL": "https://github.com/SpoinkyNL/Artemis", - "EngineVersion": "4.4.0", + "EngineVersion": "4.12.0", "Description": "Communicates with Artemis to let the main program know what's happening ingame", "Category": "UnrealTournament.Mod", "EnabledByDefault": true, diff --git a/Artemis/UnrealTournament2Artemis/Binaries/Win64/UE4-Artemis-Win64-Shipping.dll b/Artemis/UnrealTournament2Artemis/Binaries/Win64/UE4-Artemis-Win64-Shipping.dll index 87c719160..fad8730cb 100644 Binary files a/Artemis/UnrealTournament2Artemis/Binaries/Win64/UE4-Artemis-Win64-Shipping.dll and b/Artemis/UnrealTournament2Artemis/Binaries/Win64/UE4-Artemis-Win64-Shipping.dll differ diff --git a/Artemis/UnrealTournament2Artemis/Binaries/Win64/UE4-Win64-Shipping.modules b/Artemis/UnrealTournament2Artemis/Binaries/Win64/UE4-Win64-Shipping.modules index a577932a1..a1785bdf8 100644 --- a/Artemis/UnrealTournament2Artemis/Binaries/Win64/UE4-Win64-Shipping.modules +++ b/Artemis/UnrealTournament2Artemis/Binaries/Win64/UE4-Win64-Shipping.modules @@ -1,6 +1,6 @@ { - "Changelist" : 2897679, - "BuildId" : "5a8ef5b7-c9bb-42bd-ab7c-fb8e33f704ec", + "Changelist" : 3104517, + "BuildId" : "ea171f74-1095-4143-adb4-98b95d950129", "Modules" : { "Artemis" : "UE4-Artemis-Win64-Shipping.dll" diff --git a/Artemis/UnrealTournament2Artemis/Source/Private/Artemis.cpp b/Artemis/UnrealTournament2Artemis/Source/Private/Artemis.cpp index 3680cf068..657ee9e3e 100644 --- a/Artemis/UnrealTournament2Artemis/Source/Private/Artemis.cpp +++ b/Artemis/UnrealTournament2Artemis/Source/Private/Artemis.cpp @@ -48,7 +48,7 @@ void FArtemis::Tick(float DeltaTime) LastFrameCounter = GFrameCounter; - // We may be going 120hz, don't spam the device + // We may be going 120hz, don't spam the pipe DeltaTimeAccumulator += DeltaTime; if (DeltaTimeAccumulator < FrameTimeMinimum) { @@ -112,7 +112,7 @@ void FArtemis::Tick(float DeltaTime) { EnvironmentJson->RemoveField("Players"); } - + // Update player data // If character not found player must be spectating(?) if (!UTPC->GetUTCharacter()) @@ -132,7 +132,8 @@ void FArtemis::Tick(float DeltaTime) // Update HP and armor RootJson->SetStringField("State", "Alive"); PlayerJson->SetNumberField("Health", UTPC->GetUTCharacter()->Health); - PlayerJson->SetNumberField("Armor", UTPC->GetUTCharacter()->ArmorAmount); + // TODO: Crashes the game + // PlayerJson->SetNumberField("Armor", UTPC->GetUTCharacter()->GetArmorAmount()); // Update player powerups data TSharedRef InventoryJson(new FJsonObject()); @@ -146,6 +147,7 @@ void FArtemis::Tick(float DeltaTime) InventoryJson->SetBoolField("HasChestArmor", false); InventoryJson->SetBoolField("HasHelmet", false); + for (TInventoryIterator<> It(UTPC->GetUTCharacter()); It; ++It) { AUTInventory* InventoryItem = (*It); @@ -200,13 +202,14 @@ void FArtemis::Tick(float DeltaTime) WeaponJson->SetStringField("Name", "None"); } } + // Insert PlayerState JsonReport TSharedRef PlayerStateJson(new FJsonObject()); PlayerJson->SetObjectField("State", PlayerStateJson); if (UTPC->UTPlayerState) { UTPC->UTPlayerState->MakeJsonReport(PlayerStateJson); - } + } FJsonSerializer::Serialize(RootJson, Writer); WritePipe(Buffer); diff --git a/Artemis/UnrealTournament2Artemis/UnrealTournament2Artemis.vcxproj b/Artemis/UnrealTournament2Artemis/UnrealTournament2Artemis.vcxproj deleted file mode 100644 index b4cd9703f..000000000 --- a/Artemis/UnrealTournament2Artemis/UnrealTournament2Artemis.vcxproj +++ /dev/null @@ -1,165 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - {3541864F-1662-4BD6-8328-2C87AE61D152} - Win32Proj - UnrealTournament2Artemis - 8.1 - - - - DynamicLibrary - true - v140 - Unicode - - - DynamicLibrary - false - v140 - true - Unicode - - - DynamicLibrary - true - v140 - Unicode - - - DynamicLibrary - false - v140 - true - Unicode - - - - - - - - - - - - - - - - - - - - - true - - - true - - - false - - - false - - - - - - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;UNREALTOURNAMENT2ARTEMIS_EXPORTS;%(PreprocessorDefinitions) - true - - - Windows - true - - - - - - - Level3 - Disabled - _DEBUG;_WINDOWS;_USRDLL;UNREALTOURNAMENT2ARTEMIS_EXPORTS;%(PreprocessorDefinitions) - true - - - Windows - true - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;UNREALTOURNAMENT2ARTEMIS_EXPORTS;%(PreprocessorDefinitions) - true - - - Windows - true - true - true - - - - - Level3 - - - MaxSpeed - true - true - NDEBUG;_WINDOWS;_USRDLL;UNREALTOURNAMENT2ARTEMIS_EXPORTS;%(PreprocessorDefinitions) - true - - - Windows - true - true - true - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Artemis/UnrealTournament2Artemis/UnrealTournament2Artemis.vcxproj.filters b/Artemis/UnrealTournament2Artemis/UnrealTournament2Artemis.vcxproj.filters deleted file mode 100644 index 256e298e2..000000000 --- a/Artemis/UnrealTournament2Artemis/UnrealTournament2Artemis.vcxproj.filters +++ /dev/null @@ -1,45 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - - \ No newline at end of file diff --git a/Artemis/UnrealTournament2Artemis/ut-plugin.zip b/Artemis/UnrealTournament2Artemis/ut-plugin.zip deleted file mode 100644 index c013a0f6f..000000000 Binary files a/Artemis/UnrealTournament2Artemis/ut-plugin.zip and /dev/null differ