diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml index c12ed2f..3a27427 100644 --- a/.github/workflows/draft-release.yml +++ b/.github/workflows/draft-release.yml @@ -25,6 +25,6 @@ jobs: with: draft: true name: "O3DE Plugin: ${{ github.ref_name }}" - body: "PopcornFX Plugin ${{ github.ref_name }} for O3DE\n + body: "PopcornFX Plugin ${{ github.ref_name }} for O3DE\n\n You can download the PopcornFX Editor and find the full changelog here:\n https://wiki.popcornfx.com/index.php?title=PK-Editor_${{ env.MINOR_VERSION }}#Changelog_${{ env.VERSION }}" \ No newline at end of file diff --git a/Code/CMakeLists.txt b/Code/CMakeLists.txt index a5eea9f..2e0e5c1 100644 --- a/Code/CMakeLists.txt +++ b/Code/CMakeLists.txt @@ -3,7 +3,7 @@ # https://www.popcornfx.com/terms-and-conditions/ #---------------------------------------------------------------------------- -set(POPCORNFX_VERSION 2.18.0) +set(POPCORNFX_VERSION 2.17.5) set(POPCORNFX_LICENSE O3DE) if (PK_O3DE_MAJOR_VERSION GREATER_EQUAL 2205) diff --git a/Code/Platform/Linux/PAL_linux.cmake b/Code/Platform/Linux/PAL_linux.cmake index 8ccceb9..f639b26 100644 --- a/Code/Platform/Linux/PAL_linux.cmake +++ b/Code/Platform/Linux/PAL_linux.cmake @@ -6,12 +6,12 @@ set(LY_PACKAGE_SERVER_URLS ${LY_PACKAGE_SERVER_URLS} "https://downloads.popcornfx.com/o3de-packages") if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64") set(package_name PopcornFX-${POPCORNFX_VERSION}-${POPCORNFX_LICENSE}-linux) - set(pk_package_hash d65bff3e6340cda62c26fc2ebf24ae36d5a7a0fb67c59957e4d630e43dee363b) - set(pk_package_id N54Es3rSQTSjg3EP) + set(pk_package_hash 5ff9e9afd266e59a4180b6b02fc449f6a2b9fa14c7bf2a21e096c16e6865d880) + set(pk_package_id MnAnjQahfswCAghd) elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "aarch64") set(package_name PopcornFX-${POPCORNFX_VERSION}-${POPCORNFX_LICENSE}-linux-aarch64) - set(pk_package_hash d65bff3e6340cda62c26fc2ebf24ae36d5a7a0fb67c59957e4d630e43dee363b_ARM64) - set(pk_package_id N54Es3rSQTSjg3EP_ARM64) + set(pk_package_hash 5ff9e9afd266e59a4180b6b02fc449f6a2b9fa14c7bf2a21e096c16e6865d880_ARM64) + set(pk_package_id MnAnjQahfswCAghd_ARM64) else() message(FATAL_ERROR "Unsupported linux architecture ${CMAKE_SYSTEM_PROCESSOR}") endif() diff --git a/Code/Platform/Mac/PAL_mac.cmake b/Code/Platform/Mac/PAL_mac.cmake index 68eda4e..568fd7c 100644 --- a/Code/Platform/Mac/PAL_mac.cmake +++ b/Code/Platform/Mac/PAL_mac.cmake @@ -5,8 +5,8 @@ set(LY_PACKAGE_SERVER_URLS ${LY_PACKAGE_SERVER_URLS} "https://downloads.popcornfx.com/o3de-packages") set(package_name PopcornFX-${POPCORNFX_VERSION}-${POPCORNFX_LICENSE}-mac) -set(pk_package_hash 3bfa062fe82a7fa60e6723f7b823e4aabff17b222950eba343f94c6583fd4433) -set(pk_package_id UrNFVgQhURATQPPg) +set(pk_package_hash a93f4e2b76bddcff17b0cece7e4ab24749cf3a0923b83a1e398cc5942fd7fa1e) +set(pk_package_id WhzVtT7dWXwN53se) ly_associate_package(PACKAGE_NAME ${package_name} TARGETS PopcornFX PACKAGE_HASH ${pk_package_hash}) pk_download_package_ifn(${package_name} ${pk_package_id}) diff --git a/Code/Platform/Windows/PAL_windows.cmake b/Code/Platform/Windows/PAL_windows.cmake index 34753e6..0d94bbd 100644 --- a/Code/Platform/Windows/PAL_windows.cmake +++ b/Code/Platform/Windows/PAL_windows.cmake @@ -5,8 +5,8 @@ set(LY_PACKAGE_SERVER_URLS ${LY_PACKAGE_SERVER_URLS} "https://downloads.popcornfx.com/o3de-packages") set(package_name PopcornFX-${POPCORNFX_VERSION}-${POPCORNFX_LICENSE}-windows) -set(pk_package_hash 184fc5b17b6febff37ec54f51b8ad40b6932fb4bbe54d07164061eaf6ddf3f25) -set(pk_package_id RdbRePvJnKc2sZGQ) +set(pk_package_hash 5a69729b5ba60b985f01760c5bfc196e4d859be00ab547c1d8647a05081cab4e) +set(pk_package_id cCspcUzeRBfEm9rK) ly_associate_package(PACKAGE_NAME ${package_name} TARGETS PopcornFX PACKAGE_HASH ${pk_package_hash}) pk_download_package_ifn(${package_name} ${pk_package_id}) diff --git a/README.md b/README.md index 127bd9e..948a7bd 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # O3DE PopcornFX Plugin Integrates the **PopcornFX Runtime SDK** into **O3DE** as a Gem. -* **Version:** `v2.18.0` +* **Version:** `v2.17.5` * **O3DE:** `23.05` * **Supported platforms:** `Windows`, `MacOS`, `Linux`, `iOS`, `Android` diff --git a/gem.json b/gem.json index 6c4a1b9..290faf2 100644 --- a/gem.json +++ b/gem.json @@ -1,13 +1,13 @@ { "gem_name": "PopcornFX", - "display_name": "PopcornFX 2.18.0", + "display_name": "PopcornFX 2.17.5", "license": "Community", "license_url": "https://www.popcornfx.com/popcornfx-community-license", "origin": "Persistant Studios - popcornfx.com", "repo_uri": "https://downloads.popcornfx.com/o3de-repo", - "origin_uri": "https://downloads.popcornfx.com/o3de-repo/PopcornFX-2.18/O3DE_PopcornFXGem_v2.18.0_Win64_Linux64_LinuxARM64_Mac64.zip", - "version": "2.18.0", - "last_updated": "2023-09-20", + "origin_uri": "https://downloads.popcornfx.com/o3de-repo/PopcornFX-2.17/O3DE_PopcornFXGem_v2.17.5_Win64_Linux64_LinuxARM64_Mac64.zip", + "version": "2.17.5", + "last_updated": "2023-09-27", "type": "Code", "summary": "The PopcornFX Gem provides real-time FX solution for particle effects.", "canonical_tags": [