diff --git a/.vsconfig b/.vsconfig index 1a9d718..7f5f4b3 100644 --- a/.vsconfig +++ b/.vsconfig @@ -2,9 +2,9 @@ "version": "1.0", "components": [ "Microsoft.Net.Component.4.6.2.TargetingPack", - "Microsoft.VisualStudio.Component.VC.14.36.17.6.x86.x64", + "Microsoft.VisualStudio.Component.VC.14.38.17.8.x86.x64", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", - "Microsoft.VisualStudio.Component.Windows10SDK.22000", + "Microsoft.VisualStudio.Component.Windows10SDK.22621", "Microsoft.VisualStudio.Workload.CoreEditor", "Microsoft.VisualStudio.Workload.ManagedDesktop", "Microsoft.VisualStudio.Workload.NativeDesktop", diff --git a/Config/DefaultEditor.ini b/Config/DefaultEditor.ini index 4ecb6eb..42106a6 100644 --- a/Config/DefaultEditor.ini +++ b/Config/DefaultEditor.ini @@ -5,4 +5,7 @@ SimpleMapName=/Game/TP_ThirdPerson/Maps/ThirdPersonExampleMap bAllowClassAndBlueprintPinMatching=true bReplaceBlueprintWithClass= true bDontLoadBlueprintOutsideEditor= true -bBlueprintIsNotBlueprintType= true \ No newline at end of file +bBlueprintIsNotBlueprintType= true + +[/Script/AdvancedPreviewScene.SharedProfiles] + diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index 6f24f3f..2996a71 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -21,6 +21,7 @@ r.Mobile.EnableNoPrecomputedLightingCSMShader=1 r.DefaultFeature.AutoExposure.ExtendDefaultLuminanceRange=True r.DefaultFeature.AutoExposure.ExtendDefaultLuminanceRange=true net.AllowPIESeamlessTravel=true +r.DefaultFeature.AutoExposure=False [/Script/WindowsTargetPlatform.WindowsTargetSettings] DefaultGraphicsRHI=DefaultGraphicsRHI_DX12 @@ -98,4 +99,5 @@ NetConnectionClassName="OnlineSubsystemSteam.SteamNetConnection" net.CurrentHandshakeVersion=2 net.MinHandshakeVersion=2 net.VerifyNetSessionID=0 -net.VerifyNetClientID=0 \ No newline at end of file +net.VerifyNetClientID=0 + diff --git a/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset b/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset index 6c2e5d8..d0db62d 100644 Binary files a/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset and b/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset differ diff --git a/Content/ThirdPerson/Blueprints/BP_PC_Game.uasset b/Content/ThirdPerson/Blueprints/BP_PC_Game.uasset index 8da308a..069c85a 100644 Binary files a/Content/ThirdPerson/Blueprints/BP_PC_Game.uasset and b/Content/ThirdPerson/Blueprints/BP_PC_Game.uasset differ diff --git a/Content/ThirdPerson/Blueprints/BP_PS_Game.uasset b/Content/ThirdPerson/Blueprints/BP_PS_Game.uasset index 5eb16b3..5fa0bd5 100644 Binary files a/Content/ThirdPerson/Blueprints/BP_PS_Game.uasset and b/Content/ThirdPerson/Blueprints/BP_PS_Game.uasset differ diff --git a/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset b/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset index a663c12..1148fea 100644 Binary files a/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset and b/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset differ diff --git a/Content/ThirdPerson/Blueprints/BP_ThirdPersonGameMode.uasset b/Content/ThirdPerson/Blueprints/BP_ThirdPersonGameMode.uasset index 1b88bd2..09ddd2a 100644 Binary files a/Content/ThirdPerson/Blueprints/BP_ThirdPersonGameMode.uasset and b/Content/ThirdPerson/Blueprints/BP_ThirdPersonGameMode.uasset differ diff --git a/Content/ThirdPerson/Maps/MainMenu.umap b/Content/ThirdPerson/Maps/MainMenu.umap index e9b61bd..4882de7 100644 Binary files a/Content/ThirdPerson/Maps/MainMenu.umap and b/Content/ThirdPerson/Maps/MainMenu.umap differ diff --git a/Content/ThirdPerson/Maps/ThirdPersonMap.umap b/Content/ThirdPerson/Maps/ThirdPersonMap.umap index e5afa11..3392931 100644 Binary files a/Content/ThirdPerson/Maps/ThirdPersonMap.umap and b/Content/ThirdPerson/Maps/ThirdPersonMap.umap differ diff --git a/Content/ThirdPerson/Widgets/WBP_Menu.uasset b/Content/ThirdPerson/Widgets/WBP_Menu.uasset index ee49cf7..96bd439 100644 Binary files a/Content/ThirdPerson/Widgets/WBP_Menu.uasset and b/Content/ThirdPerson/Widgets/WBP_Menu.uasset differ diff --git a/Content/ThirdPerson/Widgets/WBP_PlayerList.uasset b/Content/ThirdPerson/Widgets/WBP_PlayerList.uasset index 2cfa625..2b0de88 100644 Binary files a/Content/ThirdPerson/Widgets/WBP_PlayerList.uasset and b/Content/ThirdPerson/Widgets/WBP_PlayerList.uasset differ diff --git a/Content/ThirdPerson/Widgets/WBP_Server.uasset b/Content/ThirdPerson/Widgets/WBP_Server.uasset index 971b463..0079173 100644 Binary files a/Content/ThirdPerson/Widgets/WBP_Server.uasset and b/Content/ThirdPerson/Widgets/WBP_Server.uasset differ diff --git a/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/4/FM/LV2R1IVMW8NNS6L9TUGWK5.uasset b/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/4/FM/LV2R1IVMW8NNS6L9TUGWK5.uasset new file mode 100644 index 0000000..e5bdfb7 Binary files /dev/null and b/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/4/FM/LV2R1IVMW8NNS6L9TUGWK5.uasset differ diff --git a/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/6/9O/UWJEYCV4SWO35R318B2LBX.uasset b/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/6/9O/UWJEYCV4SWO35R318B2LBX.uasset new file mode 100644 index 0000000..8c1868c Binary files /dev/null and b/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/6/9O/UWJEYCV4SWO35R318B2LBX.uasset differ diff --git a/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/A/EO/7OE3KTH9D5C0SEG9HR5TTS.uasset b/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/A/EO/7OE3KTH9D5C0SEG9HR5TTS.uasset new file mode 100644 index 0000000..7c2f499 Binary files /dev/null and b/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/A/EO/7OE3KTH9D5C0SEG9HR5TTS.uasset differ diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/AdvancedSessions.uplugin b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/AdvancedSessions.uplugin similarity index 94% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/AdvancedSessions.uplugin rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/AdvancedSessions.uplugin index 594ee8f..7dc2e3a 100644 --- a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/AdvancedSessions.uplugin +++ b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/AdvancedSessions.uplugin @@ -1,8 +1,8 @@ { "FileVersion": 3, "FriendlyName": "Advanced Sessions", - "Version": 5.1, - "VersionName": "5.1", + "Version": 5.4, + "VersionName": "5.4", "Description": "Adds new blueprint functions to handle more advanced session operations.", "Category": "Advanced Sessions Plugin", "CreatedBy": "Joshua Statzer", diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Config/FilterPlugin.ini b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Config/FilterPlugin.ini similarity index 100% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Config/FilterPlugin.ini rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Config/FilterPlugin.ini diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Resources/Icon128.png b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Resources/Icon128.png similarity index 100% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Resources/Icon128.png rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Resources/Icon128.png diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/AdvancedSessions.Build.cs b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/AdvancedSessions.Build.cs similarity index 100% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/AdvancedSessions.Build.cs rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/AdvancedSessions.Build.cs diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedExternalUILibrary.h b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedExternalUILibrary.h similarity index 100% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedExternalUILibrary.h rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedExternalUILibrary.h diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedFriendsGameInstance.h b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedFriendsGameInstance.h similarity index 100% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedFriendsGameInstance.h rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedFriendsGameInstance.h diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedFriendsInterface.h b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedFriendsInterface.h similarity index 100% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedFriendsInterface.h rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedFriendsInterface.h diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedFriendsLibrary.h b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedFriendsLibrary.h similarity index 100% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedFriendsLibrary.h rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedFriendsLibrary.h diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedGameSession.h b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedGameSession.h similarity index 100% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedGameSession.h rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedGameSession.h diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedIdentityLibrary.h b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedIdentityLibrary.h similarity index 100% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedIdentityLibrary.h rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedIdentityLibrary.h diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedSessions.h b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedSessions.h similarity index 100% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedSessions.h rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedSessions.h diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedSessionsLibrary.h b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedSessionsLibrary.h similarity index 100% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedSessionsLibrary.h rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedSessionsLibrary.h diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedVoiceLibrary.h b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedVoiceLibrary.h similarity index 100% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedVoiceLibrary.h rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedVoiceLibrary.h diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AutoLoginUserCallbackProxy.h b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AutoLoginUserCallbackProxy.h similarity index 100% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AutoLoginUserCallbackProxy.h rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AutoLoginUserCallbackProxy.h diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/BlueprintDataDefinitions.h b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/BlueprintDataDefinitions.h similarity index 100% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/BlueprintDataDefinitions.h rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/BlueprintDataDefinitions.h diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/CancelFindSessionsCallbackProxy.h b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/CancelFindSessionsCallbackProxy.h similarity index 100% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/CancelFindSessionsCallbackProxy.h rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/CancelFindSessionsCallbackProxy.h diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/CreateSessionCallbackProxyAdvanced.h b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/CreateSessionCallbackProxyAdvanced.h similarity index 100% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/CreateSessionCallbackProxyAdvanced.h rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/CreateSessionCallbackProxyAdvanced.h diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/EndSessionCallbackProxy.h b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/EndSessionCallbackProxy.h similarity index 100% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/EndSessionCallbackProxy.h rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/EndSessionCallbackProxy.h diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/FindFriendSessionCallbackProxy.h b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/FindFriendSessionCallbackProxy.h similarity index 100% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/FindFriendSessionCallbackProxy.h rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/FindFriendSessionCallbackProxy.h diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/FindSessionsCallbackProxyAdvanced.h b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/FindSessionsCallbackProxyAdvanced.h similarity index 100% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/FindSessionsCallbackProxyAdvanced.h rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/FindSessionsCallbackProxyAdvanced.h diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/GetFriendsCallbackProxy.h b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/GetFriendsCallbackProxy.h similarity index 100% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/GetFriendsCallbackProxy.h rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/GetFriendsCallbackProxy.h diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/GetRecentPlayersCallbackProxy.h b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/GetRecentPlayersCallbackProxy.h similarity index 100% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/GetRecentPlayersCallbackProxy.h rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/GetRecentPlayersCallbackProxy.h diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/GetUserPrivilegeCallbackProxy.h b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/GetUserPrivilegeCallbackProxy.h similarity index 100% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/GetUserPrivilegeCallbackProxy.h rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/GetUserPrivilegeCallbackProxy.h diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/LoginUserCallbackProxy.h b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/LoginUserCallbackProxy.h similarity index 100% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/LoginUserCallbackProxy.h rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/LoginUserCallbackProxy.h diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/LogoutUserCallbackProxy.h b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/LogoutUserCallbackProxy.h similarity index 100% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/LogoutUserCallbackProxy.h rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/LogoutUserCallbackProxy.h diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/OnlineSubSystemHeader.h b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/OnlineSubSystemHeader.h similarity index 100% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/OnlineSubSystemHeader.h rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/OnlineSubSystemHeader.h diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/SendFriendInviteCallbackProxy.h b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/SendFriendInviteCallbackProxy.h similarity index 100% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/SendFriendInviteCallbackProxy.h rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/SendFriendInviteCallbackProxy.h diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/StartSessionCallbackProxyAdvanced.h b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/StartSessionCallbackProxyAdvanced.h similarity index 100% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/StartSessionCallbackProxyAdvanced.h rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/StartSessionCallbackProxyAdvanced.h diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/UpdateSessionCallbackProxyAdvanced.h b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/UpdateSessionCallbackProxyAdvanced.h similarity index 100% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/UpdateSessionCallbackProxyAdvanced.h rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/UpdateSessionCallbackProxyAdvanced.h diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedExternalUILibrary.cpp b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedExternalUILibrary.cpp similarity index 100% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedExternalUILibrary.cpp rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedExternalUILibrary.cpp diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedFriendsGameInstance.cpp b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedFriendsGameInstance.cpp similarity index 100% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedFriendsGameInstance.cpp rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedFriendsGameInstance.cpp diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedFriendsInterface.cpp b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedFriendsInterface.cpp similarity index 100% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedFriendsInterface.cpp rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedFriendsInterface.cpp diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedFriendsLibrary.cpp b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedFriendsLibrary.cpp similarity index 83% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedFriendsLibrary.cpp rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedFriendsLibrary.cpp index 1af7a5b..5df1a94 100644 --- a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedFriendsLibrary.cpp +++ b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedFriendsLibrary.cpp @@ -138,7 +138,7 @@ void UAdvancedFriendsLibrary::GetFriend(APlayerController *PlayerController, con TSharedPtr fr = FriendsInterface->GetFriend(Player->GetControllerId(), *FriendUniqueNetId.GetUniqueNetId(), EFriendsLists::ToString(EFriendsLists::Default)); if (fr.IsValid()) { - FOnlineUserPresence pres = fr->GetPresence(); + const FOnlineUserPresence& pres = fr->GetPresence(); Friend.DisplayName = fr->GetDisplayName(); Friend.OnlineState = ((EBPOnlinePresenceState)((int32)pres.Status.State)); Friend.RealName = fr->GetRealName(); @@ -151,7 +151,8 @@ void UAdvancedFriendsLibrary::GetFriend(APlayerController *PlayerController, con Friend.PresenceInfo.bIsPlaying = pres.bIsPlaying; Friend.PresenceInfo.bIsPlayingThisGame = pres.bIsPlayingThisGame; Friend.PresenceInfo.PresenceState = ((EBPOnlinePresenceState)((int32)pres.Status.State)); - Friend.PresenceInfo.StatusString = pres.Status.StatusStr; + // #TODO: Check back in on this in shipping, epic is missing the UTF8_TO_TCHAR call on converting this and its making an invalid string + //Friend.PresenceInfo.StatusString = pres.Status.StatusStr; } } @@ -247,28 +248,34 @@ void UAdvancedFriendsLibrary::GetStoredFriendsList(APlayerController *PlayerCont TArray< TSharedRef > FriendList; - FriendsInterface->GetFriendsList(Player->GetControllerId(), EFriendsLists::ToString((EFriendsLists::Default)), FriendList); - - for (int32 i = 0; i < FriendList.Num(); i++) + if (FriendsInterface->GetFriendsList(Player->GetControllerId(), EFriendsLists::ToString((EFriendsLists::Default)), FriendList)) { - TSharedRef Friend = FriendList[i]; - FBPFriendInfo BPF; - FOnlineUserPresence pres = Friend->GetPresence(); + for (int32 i = 0; i < FriendList.Num(); i++) + { + FBPFriendInfo BPF; + const FOnlineUserPresence& pres = FriendList[i]->GetPresence(); - BPF.OnlineState = ((EBPOnlinePresenceState)((int32)pres.Status.State)); - BPF.DisplayName = Friend->GetDisplayName(); - BPF.RealName = Friend->GetRealName(); - BPF.UniqueNetId.SetUniqueNetId(Friend->GetUserId()); - BPF.bIsPlayingSameGame = pres.bIsPlayingThisGame; + BPF.OnlineState = ((EBPOnlinePresenceState)((int32)pres.Status.State)); + BPF.DisplayName = FriendList[i]->GetDisplayName(); + BPF.RealName = FriendList[i]->GetRealName(); + BPF.UniqueNetId.SetUniqueNetId(FriendList[i]->GetUserId()); + BPF.bIsPlayingSameGame = pres.bIsPlayingThisGame; - BPF.PresenceInfo.bIsOnline = pres.bIsOnline; - BPF.PresenceInfo.bHasVoiceSupport = pres.bHasVoiceSupport; - BPF.PresenceInfo.bIsPlaying = pres.bIsPlaying; - BPF.PresenceInfo.PresenceState = ((EBPOnlinePresenceState)((int32)pres.Status.State)); - BPF.PresenceInfo.StatusString = pres.Status.StatusStr; - BPF.PresenceInfo.bIsJoinable = pres.bIsJoinable; - BPF.PresenceInfo.bIsPlayingThisGame = pres.bIsPlayingThisGame; + BPF.PresenceInfo.bIsOnline = pres.bIsOnline; + BPF.PresenceInfo.bHasVoiceSupport = pres.bHasVoiceSupport; + BPF.PresenceInfo.bIsPlaying = pres.bIsPlaying; + BPF.PresenceInfo.PresenceState = ((EBPOnlinePresenceState)((int32)pres.Status.State)); + // #TODO: Check back in on this in shipping, epic is missing the UTF8_TO_TCHAR call on converting this and its making an invalid string + //BPF.PresenceInfo.StatusString = pres.Status.StatusStr; + BPF.PresenceInfo.bIsJoinable = pres.bIsJoinable; + BPF.PresenceInfo.bIsPlayingThisGame = pres.bIsPlayingThisGame; - FriendsList.Add(BPF); + FriendsList.Add(BPF); + } + + return; } + + UE_LOG(AdvancedFriendsLog, Warning, TEXT("GetFriendsList Failed to get any friends!")); + return; } \ No newline at end of file diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedIdentityLibrary.cpp b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedIdentityLibrary.cpp similarity index 100% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedIdentityLibrary.cpp rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedIdentityLibrary.cpp diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedSessions.cpp b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedSessions.cpp similarity index 100% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedSessions.cpp rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedSessions.cpp diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedSessionsLibrary.cpp b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedSessionsLibrary.cpp similarity index 100% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedSessionsLibrary.cpp rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedSessionsLibrary.cpp diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedVoiceLibrary.cpp b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedVoiceLibrary.cpp similarity index 100% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedVoiceLibrary.cpp rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedVoiceLibrary.cpp diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AutoLoginUserCallbackProxy.cpp b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AutoLoginUserCallbackProxy.cpp similarity index 100% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AutoLoginUserCallbackProxy.cpp rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AutoLoginUserCallbackProxy.cpp diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/CancelFindSessionsCallbackProxy.cpp b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/CancelFindSessionsCallbackProxy.cpp similarity index 100% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/CancelFindSessionsCallbackProxy.cpp rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/CancelFindSessionsCallbackProxy.cpp diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/CreateSessionCallbackProxyAdvanced.cpp b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/CreateSessionCallbackProxyAdvanced.cpp similarity index 100% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/CreateSessionCallbackProxyAdvanced.cpp rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/CreateSessionCallbackProxyAdvanced.cpp diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/EndSessionCallbackProxy.cpp b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/EndSessionCallbackProxy.cpp similarity index 100% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/EndSessionCallbackProxy.cpp rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/EndSessionCallbackProxy.cpp diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/FindFriendSessionCallbackProxy.cpp b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/FindFriendSessionCallbackProxy.cpp similarity index 100% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/FindFriendSessionCallbackProxy.cpp rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/FindFriendSessionCallbackProxy.cpp diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/FindSessionsCallbackProxyAdvanced.cpp b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/FindSessionsCallbackProxyAdvanced.cpp similarity index 98% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/FindSessionsCallbackProxyAdvanced.cpp rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/FindSessionsCallbackProxyAdvanced.cpp index 16f3721..dc0dc4b 100644 --- a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/FindSessionsCallbackProxyAdvanced.cpp +++ b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/FindSessionsCallbackProxyAdvanced.cpp @@ -115,8 +115,8 @@ void UFindSessionsCallbackProxyAdvanced::Activate() case EBPServerPresenceSearchType::ClientServersOnly: { tem.Set(SEARCH_PRESENCE, true, EOnlineComparisonOp::Equals); - - if (bSearchLobbies) + + if (bSearchLobbies && !IOnlineSubsystem::DoesInstanceExist("STEAM")) tem.Set(SEARCH_LOBBIES, true, EOnlineComparisonOp::Equals); } break; @@ -142,7 +142,7 @@ void UFindSessionsCallbackProxyAdvanced::Activate() tem.Set(SEARCH_PRESENCE, true, EOnlineComparisonOp::Equals); - if (bSearchLobbies) + if (bSearchLobbies && !IOnlineSubsystem::DoesInstanceExist("STEAM")) tem.Set(SEARCH_LOBBIES, true, EOnlineComparisonOp::Equals); //DedicatedOnly.Set(SEARCH_DEDICATED_ONLY, true, EOnlineComparisonOp::Equals); diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/GetFriendsCallbackProxy.cpp b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/GetFriendsCallbackProxy.cpp similarity index 72% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/GetFriendsCallbackProxy.cpp rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/GetFriendsCallbackProxy.cpp index 8886fef..2d1d738 100644 --- a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/GetFriendsCallbackProxy.cpp +++ b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/GetFriendsCallbackProxy.cpp @@ -76,29 +76,31 @@ void UGetFriendsCallbackProxy::OnReadFriendsListCompleted(int32 LocalUserNum, bo TArray FriendsListOut; TArray< TSharedRef > FriendList; - Friends->GetFriendsList(LocalUserNum, ListName, FriendList); - - for (int32 i = 0; i < FriendList.Num(); i++) + if (Friends->GetFriendsList(LocalUserNum, ListName, FriendList)) { - TSharedRef Friend = FriendList[i]; - FBPFriendInfo BPF; - FOnlineUserPresence pres = Friend->GetPresence(); - BPF.OnlineState = ((EBPOnlinePresenceState)((int32)pres.Status.State)); - BPF.DisplayName = Friend->GetDisplayName(); - BPF.RealName = Friend->GetRealName(); - BPF.UniqueNetId.SetUniqueNetId(Friend->GetUserId()); - BPF.bIsPlayingSameGame = pres.bIsPlayingThisGame; + for (int32 i = 0; i < FriendList.Num(); i++) + { + FBPFriendInfo BPF; + const FOnlineUserPresence& pres = FriendList[i]->GetPresence(); + BPF.OnlineState = ((EBPOnlinePresenceState)((int32)pres.Status.State)); + BPF.DisplayName = FriendList[i]->GetDisplayName(); + BPF.RealName = FriendList[i]->GetRealName(); + BPF.UniqueNetId.SetUniqueNetId(FriendList[i]->GetUserId()); + BPF.bIsPlayingSameGame = pres.bIsPlayingThisGame; - BPF.PresenceInfo.bIsOnline = pres.bIsOnline; - BPF.PresenceInfo.bHasVoiceSupport = pres.bHasVoiceSupport; - BPF.PresenceInfo.bIsPlaying = pres.bIsPlaying; - BPF.PresenceInfo.PresenceState = ((EBPOnlinePresenceState)((int32)pres.Status.State)); - BPF.PresenceInfo.StatusString = pres.Status.StatusStr; - BPF.PresenceInfo.bIsJoinable = pres.bIsJoinable; - BPF.PresenceInfo.bIsPlayingThisGame = pres.bIsPlayingThisGame; + BPF.PresenceInfo.bIsOnline = pres.bIsOnline; + BPF.PresenceInfo.bHasVoiceSupport = pres.bHasVoiceSupport; + BPF.PresenceInfo.bIsPlaying = pres.bIsPlaying; + BPF.PresenceInfo.PresenceState = ((EBPOnlinePresenceState)((int32)pres.Status.State)); + + // #TODO: Check back in on this in shipping, epic is missing the UTF8_TO_TCHAR call on converting this and its making an invalid string + //BPF.PresenceInfo.StatusString = pres.Status.StatusStr; + BPF.PresenceInfo.bIsJoinable = pres.bIsJoinable; + BPF.PresenceInfo.bIsPlayingThisGame = pres.bIsPlayingThisGame; - FriendsListOut.Add(BPF); + FriendsListOut.Add(BPF); + } } OnSuccess.Broadcast(FriendsListOut); diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/GetRecentPlayersCallbackProxy.cpp b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/GetRecentPlayersCallbackProxy.cpp similarity index 100% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/GetRecentPlayersCallbackProxy.cpp rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/GetRecentPlayersCallbackProxy.cpp diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/GetUserPrivilegeCallbackProxy.cpp b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/GetUserPrivilegeCallbackProxy.cpp similarity index 100% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/GetUserPrivilegeCallbackProxy.cpp rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/GetUserPrivilegeCallbackProxy.cpp diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/LoginUserCallbackProxy.cpp b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/LoginUserCallbackProxy.cpp similarity index 100% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/LoginUserCallbackProxy.cpp rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/LoginUserCallbackProxy.cpp diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/LogoutUserCallbackProxy.cpp b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/LogoutUserCallbackProxy.cpp similarity index 100% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/LogoutUserCallbackProxy.cpp rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/LogoutUserCallbackProxy.cpp diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/SendFriendInviteCallbackProxy.cpp b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/SendFriendInviteCallbackProxy.cpp similarity index 100% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/SendFriendInviteCallbackProxy.cpp rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/SendFriendInviteCallbackProxy.cpp diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/StartSessionCallbackProxyAdvanced.cpp b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/StartSessionCallbackProxyAdvanced.cpp similarity index 100% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/StartSessionCallbackProxyAdvanced.cpp rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/StartSessionCallbackProxyAdvanced.cpp diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/UpdateSessionCallbackProxyAdvanced.cpp b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/UpdateSessionCallbackProxyAdvanced.cpp similarity index 100% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/UpdateSessionCallbackProxyAdvanced.cpp rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/UpdateSessionCallbackProxyAdvanced.cpp diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSteamSessions/AdvancedSteamSessions.uplugin b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSteamSessions/AdvancedSteamSessions.uplugin similarity index 86% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSteamSessions/AdvancedSteamSessions.uplugin rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSteamSessions/AdvancedSteamSessions.uplugin index 049c61d..307c51e 100644 --- a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSteamSessions/AdvancedSteamSessions.uplugin +++ b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSteamSessions/AdvancedSteamSessions.uplugin @@ -2,8 +2,8 @@ "FileVersion" : 3, "FriendlyName" : "Advanced Steam Sessions", - "Version" : 5.1, - "VersionName": "5.1", + "Version" : 5.4, + "VersionName": "5.4", "Description" : "Adds new blueprint functions to handle more advanced session operations in Steam. REQUIRES ADVANCED SESSIONS", "Category" : "Advanced Sessions Plugin", "CreatedBy" : "Joshua Statzer", @@ -26,6 +26,10 @@ "Name": "OnlineSubsystem", "Enabled": true }, + { + "Name": "OnlineSubsystemSteam", + "Enabled": true + }, { "Name": "OnlineSubsystemUtils", "Enabled": true diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSteamSessions/Config/FilterPlugin.ini b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSteamSessions/Config/FilterPlugin.ini similarity index 100% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSteamSessions/Config/FilterPlugin.ini rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSteamSessions/Config/FilterPlugin.ini diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSteamSessions/Resources/Icon128.png b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSteamSessions/Resources/Icon128.png similarity index 100% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSteamSessions/Resources/Icon128.png rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSteamSessions/Resources/Icon128.png diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/AdvancedSteamSessions.Build.cs b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/AdvancedSteamSessions.Build.cs similarity index 89% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/AdvancedSteamSessions.Build.cs rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/AdvancedSteamSessions.Build.cs index 366cc07..6a4c768 100644 --- a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/AdvancedSteamSessions.Build.cs +++ b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/AdvancedSteamSessions.Build.cs @@ -15,10 +15,8 @@ public class AdvancedSteamSessions : ModuleRules if ((Target.Platform == UnrealTargetPlatform.Win64) || (Target.Platform == UnrealTargetPlatform.Linux) || (Target.Platform == UnrealTargetPlatform.Mac)) { - PublicDependencyModuleNames.AddRange(new string[] { "SteamShared", "Steamworks"/*, "OnlineSubsystemSteam"*/ }); + PublicDependencyModuleNames.AddRange(new string[] { "SteamShared", "Steamworks", "OnlineSubsystemSteam" }); //PublicIncludePaths.AddRange(new string[] { "../Plugins/Online/OnlineSubsystemSteam/Source/Private" });// This is dumb but it isn't very open } - - AddEngineThirdPartyPrivateStaticDependencies(Target, "Steamworks"); } } \ No newline at end of file diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamFriendsLibrary.h b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamFriendsLibrary.h similarity index 99% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamFriendsLibrary.h rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamFriendsLibrary.h index ddf5562..83de461 100644 --- a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamFriendsLibrary.h +++ b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamFriendsLibrary.h @@ -25,7 +25,7 @@ #pragma warning(disable:4265) // SteamAPI CCallback< specifically, this warning is off by default but 4.17 turned it on.... #endif -#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) +#if (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) && STEAM_SDK_INSTALLED #pragma push_macro("ARRAY_COUNT") #undef ARRAY_COUNT diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamSessions.h b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamSessions.h similarity index 100% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamSessions.h rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamSessions.h diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamWorkshopLibrary.h b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamWorkshopLibrary.h similarity index 98% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamWorkshopLibrary.h rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamWorkshopLibrary.h index bfb6893..db56b35 100644 --- a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamWorkshopLibrary.h +++ b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamWorkshopLibrary.h @@ -6,7 +6,7 @@ #include "Kismet/BlueprintFunctionLibrary.h" #include "Online.h" #include "OnlineSubsystem.h" -#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) +#if (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) && STEAM_SDK_INSTALLED #include "steam/isteamugc.h" #include "steam/isteamremotestorage.h" #endif @@ -21,7 +21,7 @@ #pragma warning(disable:4265) // SteamAPI CCallback< specifically, this warning is off by default but 4.17 turned it on.... #endif -#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) +#if (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) && STEAM_SDK_INSTALLED #pragma push_macro("ARRAY_COUNT") #undef ARRAY_COUNT @@ -223,7 +223,7 @@ public: bTagsTruncated = false; } -#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) +#if (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) && STEAM_SDK_INSTALLED FBPSteamWorkshopItemDetails(SteamUGCDetails_t &hUGCDetails) { ResultOfRequest = (FBPSteamResult)hUGCDetails.m_eResult; diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamNotificationsSubsystem.h b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamNotificationsSubsystem.h similarity index 84% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamNotificationsSubsystem.h rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamNotificationsSubsystem.h index 364ea3d..7b8641a 100644 --- a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamNotificationsSubsystem.h +++ b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamNotificationsSubsystem.h @@ -5,7 +5,7 @@ #include "CoreMinimal.h" #include "Subsystems/GameInstanceSubsystem.h" -#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) +#if (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) && STEAM_SDK_INSTALLED #include @@ -40,7 +40,7 @@ public: ParentSubsystem = MyParent; } -#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) +#if (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) && STEAM_SDK_INSTALLED cSteamEventsStore() : OnExternalUITriggeredCallback(this, &cSteamEventsStore::OnExternalUITriggered) { @@ -56,7 +56,7 @@ public: //~cSteamEventsStore(){} private: -#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) +#if (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) && STEAM_SDK_INSTALLED STEAM_CALLBACK(cSteamEventsStore, OnExternalUITriggered, GameOverlayActivated_t, OnExternalUITriggeredCallback); #endif }; @@ -76,7 +76,7 @@ public: } }; -#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) +#if (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) && STEAM_SDK_INSTALLED void USteamNotificationsSubsystem::cSteamEventsStore::OnExternalUITriggered(GameOverlayActivated_t* CallbackData) { if (ParentSubsystem) diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamRequestGroupOfficersCallbackProxy.h b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamRequestGroupOfficersCallbackProxy.h similarity index 94% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamRequestGroupOfficersCallbackProxy.h rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamRequestGroupOfficersCallbackProxy.h index adad4ac..73955dd 100644 --- a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamRequestGroupOfficersCallbackProxy.h +++ b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamRequestGroupOfficersCallbackProxy.h @@ -15,7 +15,7 @@ #pragma warning(disable:4265) // SteamAPI CCallback< specifically, this warning is off by default but 4.17 turned it on.... #endif -#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) +#if (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) && STEAM_SDK_INSTALLED //#include "OnlineSubsystemSteam.h" @@ -87,7 +87,7 @@ class USteamRequestGroupOfficersCallbackProxy : public UOnlineBlueprintCallProxy private: -#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) +#if (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) && STEAM_SDK_INSTALLED void OnRequestGroupOfficerDetails( ClanOfficerListResponse_t *pResult, bool bIOFailure); CCallResult m_callResultGroupOfficerRequestDetails; diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamWSRequestUGCDetailsCallbackProxy.h b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamWSRequestUGCDetailsCallbackProxy.h similarity index 94% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamWSRequestUGCDetailsCallbackProxy.h rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamWSRequestUGCDetailsCallbackProxy.h index fcfaa2f..0adee7e 100644 --- a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamWSRequestUGCDetailsCallbackProxy.h +++ b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamWSRequestUGCDetailsCallbackProxy.h @@ -16,7 +16,7 @@ #pragma warning(disable:4265) // SteamAPI CCallback< specifically, this warning is off by default but 4.17 turned it on.... #endif -#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) +#if (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) && STEAM_SDK_INSTALLED //#include "OnlineSubsystemSteam.h" @@ -72,7 +72,7 @@ class USteamWSRequestUGCDetailsCallbackProxy : public UOnlineBlueprintCallProxyB private: -#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) +#if (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) && STEAM_SDK_INSTALLED // Internal callback when the operation completes, calls out to the public success/failure callbacks void OnUGCRequestUGCDetails(SteamUGCQueryCompleted_t *pResult, bool bIOFailure); diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/AdvancedSteamFriendsLibrary.cpp b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/AdvancedSteamFriendsLibrary.cpp similarity index 91% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/AdvancedSteamFriendsLibrary.cpp rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/AdvancedSteamFriendsLibrary.cpp index d884bf0..85340e4 100644 --- a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/AdvancedSteamFriendsLibrary.cpp +++ b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/AdvancedSteamFriendsLibrary.cpp @@ -10,7 +10,7 @@ DEFINE_LOG_CATEGORY(AdvancedSteamFriendsLog); /*int32 UAdvancedSteamFriendsLibrary::GetFriendSteamLevel(const FBPUniqueNetId UniqueNetId) { -#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) +#if (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) && STEAM_SDK_INSTALLED if (!UniqueNetId.IsValid() || !UniqueNetId.UniqueNetId->IsValid() || UniqueNetId.UniqueNetId->GetType() != STEAM_SUBSYSTEM) { UE_LOG(AdvancedSteamFriendsLog, Warning, TEXT("IsAFriend Had a bad UniqueNetId!")); @@ -59,7 +59,7 @@ DEFINE_LOG_CATEGORY(AdvancedSteamFriendsLog); void UAdvancedSteamFriendsLibrary::GetSteamGroups(TArray & SteamGroups) { -#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) +#if (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) && STEAM_SDK_INSTALLED if (SteamAPI_Init()) { @@ -90,7 +90,7 @@ void UAdvancedSteamFriendsLibrary::GetSteamGroups(TArray & St void UAdvancedSteamFriendsLibrary::GetSteamFriendGamePlayed(const FBPUniqueNetId UniqueNetId, EBlueprintResultSwitch &Result/*, FString & GameName*/, int32 & AppID) { -#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) +#if (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) && STEAM_SDK_INSTALLED if (!UniqueNetId.IsValid() || !UniqueNetId.UniqueNetId->IsValid() || UniqueNetId.UniqueNetId->GetType() != STEAM_SUBSYSTEM) { UE_LOG(AdvancedSteamFriendsLog, Warning, TEXT("GetSteamFriendGamePlayed Had a bad UniqueNetId!")); @@ -132,7 +132,7 @@ void UAdvancedSteamFriendsLibrary::GetSteamFriendGamePlayed(const FBPUniqueNetId int32 UAdvancedSteamFriendsLibrary::GetFriendSteamLevel(const FBPUniqueNetId UniqueNetId) { -#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) +#if (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) && STEAM_SDK_INSTALLED if (!UniqueNetId.IsValid() || !UniqueNetId.UniqueNetId->IsValid() || UniqueNetId.UniqueNetId->GetType() != STEAM_SUBSYSTEM) { UE_LOG(AdvancedSteamFriendsLog, Warning, TEXT("IsAFriend Had a bad UniqueNetId!")); @@ -153,7 +153,7 @@ int32 UAdvancedSteamFriendsLibrary::GetFriendSteamLevel(const FBPUniqueNetId Uni FString UAdvancedSteamFriendsLibrary::GetSteamPersonaName(const FBPUniqueNetId UniqueNetId) { -#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) +#if (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) && STEAM_SDK_INSTALLED if (!UniqueNetId.IsValid() || !UniqueNetId.UniqueNetId->IsValid() || UniqueNetId.UniqueNetId->GetType() != STEAM_SUBSYSTEM) { UE_LOG(AdvancedSteamFriendsLog, Warning, TEXT("GetSteamPersonaName Had a bad UniqueNetId!")); @@ -175,7 +175,7 @@ FBPUniqueNetId UAdvancedSteamFriendsLibrary::CreateSteamIDFromString(const FStri { FBPUniqueNetId netId; -#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) +#if (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) && STEAM_SDK_INSTALLED if (!(SteamID64.Len() > 0)) { UE_LOG(AdvancedSteamFriendsLog, Warning, TEXT("CreateSteamIDFromString Had a bad UniqueNetId!")); @@ -200,7 +200,7 @@ FBPUniqueNetId UAdvancedSteamFriendsLibrary::GetLocalSteamIDFromSteam() { FBPUniqueNetId netId; -#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) +#if (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) && STEAM_SDK_INSTALLED if (SteamAPI_Init()) { TSharedPtr SteamID(new const FUniqueNetIdSteam2(SteamUser()->GetSteamID())); @@ -213,7 +213,7 @@ FBPUniqueNetId UAdvancedSteamFriendsLibrary::GetLocalSteamIDFromSteam() bool UAdvancedSteamFriendsLibrary::RequestSteamFriendInfo(const FBPUniqueNetId UniqueNetId, bool bRequireNameOnly) { -#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) +#if (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) && STEAM_SDK_INSTALLED if (!UniqueNetId.IsValid() || !UniqueNetId.UniqueNetId->IsValid() || UniqueNetId.UniqueNetId->GetType() != STEAM_SUBSYSTEM) { UE_LOG(AdvancedSteamFriendsLog, Warning, TEXT("RequestSteamFriendInfo Had a bad UniqueNetId!")); @@ -235,7 +235,7 @@ bool UAdvancedSteamFriendsLibrary::RequestSteamFriendInfo(const FBPUniqueNetId U bool UAdvancedSteamFriendsLibrary::OpenSteamUserOverlay(const FBPUniqueNetId UniqueNetId, ESteamUserOverlayType DialogType) { -#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) +#if (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) && STEAM_SDK_INSTALLED if (!UniqueNetId.IsValid() || !UniqueNetId.UniqueNetId->IsValid() || UniqueNetId.UniqueNetId->GetType() != STEAM_SUBSYSTEM) { UE_LOG(AdvancedSteamFriendsLog, Warning, TEXT("OpenSteamUserOverlay Had a bad UniqueNetId!")); @@ -264,7 +264,7 @@ bool UAdvancedSteamFriendsLibrary::OpenSteamUserOverlay(const FBPUniqueNetId Uni bool UAdvancedSteamFriendsLibrary::IsOverlayEnabled() { -#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) +#if (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) && STEAM_SDK_INSTALLED if (SteamAPI_Init()) { return SteamUtils()->IsOverlayEnabled(); @@ -277,7 +277,7 @@ bool UAdvancedSteamFriendsLibrary::IsOverlayEnabled() UTexture2D * UAdvancedSteamFriendsLibrary::GetSteamFriendAvatar(const FBPUniqueNetId UniqueNetId, EBlueprintAsyncResultSwitch &Result, SteamAvatarSize AvatarSize) { -#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) +#if (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) && STEAM_SDK_INSTALLED if (!UniqueNetId.IsValid() || !UniqueNetId.UniqueNetId->IsValid() || UniqueNetId.UniqueNetId->GetType() != STEAM_SUBSYSTEM) { UE_LOG(AdvancedSteamFriendsLog, Warning, TEXT("GetSteamFriendAvatar Had a bad UniqueNetId!")); @@ -377,7 +377,7 @@ UTexture2D * UAdvancedSteamFriendsLibrary::GetSteamFriendAvatar(const FBPUniqueN bool UAdvancedSteamFriendsLibrary::InitTextFiltering() { -#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) +#if (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) && STEAM_SDK_INSTALLED if (SteamAPI_Init()) { @@ -391,7 +391,7 @@ bool UAdvancedSteamFriendsLibrary::InitTextFiltering() bool UAdvancedSteamFriendsLibrary::FilterText(FString TextToFilter, EBPTextFilteringContext Context, const FBPUniqueNetId TextSourceID, FString& FilteredText) { -#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) +#if (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) && STEAM_SDK_INSTALLED if (SteamAPI_Init()) { @@ -425,7 +425,7 @@ bool UAdvancedSteamFriendsLibrary::FilterText(FString TextToFilter, EBPTextFilte bool UAdvancedSteamFriendsLibrary::IsSteamInBigPictureMode() { -#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) +#if (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) && STEAM_SDK_INSTALLED if (SteamAPI_Init()) { diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/AdvancedSteamSessions.cpp b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/AdvancedSteamSessions.cpp similarity index 100% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/AdvancedSteamSessions.cpp rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/AdvancedSteamSessions.cpp diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/AdvancedSteamWorkshopLibrary.cpp b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/AdvancedSteamWorkshopLibrary.cpp similarity index 91% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/AdvancedSteamWorkshopLibrary.cpp rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/AdvancedSteamWorkshopLibrary.cpp index 3bd2089..03eb780 100644 --- a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/AdvancedSteamWorkshopLibrary.cpp +++ b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/AdvancedSteamWorkshopLibrary.cpp @@ -8,7 +8,7 @@ DEFINE_LOG_CATEGORY(AdvancedSteamWorkshopLog); void UAdvancedSteamWorkshopLibrary::GetNumSubscribedWorkshopItems(int32 & NumberOfItems) { NumberOfItems = 0; -#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) +#if (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) && STEAM_SDK_INSTALLED if (SteamAPI_Init()) { @@ -20,10 +20,10 @@ void UAdvancedSteamWorkshopLibrary::GetNumSubscribedWorkshopItems(int32 & Number UE_LOG(AdvancedSteamWorkshopLog, Warning, TEXT("Error in GetNumSubscribedWorkshopItemCount : SteamAPI is not Inited!")); return; } -#endif - +#else UE_LOG(AdvancedSteamWorkshopLog, Warning, TEXT("Error in GetNumSubscribedWorkshopItemCount : Called on an incompatible platform")); return; +#endif } TArray UAdvancedSteamWorkshopLibrary::GetSubscribedWorkshopItems(int32 & NumberOfItems) @@ -31,7 +31,7 @@ TArray UAdvancedSteamWorkshopLibrary::GetSubscribedWorkshopI TArray outArray; NumberOfItems = 0; -#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) +#if (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) && STEAM_SDK_INSTALLED if (SteamAPI_Init()) { @@ -62,8 +62,8 @@ TArray UAdvancedSteamWorkshopLibrary::GetSubscribedWorkshopI UE_LOG(AdvancedSteamWorkshopLog, Warning, TEXT("Error in GetSubscribedWorkshopItemCount : SteamAPI is not Inited!")); return outArray; } -#endif - +#else UE_LOG(AdvancedSteamWorkshopLog, Warning, TEXT("Error in GetSubscribedWorkshopItemCount : Called on an incompatible platform")); return outArray; +#endif } diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/SteamRequestGroupOfficersCallbackProxy.cpp b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/SteamRequestGroupOfficersCallbackProxy.cpp similarity index 93% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/SteamRequestGroupOfficersCallbackProxy.cpp rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/SteamRequestGroupOfficersCallbackProxy.cpp index 9d56b9a..44bcc75 100644 --- a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/SteamRequestGroupOfficersCallbackProxy.cpp +++ b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/SteamRequestGroupOfficersCallbackProxy.cpp @@ -4,7 +4,7 @@ #include "Online/CoreOnline.h" #include "AdvancedSteamFriendsLibrary.h" #include "OnlineSubSystemHeader.h" -#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) +#if (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) && STEAM_SDK_INSTALLED #include "steam/isteamfriends.h" #endif //#include "OnlineSubsystemSteamTypes.h" @@ -31,7 +31,7 @@ USteamRequestGroupOfficersCallbackProxy* USteamRequestGroupOfficersCallbackProxy void USteamRequestGroupOfficersCallbackProxy::Activate() { -#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) +#if (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) && STEAM_SDK_INSTALLED if (SteamAPI_Init()) { uint64 id = *((uint64*)GroupUniqueID.UniqueNetId->GetBytes()); @@ -45,7 +45,7 @@ void USteamRequestGroupOfficersCallbackProxy::Activate() OnFailure.Broadcast(EmptyArray); } -#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) +#if (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) && STEAM_SDK_INSTALLED void USteamRequestGroupOfficersCallbackProxy::OnRequestGroupOfficerDetails(ClanOfficerListResponse_t *pResult, bool bIOFailure) { TArray OfficerArray; diff --git a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/SteamWSRequestUGCDetailsCallbackProxy.cpp b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/SteamWSRequestUGCDetailsCallbackProxy.cpp similarity index 92% rename from Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/SteamWSRequestUGCDetailsCallbackProxy.cpp rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/SteamWSRequestUGCDetailsCallbackProxy.cpp index f3eefd5..daf3b07 100644 --- a/Plugins/AdvancedSessionsPlugin/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/SteamWSRequestUGCDetailsCallbackProxy.cpp +++ b/Plugins/AdvancedSessions-5-4/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/SteamWSRequestUGCDetailsCallbackProxy.cpp @@ -2,7 +2,7 @@ #include "SteamWSRequestUGCDetailsCallbackProxy.h" #include "OnlineSubSystemHeader.h" -#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) +#if (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) && STEAM_SDK_INSTALLED #include "steam/isteamugc.h" #endif @@ -25,7 +25,7 @@ USteamWSRequestUGCDetailsCallbackProxy* USteamWSRequestUGCDetailsCallbackProxy:: void USteamWSRequestUGCDetailsCallbackProxy::Activate() { -#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) +#if (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) && STEAM_SDK_INSTALLED if (SteamAPI_Init()) { // #TODO: Support arrays instead in the future? @@ -49,7 +49,7 @@ void USteamWSRequestUGCDetailsCallbackProxy::Activate() OnFailure.Broadcast(FBPSteamWorkshopItemDetails()); } -#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) +#if (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) && STEAM_SDK_INSTALLED void USteamWSRequestUGCDetailsCallbackProxy::OnUGCRequestUGCDetails(SteamUGCQueryCompleted_t *pResult, bool bIOFailure) { //FOnlineSubsystemSteam* SteamSubsystem = (FOnlineSubsystemSteam*)(IOnlineSubsystem::Get(STEAM_SUBSYSTEM)); diff --git a/Plugins/AdvancedSessionsPlugin/ExampleBlueprints/ExampleAdvancedSessionsFunctionsChar.uasset b/Plugins/AdvancedSessions-5-4/AdvancedSessions/ExampleBlueprints/ExampleAdvancedSessionsFunctionsChar.uasset similarity index 100% rename from Plugins/AdvancedSessionsPlugin/ExampleBlueprints/ExampleAdvancedSessionsFunctionsChar.uasset rename to Plugins/AdvancedSessions-5-4/AdvancedSessions/ExampleBlueprints/ExampleAdvancedSessionsFunctionsChar.uasset diff --git a/Plugins/AdvancedSessions-5-4/AdvancedSessions/LICENSE.txt b/Plugins/AdvancedSessions-5-4/AdvancedSessions/LICENSE.txt new file mode 100644 index 0000000..986c999 --- /dev/null +++ b/Plugins/AdvancedSessions-5-4/AdvancedSessions/LICENSE.txt @@ -0,0 +1,19 @@ +Copyright Joshua Statzer + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/Plugins/AdvancedSessions-5-4/AdvancedSessions/README.md b/Plugins/AdvancedSessions-5-4/AdvancedSessions/README.md new file mode 100644 index 0000000..20f7080 --- /dev/null +++ b/Plugins/AdvancedSessions-5-4/AdvancedSessions/README.md @@ -0,0 +1 @@ +Readme and documentation will be worked on soon \ No newline at end of file diff --git a/Source/Steam.Target.cs b/Source/Steam.Target.cs index fe58a5a..0e0ff01 100644 --- a/Source/Steam.Target.cs +++ b/Source/Steam.Target.cs @@ -8,7 +8,7 @@ public class SteamTarget : TargetRules public SteamTarget(TargetInfo Target) : base(Target) { Type = TargetType.Game; - DefaultBuildSettings = BuildSettingsVersion.V2; + DefaultBuildSettings = BuildSettingsVersion.V5; ExtraModuleNames.AddRange( new string[] { "Steam" } ); } diff --git a/Source/Steam/Steam.Build.cs b/Source/Steam/Steam.Build.cs index 3065e80..4d82b4b 100644 --- a/Source/Steam/Steam.Build.cs +++ b/Source/Steam/Steam.Build.cs @@ -11,9 +11,6 @@ public class Steam : ModuleRules PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "InputCore" }); PrivateDependencyModuleNames.AddRange(new string[] { }); - - DynamicallyLoadedModuleNames.Add("OnlineSubsystemSteam"); - // Uncomment if you are using Slate UI // PrivateDependencyModuleNames.AddRange(new string[] { "Slate", "SlateCore" }); diff --git a/Source/SteamEditor.Target.cs b/Source/SteamEditor.Target.cs index 2583618..f93d87b 100644 --- a/Source/SteamEditor.Target.cs +++ b/Source/SteamEditor.Target.cs @@ -8,7 +8,7 @@ public class SteamEditorTarget : TargetRules public SteamEditorTarget(TargetInfo Target) : base(Target) { Type = TargetType.Editor; - DefaultBuildSettings = BuildSettingsVersion.V2; + DefaultBuildSettings = BuildSettingsVersion.V5; ExtraModuleNames.AddRange( new string[] { "Steam" } ); } diff --git a/Steam.uproject b/Steam.uproject index 842632e..f83edd9 100644 --- a/Steam.uproject +++ b/Steam.uproject @@ -1,6 +1,6 @@ { "FileVersion": 3, - "EngineAssociation": "5.3", + "EngineAssociation": "5.4", "Category": "", "Description": "", "Modules": [