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

Jump to bottom

Merged stabilization/2310 to main #165

Merged
merged 17 commits into from
Oct 9, 2023
Merged

Merged stabilization/2310 to main #165

merged 17 commits into from
Oct 9, 2023

Commits on Apr 7, 2023

  1. Merge commit 'e722208a47af8588fcfa1e4b9a4f3f4b19d2af0e' into daimini/… 

    …gitflow_230407_multiplayersample-assets
    @AMZN-daimini
    AMZN-daimini committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    edf2987 View commit details
    Browse the repository at this point in the history

  2. Merge commit '831a46fa235339e574550875ca6acf556ba11122' into daimini/… 

    …gitflow_230407_multiplayersample-assets

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

# Conflicts:
#	Gems/level_art_mps/Assets/SpaceCannon/Maya2023_SpaceCannon.mb
#	Gems/level_art_mps/Assets/SpaceCannon/SpaceCannon.fbx
#	Gems/level_art_mps/Assets/SpaceCannon/SpaceCannon.fbx.assetinfo
    @AMZN-daimini
    AMZN-daimini committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    b5eac57 View commit details
    Browse the repository at this point in the history

  3. Merge commit '22834999a8abd05e2b8f6a5ea012e061102c997f' into daimini/… 

    …gitflow_230407_multiplayersample-assets
    @AMZN-daimini
    AMZN-daimini committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    6e7978c View commit details
    Browse the repository at this point in the history

  4. Merge commit '6739f1027152e68f67be361d77df2296dbf4e800' into daimini/… 

    …gitflow_230407_multiplayersample-assets
    @AMZN-daimini
    AMZN-daimini committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    d1bc915 View commit details
    Browse the repository at this point in the history

  5. Merge commit '0ffe861272df0c66ffa328d243648352b8825b12' into daimini/… 

    …gitflow_230407_multiplayersample-assets
    @AMZN-daimini
    AMZN-daimini committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    0ceda98 View commit details
    Browse the repository at this point in the history

  6. Merge commit '8bc3916425915d8239ea4f817263efb2e28f9304' into daimini/… 

    …gitflow_230407_multiplayersample-assets
    @AMZN-daimini
    AMZN-daimini committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    e46bdb8 View commit details
    Browse the repository at this point in the history

  7. Merge commit 'f4c3bf5498dc4058db2f470115c199bfbc9fba38' into daimini/… 

    …gitflow_230407_multiplayersample-assets
    @AMZN-daimini
    AMZN-daimini committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    62bdc14 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #156 from o3de/daimini/gitflow_230407_multiplayers… 

    …ample-assets

GitFlow 4/7/23 - stabilization/2305 to development - O3DE multiplayersample-assets
    @AMZN-daimini
    AMZN-daimini authored Apr 7, 2023
    Configuration menu
    Copy the full SHA
    48ba492 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2023

  1. Merge commit '08e0c6a0fb80aa61789f8c7d68dfe6795bb7ed7d' into tkothade… 

    …v/gitflow_230411_o3de-multiplayersample-assets

Signed-off-by: T.J. Kotha <112996779+tkothadev@users.noreply.github.com>
    @tkothadev
    tkothadev committed Apr 12, 2023
    Configuration menu
    Copy the full SHA
    29ffdd2 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #157 from aws-lumberyard-dev/tkothadev/gitflow_230… 

    …411_o3de-multiplayersample-assets

tkothadev/gitflow_230411_o3de-multiplayersample-assets
    @tkothadev
    tkothadev authored Apr 12, 2023
    Configuration menu
    Copy the full SHA
    0167c47 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2023

  1. Upgrade to PopcornFX 2.16.3. 

    Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
    @mbalfour-amzn
    mbalfour-amzn committed May 16, 2023
    Configuration menu
    Copy the full SHA
    53c826e View commit details
    Browse the repository at this point in the history

  2. Merge pull request #161 from aws-lumberyard-dev/mbalfour/popcornfx_2_… 

    …16_3

Upgrade to PopcornFX 2.16.3.
    @mbalfour-amzn
    mbalfour-amzn authored May 16, 2023
    Configuration menu
    Copy the full SHA
    c6f23db View commit details
    Browse the repository at this point in the history

Commits on May 31, 2023

  1. Update PopcornFXPlugin commit to include change needed for O3DE VMA f… 

    …eature

Signed-off-by: Akio Gaule <10719597+akioCL@users.noreply.github.com>
    @akioCL
    akioCL committed May 31, 2023
    Configuration menu
    Copy the full SHA
    980d941 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2023

  1. Merge pull request #162 from akioCL/update_popcornFX_commit 

    Update PopcornFXPlugin commit
    @akioCL
    akioCL authored Jun 2, 2023
    Configuration menu
    Copy the full SHA
    8bd723a View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2023

  1. updating popcornfx submodule to include cmake fix 

    Signed-off-by: T.J. Kotha <112996779+tkothadev@users.noreply.github.com>
    @tkothadev
    tkothadev committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    c3132e8 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #163 from o3de/UpdatePopcornFXRepo 

    updating popcornfx submodule to include cmake fix
    @tkothadev
    tkothadev authored Jul 17, 2023
    Configuration menu
    Copy the full SHA
    cd6d15f View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2023

  1. Merge commit 'cd6d15f0ccb4d592453ddc8b194df0dfcc24c85b' into cgalvan/… 

    …gitflow_231005_o3de-multiplayersample-assets
    @cgalvan
    cgalvan committed Oct 5, 2023
    Configuration menu
    Copy the full SHA
    b24b0f4 View commit details
    Browse the repository at this point in the history