Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge stabilization 2409 to main #171

Merged
merged 11 commits into from
Oct 9, 2024
Merged

Merge stabilization 2409 to main #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9712be4
Pointing MPS's PopcornFx submole to the latest dev to fix compiler er…
AMZN-Gene Aug 28, 2023
ff7cd48
Merge pull request #164 from o3de/PopcornFxCompileFix
AMZN-Gene Aug 29, 2023
bdb8645
Moving PkFx plugin head to development latest in order to pickup comp…
AMZN-Gene Nov 15, 2023
5621d71
Merge pull request #166 from o3de/PopcornScriptCanvasFix
AMZN-Gene Nov 15, 2023
82b0c49
Check valid material before trying to edit to stop spam on servers
AMZN-Gene Feb 9, 2024
bb1bd2f
Merge pull request #167 from o3de/ServerSpamTeleportFxFix
AMZN-Gene Feb 13, 2024
0325ceb
Moving MPS Asset development branch to use PopcornFX development bran…
AMZN-Gene Jul 9, 2024
c7a703d
Merge pull request #168 from o3de/PopcornFxFix_MultiDevice
gadams3 Jul 10, 2024
bb6b7fa
Using PopcornFx Plugin development branch @ 8ec714f which contains a …
AMZN-Gene Jul 12, 2024
b222434
Merge pull request #169 from AMZN-Gene/2409_PopcornFxPlugin_CompileFix
AMZN-Gene Jul 12, 2024
1607599
Merge remote-tracking branch 'upstream/stabilization/2409' into merge…
nick-l-o3de Oct 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gems/O3DEPopcornFXPlugin
Open in desktop
Submodule O3DEPopcornFXPlugin updated 56 files
+24 −0 .github/workflows/draft-release.yml
+1 −0 Assets/PopcornFX_Dependencies.xml
+0 −4 Assets/shaders/Billboard/Default/BillboardDistortion.azsl
+0 −14 Assets/shaders/Billboard/Legacy/BillboardLit_Legacy.azsl
+0 −4 Assets/shaders/Billboard/Legacy/Billboard_Legacy.azsl
+99 −99 Assets/shaders/Common/BillboardSrg.azsli
+174 −196 Assets/shaders/Common/LightingHelper.azsli
+44 −44 Assets/shaders/Common/MaterialSrg.azsli
+1 −2 Assets/shaders/Common/PopcornOptions.azsli
+219 −219 Assets/shaders/Common/RendererFeatures.azsli
+45 −45 Assets/shaders/Common/RendererSrg.azsli
+30 −30 Assets/shaders/Common/RibbonSrg.azsli
+24 −24 Assets/shaders/Depth/Basic/DepthPass.azsl
+19 −19 Assets/shaders/Depth/Basic/DepthPass.shader
+23 −23 Assets/shaders/Depth/Basic/DepthPassTransparentMax.shader
+21 −21 Assets/shaders/Depth/Basic/DepthPassTransparentMin.shader
+35 −35 Assets/shaders/Depth/Billboard/DepthPass.azsl
+34 −34 Assets/shaders/Depth/Billboard/DepthPassBillboard.azsl
+21 −21 Assets/shaders/Depth/Billboard/DepthPassBillboard.shader
+23 −23 Assets/shaders/Depth/Billboard/DepthPassTransparentMaxBillboard.shader
+21 −21 Assets/shaders/Depth/Billboard/DepthPassTransparentMinBillboard.shader
+0 −13 Assets/shaders/Mesh/Legacy/MeshLit_Legacy.azsl
+0 −4 Assets/shaders/Mesh/Legacy/Mesh_Legacy.azsl
+0 −4 Assets/shaders/Ribbon/Default/RibbonDistortion.azsl
+0 −39 Assets/shaders/Ribbon/Legacy/RibbonLit_Legacy.azsl
+0 −4 Assets/shaders/Ribbon/Legacy/Ribbon_Legacy.azsl
+19 −85 CMakeLists.txt
+24 −10 Code/CMakeLists.txt
+0 −6 Code/Include/PopcornFX/PopcornFXBus.h
+11 −3 Code/Platform/Linux/PAL_linux.cmake
+2 −2 Code/Platform/Mac/PAL_mac.cmake
+2 −2 Code/Platform/PopcornFXPackages.cmake
+2 −2 Code/Platform/Windows/PAL_windows.cmake
+1 −5 Code/Source/Components/Samplers/PopcornFXSamplerImage.cpp
+9 −1 Code/Source/Integration/Editor/BakerManager.cpp
+2 −0 Code/Source/Integration/Editor/BakerManager.h
+14 −3 Code/Source/Integration/Managers/RenderManager.cpp
+0 −4 Code/Source/Integration/Managers/StatsManager.cpp
+7 −3 Code/Source/Integration/Managers/WindManager.cpp
+2 −1 Code/Source/Integration/PopcornFXIntegration.cpp
+3 −4 Code/Source/Integration/Preloader/PopcornFXRendererLoader.cpp
+60 −0 Code/Source/Integration/Render/AtomIntegration/BillboardBatchDrawer.cpp
+16 −0 Code/Source/Integration/Render/AtomIntegration/MeshBatchDrawer.cpp
+13 −39 Code/Source/Integration/Render/AtomIntegration/PopcornFXFeatureProcessor.cpp
+14 −10 Code/Source/Integration/Render/AtomIntegration/PopcornFXFeatureProcessor.h
+16 −0 Code/Source/Integration/Render/AtomIntegration/RibbonBatchDrawer.cpp
+0 −4 Code/Source/Integration/ResourceHandlers/ImageResourceHandler.cpp
+0 −9 Code/Source/Integration/ResourceHandlers/MeshResourceHandler.cpp
+8 −8 Code/Source/Integration/Startup/PopcornFxPlugins.cpp
+27 −19 Code/Source/Integration/Startup/PopcornFxPlugins.h
+21 −0 Code/Source/Integration/Startup/PopcornFxStartup.cpp
+4 −0 Code/Source/PopcornFXSystemComponent.cpp
+2 −0 Code/Source/ScriptCanvas/PopcornFXBroadcastNodeable.h
+14 −2 Code/popcornfx_autogen_files.cmake
+2 −2 README.md
+4 −4 gem.json
Loading