Commit History

Auteur SHA1 Bericht Datum
  Nicholas Lawson 8d1af315fc Merge pull request #174 from nick-l-o3de/merge_from_development_to_main_25050 1 maand geleden
  Nicholas Lawson a28187914d Merge from development to main for release 25.05.0 2 maanden geleden
  Karl Haubenwallner 005c398647 include scene/viewsrg_all.srgi from the engine instead the scene/viewsrg.srgi from the project (#172) 6 maanden geleden
  Gene Walters 200ac83646 Upgrade PopcornFx 2.20.2 (#173) 6 maanden geleden
  Nicholas Lawson 57736dc401 Merge pull request #171 from nick-l-o3de/merge_stabilization_2409_to_main 10 maanden geleden
  Nicholas Lawson 16075999b5 Merge remote-tracking branch 'upstream/stabilization/2409' into merge_stabilization_2409_to_main 10 maanden geleden
  Gene Walters 338d656924 Pulling latest popcornfx commit to fix dev latest compiler errors (#170) 11 maanden geleden
  Gene Walters b22243482a Merge pull request #169 from AMZN-Gene/2409_PopcornFxPlugin_CompileFix 1 jaar geleden
  AMZN-Gene bb6b7fa838 Using PopcornFx Plugin development branch @ 8ec714f which contains a compile error fix specifically for 2409 release 1 jaar geleden
  Guthrie Adams c7a703d72c Merge pull request #168 from o3de/PopcornFxFix_MultiDevice 1 jaar geleden
  AMZN-Gene 0325cebc00 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. https://github.com/PopcornFX/O3DEPopcornFXPlugin/commit/69979c633caa641dc8a3fc25674f136256f73781 1 jaar geleden
  Gene Walters bb1bd2fd48 Merge pull request #167 from o3de/ServerSpamTeleportFxFix 1 jaar geleden
  Gene Walters 82b0c4964a Check valid material before trying to edit to stop spam on servers 1 jaar geleden
  Gene Walters 5621d71635 Merge pull request #166 from o3de/PopcornScriptCanvasFix 1 jaar geleden
  AMZN-Gene bdb8645ff0 Moving PkFx plugin head to development latest in order to pickup compiler error fix due to ScriptCanvas removing ScriptCanvasRegistry class 1 jaar geleden
  Chris Galvan c529209114 Merge pull request #165 from o3de/cgalvan/gitflow_231005_o3de-multiplayersample-assets 1 jaar geleden
  Chris Galvan b24b0f473b Merge commit 'cd6d15f0ccb4d592453ddc8b194df0dfcc24c85b' into cgalvan/gitflow_231005_o3de-multiplayersample-assets 1 jaar geleden
  Gene Walters ff7cd48de5 Merge pull request #164 from o3de/PopcornFxCompileFix 1 jaar geleden
  Gene Walters 9712be4f77 Pointing MPS's PopcornFx submole to the latest dev to fix compiler errors (805f0544273e3ef1321596ae30a0ed94bcf644b5) 1 jaar geleden
  T.J. Kotha cd6d15f0cc Merge pull request #163 from o3de/UpdatePopcornFXRepo 2 jaren geleden
  T.J. Kotha c3132e8136 updating popcornfx submodule to include cmake fix 2 jaren geleden
  Akio Gaule 8bd723afcd Merge pull request #162 from akioCL/update_popcornFX_commit 2 jaren geleden
  Akio Gaule 980d9416d0 Update PopcornFXPlugin commit to include change needed for O3DE VMA feature 2 jaren geleden
  Mike Balfour c6f23dbe75 Merge pull request #161 from aws-lumberyard-dev/mbalfour/popcornfx_2_16_3 2 jaren geleden
  Mike Balfour 53c826e5ae Upgrade to PopcornFX 2.16.3. 2 jaren geleden
  Alex Peterson d385172525 Merge pull request #160 from o3de/cgalvan/gitflow_230503_o3de-multiplayersample-assets 2 jaren geleden
  Chris Galvan 8d1a8ac99f Merge remote-tracking branch 'upstream/stabilization/2305' into cgalvan/gitflow_230503_o3de-multiplayersample-assets 2 jaren geleden
  Chris Galvan e5fee23753 Revert "Revert "GitFlow 4/6/23 - stabilization/2305 to development - O3DE multiplayersample-assets"" 2 jaren geleden
  T.J. Kotha 0167c47c2d Merge pull request #157 from aws-lumberyard-dev/tkothadev/gitflow_230411_o3de-multiplayersample-assets 2 jaren geleden
  T.J. Kotha 29ffdd23c4 Merge commit '08e0c6a0fb80aa61789f8c7d68dfe6795bb7ed7d' into tkothadev/gitflow_230411_o3de-multiplayersample-assets 2 jaren geleden