Skip to content

Commit 82ca730

Browse files
author
Paul Gilmore
committed
* Automated build from Jenkins * Automated build from Jenkins * Automated build from Jenkins * Automated build from Jenkins * Automated build from Jenkins * Automated build from Jenkins * Automated build from Jenkins * Automated build from Jenkins * Automated build from Jenkins * Automated build from Jenkins * Automated build from Jenkins * Automated build from Jenkins * Automated build from Jenkins * Automated build from Jenkins * Automated build from Jenkins
1 parent 625f663 commit 82ca730

File tree

19 files changed

+233
-217
lines changed

19 files changed

+233
-217
lines changed

‎AndroidStudioExample/app/src/main/java/com/playfab/PlayFabClientModels.java

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public static class AddUsernamePasswordRequest {
8383
*/
8484
public String Email;
8585
/**
86-
* Password for the PlayFab account (6-30 characters)
86+
* Password for the PlayFab account (6-100 characters)
8787
*/
8888
public String Password;
8989

@@ -898,7 +898,7 @@ public static class GetCharacterDataRequest {
898898
/**
899899
* The version that currently exists according to the caller. The call will return the data for all of the keys if the version in the system is greater than this.
900900
*/
901-
public Integer IfChangedFromDataVersion;
901+
public Long IfChangedFromDataVersion;
902902

903903
}
904904

@@ -1669,7 +1669,7 @@ public static class GetUserDataRequest {
16691669
/**
16701670
* The version that currently exists according to the caller. The call will return the data for all of the keys if the version in the system is greater than this.
16711671
*/
1672-
public Integer IfChangedFromDataVersion;
1672+
public Long IfChangedFromDataVersion;
16731673

16741674
}
16751675

@@ -2096,7 +2096,7 @@ public static class LoginWithEmailAddressRequest {
20962096
*/
20972097
public String Email;
20982098
/**
2099-
* Password for the PlayFab account (6-30 characters)
2099+
* Password for the PlayFab account (6-100 characters)
21002100
*/
21012101
public String Password;
21022102

@@ -2208,7 +2208,7 @@ public static class LoginWithPlayFabRequest {
22082208
*/
22092209
public String Username;
22102210
/**
2211-
* Password for the PlayFab account (6-30 characters)
2211+
* Password for the PlayFab account (6-100 characters)
22122212
*/
22132213
public String Password;
22142214

@@ -2268,6 +2268,10 @@ public static class MatchmakeRequest {
22682268
* character to use for stats based matching. Leave null to use account stats
22692269
*/
22702270
public String CharacterId;
2271+
/**
2272+
* start a game session if one with an open slot is not found. Defaults to true
2273+
*/
2274+
public Boolean StartNewIfNoneFound;
22712275
/**
22722276
* [deprecated]
22732277
*/
@@ -2310,7 +2314,9 @@ public static class MatchmakeResult {
23102314
public static enum MatchmakeStatus {
23112315
Complete,
23122316
Waiting,
2313-
GameNotFound
2317+
GameNotFound,
2318+
NoAvailableSlots,
2319+
SessionClosed
23142320
}
23152321

23162322
public static class ModifyUserVirtualCurrencyResult {
@@ -2605,7 +2611,7 @@ public static class RegisterPlayFabUserRequest {
26052611
*/
26062612
public String Email;
26072613
/**
2608-
* Password for the PlayFab account (6-30 characters)
2614+
* Password for the PlayFab account (6-100 characters)
26092615
*/
26102616
public String Password;
26112617
/**

‎AndroidStudioExample/app/src/main/java/com/playfab/PlayFabErrors.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,8 @@ public static enum PlayFabErrorCode {
223223
CatalogNotConfigured(1218),
224224
OperationNotSupportedForPlatform(1219),
225225
SegmentNotFound(1220),
226-
StoreNotFound(1221);
226+
StoreNotFound(1221),
227+
InvalidStatisticName(1222);
227228

228229
public int id;
229230

‎AndroidStudioExample/app/src/main/java/com/playfab/internal/PlayFabVersion.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.playfab.internal;
22

33
public class PlayFabVersion {
4-
public static String SdkRevision = "0.24.160502";
4+
public static String SdkRevision = "0.25.160523";
55
public static String getVersionString() {
66
return "JavaSDK-" + SdkRevision;
77
}

‎PlayFabClientSDK/src/com/playfab/PlayFabClientModels.java

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public static class AddUsernamePasswordRequest {
8383
*/
8484
public String Email;
8585
/**
86-
* Password for the PlayFab account (6-30 characters)
86+
* Password for the PlayFab account (6-100 characters)
8787
*/
8888
public String Password;
8989

@@ -898,7 +898,7 @@ public static class GetCharacterDataRequest {
898898
/**
899899
* The version that currently exists according to the caller. The call will return the data for all of the keys if the version in the system is greater than this.
900900
*/
901-
public Integer IfChangedFromDataVersion;
901+
public Long IfChangedFromDataVersion;
902902

903903
}
904904

@@ -1669,7 +1669,7 @@ public static class GetUserDataRequest {
16691669
/**
16701670
* The version that currently exists according to the caller. The call will return the data for all of the keys if the version in the system is greater than this.
16711671
*/
1672-
public Integer IfChangedFromDataVersion;
1672+
public Long IfChangedFromDataVersion;
16731673

16741674
}
16751675

@@ -2096,7 +2096,7 @@ public static class LoginWithEmailAddressRequest {
20962096
*/
20972097
public String Email;
20982098
/**
2099-
* Password for the PlayFab account (6-30 characters)
2099+
* Password for the PlayFab account (6-100 characters)
21002100
*/
21012101
public String Password;
21022102

@@ -2208,7 +2208,7 @@ public static class LoginWithPlayFabRequest {
22082208
*/
22092209
public String Username;
22102210
/**
2211-
* Password for the PlayFab account (6-30 characters)
2211+
* Password for the PlayFab account (6-100 characters)
22122212
*/
22132213
public String Password;
22142214

@@ -2268,6 +2268,10 @@ public static class MatchmakeRequest {
22682268
* character to use for stats based matching. Leave null to use account stats
22692269
*/
22702270
public String CharacterId;
2271+
/**
2272+
* start a game session if one with an open slot is not found. Defaults to true
2273+
*/
2274+
public Boolean StartNewIfNoneFound;
22712275
/**
22722276
* [deprecated]
22732277
*/
@@ -2310,7 +2314,9 @@ public static class MatchmakeResult {
23102314
public static enum MatchmakeStatus {
23112315
Complete,
23122316
Waiting,
2313-
GameNotFound
2317+
GameNotFound,
2318+
NoAvailableSlots,
2319+
SessionClosed
23142320
}
23152321

23162322
public static class ModifyUserVirtualCurrencyResult {
@@ -2605,7 +2611,7 @@ public static class RegisterPlayFabUserRequest {
26052611
*/
26062612
public String Email;
26072613
/**
2608-
* Password for the PlayFab account (6-30 characters)
2614+
* Password for the PlayFab account (6-100 characters)
26092615
*/
26102616
public String Password;
26112617
/**

‎PlayFabClientSDK/src/com/playfab/PlayFabErrors.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,8 @@ public static enum PlayFabErrorCode {
223223
CatalogNotConfigured(1218),
224224
OperationNotSupportedForPlatform(1219),
225225
SegmentNotFound(1220),
226-
StoreNotFound(1221);
226+
StoreNotFound(1221),
227+
InvalidStatisticName(1222);
227228

228229
public int id;
229230

‎PlayFabClientSDK/src/com/playfab/internal/PlayFabVersion.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.playfab.internal;
22

33
public class PlayFabVersion {
4-
public static String SdkRevision = "0.24.160502";
4+
public static String SdkRevision = "0.25.160523";
55
public static String getVersionString() {
66
return "JavaSDK-" + SdkRevision;
77
}

‎PlayFabSDK/src/com/playfab/PlayFabAdminAPI.java

Lines changed: 0 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1988,64 +1988,6 @@ private static PlayFabResult<UpdateStoreItemsResult> privateSetStoreItemsAsync(f
19881988
return pfResult;
19891989
}
19901990

1991-
/**
1992-
* Sets up a store to be used in an AB test using segments
1993-
*/
1994-
@SuppressWarnings("unchecked")
1995-
public static FutureTask<PlayFabResult<SetStoreSegemntOverridesResult>> SetStoreSegmentOverridesAsync(final SetStoreSegmentOverridesRequest request) {
1996-
return new FutureTask(new Callable<PlayFabResult<SetStoreSegemntOverridesResult>>() {
1997-
public PlayFabResult<SetStoreSegemntOverridesResult> call() throws Exception {
1998-
return privateSetStoreSegmentOverridesAsync(request);
1999-
}
2000-
});
2001-
}
2002-
2003-
/**
2004-
* Sets up a store to be used in an AB test using segments
2005-
*/
2006-
@SuppressWarnings("unchecked")
2007-
public static PlayFabResult<SetStoreSegemntOverridesResult> SetStoreSegmentOverrides(final SetStoreSegmentOverridesRequest request) {
2008-
FutureTask<PlayFabResult<SetStoreSegemntOverridesResult>> task = new FutureTask(new Callable<PlayFabResult<SetStoreSegemntOverridesResult>>() {
2009-
public PlayFabResult<SetStoreSegemntOverridesResult> call() throws Exception {
2010-
return privateSetStoreSegmentOverridesAsync(request);
2011-
}
2012-
});
2013-
try {
2014-
task.run();
2015-
return task.get();
2016-
} catch(Exception e) {
2017-
return null;
2018-
}
2019-
}
2020-
2021-
/**
2022-
* Sets up a store to be used in an AB test using segments
2023-
*/
2024-
@SuppressWarnings("unchecked")
2025-
private static PlayFabResult<SetStoreSegemntOverridesResult> privateSetStoreSegmentOverridesAsync(final SetStoreSegmentOverridesRequest request) throws Exception {
2026-
if (PlayFabSettings.DeveloperSecretKey == null) throw new Exception ("Must have PlayFabSettings.DeveloperSecretKey set to call this method");
2027-
2028-
FutureTask<Object> task = PlayFabHTTP.doPost(PlayFabSettings.GetURL() + "/Admin/SetStoreSegmentOverrides", request, "X-SecretKey", PlayFabSettings.DeveloperSecretKey);
2029-
task.run();
2030-
Object httpResult = task.get();
2031-
if(httpResult instanceof PlayFabError) {
2032-
PlayFabError error = (PlayFabError)httpResult;
2033-
if (PlayFabSettings.GlobalErrorHandler != null)
2034-
PlayFabSettings.GlobalErrorHandler.callback(error);
2035-
PlayFabResult result = new PlayFabResult<SetStoreSegemntOverridesResult>();
2036-
result.Error = error;
2037-
return result;
2038-
}
2039-
String resultRawJson = (String) httpResult;
2040-
2041-
PlayFabJsonSuccess<SetStoreSegemntOverridesResult> resultData = gson.fromJson(resultRawJson, new TypeToken<PlayFabJsonSuccess<SetStoreSegemntOverridesResult>>(){}.getType());
2042-
SetStoreSegemntOverridesResult result = resultData.data;
2043-
2044-
PlayFabResult<SetStoreSegemntOverridesResult> pfResult = new PlayFabResult<SetStoreSegemntOverridesResult>();
2045-
pfResult.Result = result;
2046-
return pfResult;
2047-
}
2048-
20491991
/**
20501992
* Creates and updates the key-value store of custom title settings
20511993
*/

‎PlayFabSDK/src/com/playfab/PlayFabAdminModels.java

Lines changed: 10 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -546,6 +546,10 @@ public static class GameModeInfo {
546546
* maximum user count a specific Game Server Instance can support
547547
*/
548548
public Long MaxPlayerCount;
549+
/**
550+
* whether to start as an open session, meaning that players can matchmake into it (defaults to true)
551+
*/
552+
public Boolean StartOpen;
549553

550554
}
551555

@@ -937,7 +941,7 @@ public static class GetUserDataRequest {
937941
/**
938942
* The version that currently exists according to the caller. The call will return the data for all of the keys if the version in the system is greater than this.
939943
*/
940-
public Integer IfChangedFromDataVersion;
944+
public Long IfChangedFromDataVersion;
941945

942946
}
943947

@@ -1596,26 +1600,6 @@ public static class SetPublisherDataResult {
15961600

15971601
}
15981602

1599-
public static class SetStoreSegemntOverridesResult {
1600-
1601-
}
1602-
1603-
public static class SetStoreSegmentOverridesRequest {
1604-
/**
1605-
* Catalog version to use for the request. Defaults to most recent catalog if null.
1606-
*/
1607-
public String CatalogVersion;
1608-
/**
1609-
* The id of the store being overridden. Requests from the client api to store will return the store associated with the override
1610-
*/
1611-
public String BaseStoreId;
1612-
/**
1613-
* The list of overrides in order of evaluation.
1614-
*/
1615-
public ArrayList<StoreSegmentNamePair> Overrides;
1616-
1617-
}
1618-
16191603
public static class SetTitleDataRequest {
16201604
/**
16211605
* key we want to set a value on (note, this is additive - will only replace an existing key's value if they are the same name.) Keys are trimmed of whitespace. Keys may not begin with the '!' character.
@@ -1711,18 +1695,6 @@ public int compareTo(StoreItem other) {
17111695

17121696
}
17131697

1714-
public static class StoreSegmentNamePair {
1715-
/**
1716-
* The id of the store being referenced
1717-
*/
1718-
public String StoreId;
1719-
/**
1720-
* The name of the segment being referenced
1721-
*/
1722-
public String SegmentName;
1723-
1724-
}
1725-
17261698
public static class SubtractUserVirtualCurrencyRequest {
17271699
/**
17281700
* PlayFab unique identifier of the user whose virtual currency balance is to be decreased.
@@ -1776,6 +1748,10 @@ public static class UpdateCloudScriptRequest {
17761748
* Immediately publish the new revision
17771749
*/
17781750
public Boolean Publish;
1751+
/**
1752+
* PlayFab user ID of the developer initiating the request.
1753+
*/
1754+
public String DeveloperPlayFabId;
17791755

17801756
}
17811757

@@ -1993,7 +1969,7 @@ public static class UserCredentials {
19931969
*/
19941970
public String Username;
19951971
/**
1996-
* Password for the PlayFab account (6-30 characters)
1972+
* Password for the PlayFab account (6-100 characters)
19971973
*/
19981974
public String Password;
19991975

0 commit comments

Comments
 (0)