Code

Merge stabilization 2409 to main#171

Code

Merged

nick-l-o3de merged 11 commits intoo3de:maino3de/o3de-multiplayersample-assets:mainfrom nick-l-o3de:merge_stabilization_2409_to_mainnick-l-o3de/o3de-multiplayersample-assets:merge_stabilization_2409_to_mainCopy head branch name to clipboardOct 9, 2024

+743-184

Commits

Commits on Aug 28, 2023

• Pointing MPS's PopcornFx submole to the latest dev to fix compiler errors (805f0544273e3ef1321596ae30a0ed94bcf644b5)

  Show description for 9712be4
  AMZN-Gene

  committed
  9712be4

  Copy full SHA for 9712be4

Commits on Aug 29, 2023

• Merge pull request o3de#164 from o3de/PopcornFxCompileFix

  Show description for ff7cd48
  AMZN-Gene

  authored
  ff7cd48

  Copy full SHA for ff7cd48

Commits on Nov 15, 2023

• Moving PkFx plugin head to development latest in order to pickup compiler error fix due to ScriptCanvas removing ScriptCanvasRegistry class

  Show description for bdb8645
  AMZN-Gene

  committed
  bdb8645

  Copy full SHA for bdb8645

• Merge pull request o3de#166 from o3de/PopcornScriptCanvasFix

  Show description for 5621d71
  AMZN-Gene

  authored
  5621d71

  Copy full SHA for 5621d71

Commits on Feb 9, 2024

• Check valid material before trying to edit to stop spam on servers

  Show description for 82b0c49
  AMZN-Gene

  committed
  82b0c49

  Copy full SHA for 82b0c49

Commits on Feb 13, 2024

• Merge pull request o3de#167 from o3de/ServerSpamTeleportFxFix

  Show description for bb1bd2f
  AMZN-Gene

  authored
  bb1bd2f

  Copy full SHA for bb1bd2f

Commits on Jul 9, 2024

• Moving MPS Asset development branch to use PopcornFX development branch head 69979c63, which contains the update to support O3DE's new mult-device rendering API. PopcornFX/O3DEPopcornFXPlugin@69979c6

  Show description for 0325ceb
  AMZN-Gene

  committed
  0325ceb

  Copy full SHA for 0325ceb

Commits on Jul 10, 2024

• Merge pull request o3de#168 from o3de/PopcornFxFix_MultiDevice

  Show description for c7a703d
  gadams3

  authored
  c7a703d

  Copy full SHA for c7a703d

Commits on Jul 12, 2024

• Using PopcornFx Plugin development branch @ 8ec714f which contains a compile error fix specifically for 2409 release

  Show description for bb6b7fa
  AMZN-Gene

  committed
  bb6b7fa

  Copy full SHA for bb6b7fa

• Merge pull request o3de#169 from AMZN-Gene/2409_PopcornFxPlugin_CompileFix

  Show description for b222434
  AMZN-Gene

  authored
  b222434

  Copy full SHA for b222434

Commits on Oct 2, 2024

• Merge remote-tracking branch 'upstream/stabilization/2409' into merge_stabilization_2409_to_main

  Show description for 1607599
  nick-l-o3de

  committed
  1607599

  Copy full SHA for 1607599