Integrating github/staging through commit ab87ed9

This commit is contained in:
alexpete
2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
@@ -66,7 +66,6 @@ namespace InAppPurchases
if (AZ::BehaviorContext* behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
{
behaviorContext->EBus<InAppPurchasesRequestBus>("InAppPurchasesRequestBus")
->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::Preview)
->Event("Initialize", &InAppPurchasesRequestBus::Events::Initialize)
->Event("QueryProductInfo", &InAppPurchasesRequestBus::Events::QueryProductInfo)
->Event("QueryProductInfoFromJson", &InAppPurchasesRequestBus::Events::QueryProductInfoFromJson)
@@ -78,7 +77,6 @@ namespace InAppPurchases
;
behaviorContext->EBus<InAppPurchasesResponseAccessorBus>("InAppPurchasesResponseAccessorBus")
->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::Preview)
->Event("NextProduct", &InAppPurchasesResponseAccessorBus::Events::GetNextProduct)
->Event("PreviousProduct", &InAppPurchasesResponseAccessorBus::Events::GetPreviousProduct)
->Event("NextPurchasedProduct", &InAppPurchasesResponseAccessorBus::Events::GetNextPurchasedProduct)
@@ -195,8 +193,7 @@ namespace InAppPurchases
if (doc.HasParseError())
{
const char* errorStr = rapidjson::GetParseError_En(doc.GetParseError());
AZ_Warning("LumberyardInAppBilling", false, "Failed to parse product_ids: %s\n", errorStr);
AZ_Warning("LumberyardInAppBilling", false, "Failed to parse product_ids: %s\n", rapidjson::GetParseError_En(doc.GetParseError()));
return;
}
@@ -691,4 +688,4 @@ namespace InAppPurchases
m_productInfoIndex = 0;
m_purchasedProductInfoIndex = 0;
}
}
}