Skip to content

Commit

Permalink
Merge pull request #27 from PlayFab/master
Browse files Browse the repository at this point in the history
Pushing new version
  • Loading branch information
Paul Gilmore committed Oct 19, 2015
2 parents 920b327 + b2f9d4f commit bf845c1
Show file tree
Hide file tree
Showing 14 changed files with 34 additions and 44 deletions.
9 changes: 9 additions & 0 deletions Licenses/Newtonsoft.Json-License.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
The MIT License (MIT)

Copyright (c) 2007 James Newton-King

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.
5 changes: 3 additions & 2 deletions PlayFabClientSDK/source/PlayFabClientModels.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3149,7 +3149,7 @@ public class ModifyUserVirtualCurrencyResult
public string VirtualCurrency { get; set;}

/// <summary>
/// Amount added or subtracted from the user's virtual currency.
/// Amount added or subtracted from the user's virtual currency. Maximum VC balance is Int32 (2,147,483,647). Any increase over this value will be discarded.
/// </summary>
public int BalanceChange { get; set;}

Expand Down Expand Up @@ -4181,6 +4181,7 @@ public enum TransactionStatus
RefundFailed,
ChargedBack,
FailedByUber,
FailedByPlayFab,
Revoked,
TradePending,
Traded,
Expand Down Expand Up @@ -4375,7 +4376,7 @@ public class UnlockContainerItemRequest


/// <summary>
/// Unique identifier of the container to attempt to unlock.
/// Category ItemId of the container type to unlock.
/// </summary>
public string ContainerItemId { get; set;}

