Merge branch 'master' into versioned

Author: pgilmorepf

PlayFabApiTest.js

@@ -580,7 +580,8 @@ QUnit.done(function (details) {
         // Currently, you need to look up the correct format for this object in the API-docs:
         //   https://api.playfab.com/Documentation/Client/method/ExecuteCloudScript
         FunctionName: "SaveTestData",
-        FunctionParameter: { customId: PlayFab._internalSettings.buildIdentifier, testReport: PfTestReport }
+        FunctionParameter: { customId: PlayFab._internalSettings.buildIdentifier, testReport: PfTestReport },
+        GeneratePlayStreamEvent: true
     };
     if (PlayFabClientSDK.IsClientLoggedIn()) {
         PlayFabClientSDK.ExecuteCloudScript(saveResultsRequest, null);

PlayFabSDK/PlayFabAdminApi.js

@@ -18,8 +18,8 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         sessionTicket: null,
-        sdkVersion: "0.21.160627",
-        buildIdentifier: "jbuild_0",
+        sdkVersion: "0.22.160705",
+        buildIdentifier: "jbuild_javascriptsdk_0",
         productionServerUrl: ".playfabapi.com",
         logicServerUrl: null,
 

PlayFabSDK/PlayFabClientApi.js

@@ -18,8 +18,8 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         sessionTicket: null,
-        sdkVersion: "0.21.160627",
-        buildIdentifier: "jbuild_0",
+        sdkVersion: "0.22.160705",
+        buildIdentifier: "jbuild_javascriptsdk_0",
         productionServerUrl: ".playfabapi.com",
         logicServerUrl: null,
 
@@ -282,6 +282,12 @@ PlayFab.ClientApi = {
         PlayFab._internalSettings.ExecuteRequest(PlayFab._internalSettings.GetServerUrl() + "/Client/GetAccountInfo", request, "X-Authorization", PlayFab._internalSettings.sessionTicket, callback);
     },
 
+    GetPlayerCombinedInfo: function (request, callback) {
+        if (PlayFab._internalSettings.sessionTicket == null) throw "Must be logged in to call this method";
+
+        PlayFab._internalSettings.ExecuteRequest(PlayFab._internalSettings.GetServerUrl() + "/Client/GetPlayerCombinedInfo", request, "X-Authorization", PlayFab._internalSettings.sessionTicket, callback);
+    },
+
     GetPlayFabIDsFromFacebookIDs: function (request, callback) {
         if (PlayFab._internalSettings.sessionTicket == null) throw "Must be logged in to call this method";
 

PlayFabSDK/PlayFabMatchmakerApi.js

@@ -18,8 +18,8 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         sessionTicket: null,
-        sdkVersion: "0.21.160627",
-        buildIdentifier: "jbuild_0",
+        sdkVersion: "0.22.160705",
+        buildIdentifier: "jbuild_javascriptsdk_0",
         productionServerUrl: ".playfabapi.com",
         logicServerUrl: null,
 

PlayFabSDK/PlayFabServerApi.js

@@ -18,8 +18,8 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         sessionTicket: null,
-        sdkVersion: "0.21.160627",
-        buildIdentifier: "jbuild_0",
+        sdkVersion: "0.22.160705",
+        buildIdentifier: "jbuild_javascriptsdk_0",
         productionServerUrl: ".playfabapi.com",
         logicServerUrl: null,