From ea77c18a2eeff59e7f55129415c85edd2b78701d Mon Sep 17 00:00:00 2001 From: morden Date: Tue, 16 Jan 2018 21:32:40 -0500 Subject: [PATCH 1/6] 4.19 Former-commit-id: 58eebfc1e9bfa9211a5acde5a65e75254c5904ea --- .../Source/AdvancedSessions/AdvancedSessions.Build.cs | 2 +- .../Source/AdvancedSessions/Private/AdvancedSessionsLibrary.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/AdvancedSessions/Source/AdvancedSessions/AdvancedSessions.Build.cs b/AdvancedSessions/Source/AdvancedSessions/AdvancedSessions.Build.cs index c276d5d..256e0bc 100644 --- a/AdvancedSessions/Source/AdvancedSessions/AdvancedSessions.Build.cs +++ b/AdvancedSessions/Source/AdvancedSessions/AdvancedSessions.Build.cs @@ -7,7 +7,7 @@ public class AdvancedSessions : ModuleRules { PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs; //bEnforceIWYU = true; - + Definitions.Add("WITH_ADVANCED_SESSIONS=1"); PrivateIncludePaths.AddRange(new string[] { "AdvancedSessions/Private"/*, "OnlineSubsystemSteam/Private"*/ }); diff --git a/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedSessionsLibrary.cpp b/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedSessionsLibrary.cpp index 5ebcf6c..3b3dbcc 100644 --- a/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedSessionsLibrary.cpp +++ b/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedSessionsLibrary.cpp @@ -427,7 +427,7 @@ void UAdvancedSessionsLibrary::GetPlayerName(APlayerController *PlayerController if (APlayerState* PlayerState = (PlayerController != NULL) ? PlayerController->PlayerState : NULL) { - PlayerName = PlayerState->PlayerName; + PlayerName = PlayerState->GetPlayerName(); return; } else From 2db3b7221cc072e7293edab61a82c3ab34935390 Mon Sep 17 00:00:00 2001 From: morden Date: Thu, 8 Feb 2018 17:29:55 -0500 Subject: [PATCH 2/6] Changed the findsessions to force searching presence off for dedicated server searching. I am fairly sure it defaults to false, but just in case. Former-commit-id: 725cd3a3e9b3914bed549ff18a93334348075493 --- .../Private/FindSessionsCallbackProxyAdvanced.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/AdvancedSessions/Source/AdvancedSessions/Private/FindSessionsCallbackProxyAdvanced.cpp b/AdvancedSessions/Source/AdvancedSessions/Private/FindSessionsCallbackProxyAdvanced.cpp index 3caa24d..0eb55ef 100644 --- a/AdvancedSessions/Source/AdvancedSessions/Private/FindSessionsCallbackProxyAdvanced.cpp +++ b/AdvancedSessions/Source/AdvancedSessions/Private/FindSessionsCallbackProxyAdvanced.cpp @@ -111,6 +111,7 @@ void UFindSessionsCallbackProxyAdvanced::Activate() case EBPServerPresenceSearchType::DedicatedServersOnly: { //tem.Set(SEARCH_DEDICATED_ONLY, true, EOnlineComparisonOp::Equals); + DedicatedOnly.Set(SEARCH_PRESENCE, false, EOnlineComparisonOp::Equals); } break; @@ -127,6 +128,7 @@ void UFindSessionsCallbackProxyAdvanced::Activate() SearchObjectDedicated->bIsLanQuery = bUseLAN; FOnlineSearchSettingsEx DedicatedOnly = tem; + DedicatedOnly.Set(SEARCH_PRESENCE, false, EOnlineComparisonOp::Equals); tem.Set(SEARCH_PRESENCE, true, EOnlineComparisonOp::Equals); //DedicatedOnly.Set(SEARCH_DEDICATED_ONLY, true, EOnlineComparisonOp::Equals); From c2a55985826f4592198450b16132a7624c368d2c Mon Sep 17 00:00:00 2001 From: morden Date: Thu, 8 Feb 2018 17:37:28 -0500 Subject: [PATCH 3/6] Backed out changeset: e30e5f51636b Former-commit-id: eb6dcaf4988028da6feb01f69e465fdfbe497e74 --- .../Private/FindSessionsCallbackProxyAdvanced.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/AdvancedSessions/Source/AdvancedSessions/Private/FindSessionsCallbackProxyAdvanced.cpp b/AdvancedSessions/Source/AdvancedSessions/Private/FindSessionsCallbackProxyAdvanced.cpp index 0eb55ef..3caa24d 100644 --- a/AdvancedSessions/Source/AdvancedSessions/Private/FindSessionsCallbackProxyAdvanced.cpp +++ b/AdvancedSessions/Source/AdvancedSessions/Private/FindSessionsCallbackProxyAdvanced.cpp @@ -111,7 +111,6 @@ void UFindSessionsCallbackProxyAdvanced::Activate() case EBPServerPresenceSearchType::DedicatedServersOnly: { //tem.Set(SEARCH_DEDICATED_ONLY, true, EOnlineComparisonOp::Equals); - DedicatedOnly.Set(SEARCH_PRESENCE, false, EOnlineComparisonOp::Equals); } break; @@ -128,7 +127,6 @@ void UFindSessionsCallbackProxyAdvanced::Activate() SearchObjectDedicated->bIsLanQuery = bUseLAN; FOnlineSearchSettingsEx DedicatedOnly = tem; - DedicatedOnly.Set(SEARCH_PRESENCE, false, EOnlineComparisonOp::Equals); tem.Set(SEARCH_PRESENCE, true, EOnlineComparisonOp::Equals); //DedicatedOnly.Set(SEARCH_DEDICATED_ONLY, true, EOnlineComparisonOp::Equals); From d007eed9a8dfb2b7ab9084322f979ea82c6eeb72 Mon Sep 17 00:00:00 2001 From: mordentral Date: Tue, 27 Feb 2018 08:53:00 -0500 Subject: [PATCH 4/6] Update module files Former-commit-id: f88e13eeeb0741e9809aceeb902347d6eea760da --- .../Source/AdvancedSessions/AdvancedSessions.Build.cs | 2 +- .../Source/AdvancedSteamSessions/AdvancedSteamSessions.Build.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/AdvancedSessions/Source/AdvancedSessions/AdvancedSessions.Build.cs b/AdvancedSessions/Source/AdvancedSessions/AdvancedSessions.Build.cs index 256e0bc..0da5a42 100644 --- a/AdvancedSessions/Source/AdvancedSessions/AdvancedSessions.Build.cs +++ b/AdvancedSessions/Source/AdvancedSessions/AdvancedSessions.Build.cs @@ -8,7 +8,7 @@ public class AdvancedSessions : ModuleRules PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs; //bEnforceIWYU = true; - Definitions.Add("WITH_ADVANCED_SESSIONS=1"); + PublicDefinitions.Add("WITH_ADVANCED_SESSIONS=1"); PrivateIncludePaths.AddRange(new string[] { "AdvancedSessions/Private"/*, "OnlineSubsystemSteam/Private"*/ }); PublicIncludePaths.AddRange(new string[] { "AdvancedSessions/Public" }); diff --git a/AdvancedSteamSessions/Source/AdvancedSteamSessions/AdvancedSteamSessions.Build.cs b/AdvancedSteamSessions/Source/AdvancedSteamSessions/AdvancedSteamSessions.Build.cs index db5bc57..a5d9794 100644 --- a/AdvancedSteamSessions/Source/AdvancedSteamSessions/AdvancedSteamSessions.Build.cs +++ b/AdvancedSteamSessions/Source/AdvancedSteamSessions/AdvancedSteamSessions.Build.cs @@ -8,7 +8,7 @@ public class AdvancedSteamSessions : ModuleRules PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs; //bEnforceIWYU = true; - Definitions.Add("WITH_ADVANCED_STEAM_SESSIONS=1"); + PublicDefinitions.Add("WITH_ADVANCED_STEAM_SESSIONS=1"); PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "InputCore", "OnlineSubsystem", "CoreUObject", "OnlineSubsystemUtils", "Networking", "Sockets", "AdvancedSessions"/*"Voice", "OnlineSubsystemSteam"*/ }); PrivateDependencyModuleNames.AddRange(new string[] { "OnlineSubsystem", "Sockets", "Networking", "OnlineSubsystemUtils" /*"Voice", "Steamworks","OnlineSubsystemSteam"*/}); From ad2881cd7528401a3daa4b23732d8506634e93e6 Mon Sep 17 00:00:00 2001 From: mordentral Date: Wed, 4 Apr 2018 10:40:26 -0400 Subject: [PATCH 5/6] Updated some documentation comments Prepping for auto documentation generation Former-commit-id: a26d6bbb5c6ba5e11d096bfaa486fd08c5b149ff --- .../AdvancedSessions/Classes/AdvancedFriendsGameInstance.h | 1 + .../Source/AdvancedSessions/Classes/AdvancedVoiceLibrary.h | 2 ++ .../AdvancedSessions/Classes/GetUserPrivilegeCallbackProxy.h | 2 +- .../Source/AdvancedSessions/Classes/LoginUserCallbackProxy.h | 2 +- .../AdvancedSteamSessions/Classes/AdvancedSteamFriendsLibrary.h | 1 + .../Classes/SteamRequestGroupOfficersCallbackProxy.h | 2 +- 6 files changed, 7 insertions(+), 3 deletions(-) diff --git a/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedFriendsGameInstance.h b/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedFriendsGameInstance.h index 7f8abd2..7b49eee 100644 --- a/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedFriendsGameInstance.h +++ b/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedFriendsGameInstance.h @@ -65,6 +65,7 @@ public: void OnSessionInviteAcceptedMaster(const bool bWasSuccessful, int32 LocalPlayer, TSharedPtr PersonInviting, const FOnlineSessionSearchResult& SessionToJoin); // After a session invite has been accepted by the local player this event is triggered, call JoinSession on the session result to join it + // This function is currently not hooked up in any of Epics default subsystems, it is here for custom subsystems UFUNCTION(BlueprintImplementableEvent, Category = "AdvancedFriends") void OnSessionInviteAccepted(int32 LocalPlayerNum, FBPUniqueNetId PersonInvited, const FBlueprintSessionResult& SessionToJoin); diff --git a/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedVoiceLibrary.h b/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedVoiceLibrary.h index 6f4c945..a483d1f 100644 --- a/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedVoiceLibrary.h +++ b/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedVoiceLibrary.h @@ -48,6 +48,7 @@ public: static bool RegisterLocalTalker(uint8 LocalPlayerNum = 0); // Registers all signed in players as local talkers + // This is already done automatically, only do it manually if you unregistered someone UFUNCTION(BlueprintCallable, Category = "Online|AdvancedVoice") static void RegisterAllLocalTalkers(); @@ -60,6 +61,7 @@ public: static void UnRegisterAllLocalTalkers(); // Registers a remote player as a talker + // This is already done automatically, only do it manually if you unregistered someone UFUNCTION(BlueprintCallable, Category = "Online|AdvancedVoice") static bool RegisterRemoteTalker(const FBPUniqueNetId& UniqueNetId); diff --git a/AdvancedSessions/Source/AdvancedSessions/Classes/GetUserPrivilegeCallbackProxy.h b/AdvancedSessions/Source/AdvancedSessions/Classes/GetUserPrivilegeCallbackProxy.h index cea6d6b..4acef32 100644 --- a/AdvancedSessions/Source/AdvancedSessions/Classes/GetUserPrivilegeCallbackProxy.h +++ b/AdvancedSessions/Source/AdvancedSessions/Classes/GetUserPrivilegeCallbackProxy.h @@ -21,7 +21,7 @@ class UGetUserPrivilegeCallbackProxy : public UOnlineBlueprintCallProxyBase UPROPERTY(BlueprintAssignable) FEmptyOnlineDelegate OnFailure; - // Logs out of the identity interface + // Gets the privilage of the user UFUNCTION(BlueprintCallable, meta=(BlueprintInternalUseOnly = "true", WorldContext="WorldContextObject"), Category = "Online|AdvancedIdentity") static UGetUserPrivilegeCallbackProxy* GetUserPrivilege(UObject* WorldContextObject, const EBPUserPrivileges & PrivilegeToCheck, const FBPUniqueNetId & PlayerUniqueNetID); diff --git a/AdvancedSessions/Source/AdvancedSessions/Classes/LoginUserCallbackProxy.h b/AdvancedSessions/Source/AdvancedSessions/Classes/LoginUserCallbackProxy.h index 36ea654..f35161f 100644 --- a/AdvancedSessions/Source/AdvancedSessions/Classes/LoginUserCallbackProxy.h +++ b/AdvancedSessions/Source/AdvancedSessions/Classes/LoginUserCallbackProxy.h @@ -20,7 +20,7 @@ class ULoginUserCallbackProxy : public UOnlineBlueprintCallProxyBase UPROPERTY(BlueprintAssignable) FEmptyOnlineDelegate OnFailure; - // Logs out of the identity interface + // Logs into the identity interface UFUNCTION(BlueprintCallable, meta=(BlueprintInternalUseOnly = "true", WorldContext="WorldContextObject"), Category = "Online|AdvancedIdentity") static ULoginUserCallbackProxy* LoginUser(UObject* WorldContextObject, class APlayerController* PlayerController, FString UserID, FString UserToken); diff --git a/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamFriendsLibrary.h b/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamFriendsLibrary.h index a1a562e..8cb332e 100644 --- a/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamFriendsLibrary.h +++ b/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamFriendsLibrary.h @@ -88,6 +88,7 @@ public: UFUNCTION(BlueprintCallable, Category = "Online|AdvancedFriends|SteamAPI", meta = (ExpandEnumAsExecs = "Result")) static void GetSteamFriendGamePlayed(const FBPUniqueNetId UniqueNetId, EBlueprintResultSwitch &Result, FString & GameName, int32 & AppID); + // Get a full list of steam groups UFUNCTION(BlueprintCallable, Category = "Online|SteamAPI|SteamGroups") static void GetSteamGroups(TArray & SteamGroups); }; diff --git a/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamRequestGroupOfficersCallbackProxy.h b/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamRequestGroupOfficersCallbackProxy.h index 6e5e769..eae4029 100644 --- a/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamRequestGroupOfficersCallbackProxy.h +++ b/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamRequestGroupOfficersCallbackProxy.h @@ -75,7 +75,7 @@ class USteamRequestGroupOfficersCallbackProxy : public UOnlineBlueprintCallProxy UPROPERTY(BlueprintAssignable) FBlueprintGroupOfficerDetailsDelegate OnFailure; - // Retruns a list of steam group officers + // Returns a list of steam group officers UFUNCTION(BlueprintCallable, meta=(BlueprintInternalUseOnly = "true", WorldContext="WorldContextObject"), Category = "Online|SteamAPI|SteamGroups") static USteamRequestGroupOfficersCallbackProxy* GetSteamGroupOfficerList(UObject* WorldContextObject, FBPUniqueNetId GroupUniqueNetID); From 0229b69d9c1a9479eed0d3ab29bcc5edfeeb8e25 Mon Sep 17 00:00:00 2001 From: J Date: Wed, 4 Apr 2018 10:41:49 -0400 Subject: [PATCH 6/6] Close branch 4.19 Beta Former-commit-id: 1c0ff2831cd4ddf6e4f511d0399926aa88b6d74b