Expand Down
2 changes: 1 addition & 1 deletion PlayFabClientSDK/source/PlayFabVersion.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ namespace PlayFab.Internal
{
public class PlayFabVersion
{
public static string ApiRevision = "1.6.20150928";
public static string ApiRevision = "1.7.20151019";
public static string SdkRevision = "1.0.2";

public static string getVersionString()
Expand Down
2 changes: 1 addition & 1 deletion PlayFabSDK/source/PlayFabAdminAPI.cs
Original file line number Diff line number Diff line change
Expand Up @@ -660,7 +660,7 @@ public static async Task<PlayFabResult<AddNewsResult>> AddNewsAsync(AddNewsReque
}

/// <summary>
/// Adds one or more virtual currencies to the set defined for the title
/// Adds one or more virtual currencies to the set defined for the title. Virtual Currencies have a maximum value of 2,147,483,647 when granted to a player. Any value over that will be discarded.
/// </summary>
public static async Task<PlayFabResult<BlankResult>> AddVirtualCurrencyTypesAsync(AddVirtualCurrencyTypesRequest request)
{
Expand Down
6 changes: 3 additions & 3 deletions PlayFabSDK/source/PlayFabAdminModels.cs
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ public class AddUserVirtualCurrencyRequest
public string VirtualCurrency { get; set;}

/// <summary>
/// Amount to be added to the user balance of the specified virtual currency.
/// Amount to be added to the user balance of the specified virtual currency. Maximum VC balance is Int32 (2,147,483,647). Any increase over this value will be discarded.
/// </summary>
public int Amount { get; set;}

Expand Down Expand Up @@ -1810,7 +1810,7 @@ public class ModifyUserVirtualCurrencyResult
public string VirtualCurrency { get; set;}

/// <summary>
/// Amount added or subtracted from the user's virtual currency.
/// Amount added or subtracted from the user's virtual currency. Maximum VC balance is Int32 (2,147,483,647). Any increase over this value will be discarded.
/// </summary>
public int BalanceChange { get; set;}

Expand Down Expand Up @@ -2821,7 +2821,7 @@ public class VirtualCurrencyData
public string DisplayName { get; set;}

/// <summary>
/// amount to automatically grant users upon first login to the tilte
/// amount to automatically grant users upon first login to the title
/// </summary>
public int? InitialDeposit { get; set;}

Expand Down
5 changes: 3 additions & 2 deletions PlayFabSDK/source/PlayFabClientModels.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3149,7 +3149,7 @@ public class ModifyUserVirtualCurrencyResult
public string VirtualCurrency { get; set;}

/// <summary>
/// Amount added or subtracted from the user's virtual currency.
/// Amount added or subtracted from the user's virtual currency. Maximum VC balance is Int32 (2,147,483,647). Any increase over this value will be discarded.
/// </summary>
public int BalanceChange { get; set;}

Expand Down Expand Up @@ -4181,6 +4181,7 @@ public enum TransactionStatus
RefundFailed,
ChargedBack,
FailedByUber,
FailedByPlayFab,
Revoked,
TradePending,
Traded,
Expand Down Expand Up @@ -4375,7 +4376,7 @@ public class UnlockContainerItemRequest


/// <summary>
/// Unique identifier of the container to attempt to unlock.
/// Category ItemId of the container type to unlock.
/// </summary>
public string ContainerItemId { get; set;}

Expand Down
6 changes: 3 additions & 3 deletions PlayFabSDK/source/PlayFabServerModels.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public class AddCharacterVirtualCurrencyRequest
public string VirtualCurrency { get; set;}

/// <summary>
/// Amount to be added to the user balance of the specified virtual currency.
/// Amount to be added to the character balance of the specified virtual currency. Maximum VC balance is Int32 (2,147,483,647). Any increase over this value will be discarded.
/// </summary>
public int Amount { get; set;}

Expand Down Expand Up @@ -114,7 +114,7 @@ public class AddUserVirtualCurrencyRequest
public string VirtualCurrency { get; set;}

/// <summary>
/// Amount to be added to the user balance of the specified virtual currency.
/// Amount to be added to the user balance of the specified virtual currency. Maximum VC balance is Int32 (2,147,483,647). Any increase over this value will be discarded.
/// </summary>
public int Amount { get; set;}

Expand Down Expand Up @@ -2132,7 +2132,7 @@ public class ModifyUserVirtualCurrencyResult
public string VirtualCurrency { get; set;}

/// <summary>
/// Amount added or subtracted from the user's virtual currency.
/// Amount added or subtracted from the user's virtual currency. Maximum VC balance is Int32 (2,147,483,647). Any increase over this value will be discarded.
/// </summary>
public int BalanceChange { get; set;}

Expand Down
2 changes: 1 addition & 1 deletion PlayFabSDK/source/PlayFabVersion.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ namespace PlayFab.Internal
{
public class PlayFabVersion
{
public static string ApiRevision = "1.6.20150928";
public static string ApiRevision = "1.7.20151019";
public static string SdkRevision = "1.0.2";

public static string getVersionString()
Expand Down
2 changes: 1 addition & 1 deletion PlayFabServerSDK/source/PlayFabAdminAPI.cs
Original file line number Diff line number Diff line change
Expand Up @@ -660,7 +660,7 @@ public static async Task<PlayFabResult<AddNewsResult>> AddNewsAsync(AddNewsReque
}

/// <summary>
/// Adds one or more virtual currencies to the set defined for the title
/// Adds one or more virtual currencies to the set defined for the title. Virtual Currencies have a maximum value of 2,147,483,647 when granted to a player. Any value over that will be discarded.
/// </summary>
public static async Task<PlayFabResult<BlankResult>> AddVirtualCurrencyTypesAsync(AddVirtualCurrencyTypesRequest request)
{
Expand Down
6 changes: 3 additions & 3 deletions PlayFabServerSDK/source/PlayFabAdminModels.cs
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ public class AddUserVirtualCurrencyRequest
public string VirtualCurrency { get; set;}

/// <summary>
/// Amount to be added to the user balance of the specified virtual currency.
/// Amount to be added to the user balance of the specified virtual currency. Maximum VC balance is Int32 (2,147,483,647). Any increase over this value will be discarded.
/// </summary>
public int Amount { get; set;}

Expand Down Expand Up @@ -1810,7 +1810,7 @@ public class ModifyUserVirtualCurrencyResult
public string VirtualCurrency { get; set;}

/// <summary>
/// Amount added or subtracted from the user's virtual currency.
/// Amount added or subtracted from the user's virtual currency. Maximum VC balance is Int32 (2,147,483,647). Any increase over this value will be discarded.
/// </summary>
public int BalanceChange { get; set;}

Expand Down Expand Up @@ -2821,7 +2821,7 @@ public class VirtualCurrencyData
public string DisplayName { get; set;}

/// <summary>
/// amount to automatically grant users upon first login to the tilte
/// amount to automatically grant users upon first login to the title
/// </summary>
public int? InitialDeposit { get; set;}

Expand Down
6 changes: 3 additions & 3 deletions PlayFabServerSDK/source/PlayFabServerModels.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public class AddCharacterVirtualCurrencyRequest
public string VirtualCurrency { get; set;}

/// <summary>
/// Amount to be added to the user balance of the specified virtual currency.
/// Amount to be added to the character balance of the specified virtual currency. Maximum VC balance is Int32 (2,147,483,647). Any increase over this value will be discarded.
/// </summary>
public int Amount { get; set;}

Expand Down Expand Up @@ -114,7 +114,7 @@ public class AddUserVirtualCurrencyRequest
public string VirtualCurrency { get; set;}

/// <summary>
/// Amount to be added to the user balance of the specified virtual currency.
/// Amount to be added to the user balance of the specified virtual currency. Maximum VC balance is Int32 (2,147,483,647). Any increase over this value will be discarded.
/// </summary>
public int Amount { get; set;}

Expand Down Expand Up @@ -2132,7 +2132,7 @@ public class ModifyUserVirtualCurrencyResult
public string VirtualCurrency { get; set;}

/// <summary>
/// Amount added or subtracted from the user's virtual currency.
/// Amount added or subtracted from the user's virtual currency. Maximum VC balance is Int32 (2,147,483,647). Any increase over this value will be discarded.
/// </summary>
public int BalanceChange { get; set;}

Expand Down
2 changes: 1 addition & 1 deletion PlayFabServerSDK/source/PlayFabVersion.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ namespace PlayFab.Internal
{
public class PlayFabVersion
{
public static string ApiRevision = "1.6.20150928";
public static string ApiRevision = "1.7.20151019";
public static string SdkRevision = "1.0.2";

public static string getVersionString()
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ SDK for C#/.net environments other than Unity, including Microsoft CLR environme

2. Prerequisites:
----
* Users should be very familiar with the topics covered in our [getting started guide](https://playfab.com/getting-started).
* Users should be very familiar with the topics covered in our [getting started guide](https://playfab.com/docs/getting-started-with-playfab/).

To connect to the PlayFab service, your machine must be running TLS v1.2 or better.
* For Windows, this means Windows 7 and above
Expand Down Expand Up @@ -60,7 +60,7 @@ Do you have ideas on how we can make our products and services better?

Our Developer Success Team can assist with answering any questions as well as process any feedback you have about PlayFab services.

[Forums, Support and Knowledge Base](https://support.playfab.com/support/home)
[Forums, Support and Knowledge Base](https://community.playfab.com/hc/en-us)


6. Copyright and Licensing Information:
Expand Down
21 changes: 0 additions & 21 deletions license.md

This file was deleted.

0 comments on commit bf845c1

Please sign in to comment.