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

Merge stabilization 2409 to main #171

Merged
merged 11 commits into from
Oct 9, 2024
Merged

Merge stabilization 2409 to main #171

merged 11 commits into from
Oct 9, 2024

Conversation

nick-l-o3de
Copy link

@nick-l-o3de nick-l-o3de commented Oct 2, 2024 •
edited
Loading

This is the official merge from stabilization/2409 to main for multiplayersample-assets

Do not merge until release day!

No problems encountered.

git switch -c merge_stabilization_2409_to_main upstream/main
  branch 'merge_stabilization_2409_to_main' set up to track 'upstream/main'.
  Switched to a new branch 'merge_stabilization_2409_to_main'

git merge -X theirs --no-ff --no-commit upstream/stabilization/2409
  Automatic merge went well; stopped before committing as requested

git commit --signoff
  [merge_stabilization_2409_to_main 1607599] Merge remote-tracking branch 'upstream/stabilization/2409' into   merge_stabilization_2409_to_main

git diff upstream/stabilization/2409
(no differences reported between the two)

AMZN-Gene and others added 11 commits August 28, 2023 16:28
@AMZN-Gene
Pointing MPS's PopcornFx submole to the latest dev to fix compiler er…
9712be4 
…rors (805f0544273e3ef1321596ae30a0ed94bcf644b5)

Signed-off-by: Gene Walters <[email protected]>
@AMZN-Gene
Merge pull request o3de#164 from o3de/PopcornFxCompileFix
ff7cd48 
PopcornFx Update
@AMZN-Gene
Moving PkFx plugin head to development latest in order to pickup comp…
bdb8645 
…iler error fix due to ScriptCanvas removing ScriptCanvasRegistry class

Signed-off-by: AMZN-Gene <[email protected]>
@AMZN-Gene
Merge pull request o3de#166 from o3de/PopcornScriptCanvasFix
5621d71 
PopcornFx Update: Fix ScriptCanvas Compile Error
@AMZN-Gene
Check valid material before trying to edit to stop spam on servers
82b0c49 
Signed-off-by: Gene Walters <[email protected]>
@AMZN-Gene
Merge pull request o3de#167 from o3de/ServerSpamTeleportFxFix
bb1bd2f 
Multiplayer Sample Server Spam Fix
@AMZN-Gene
Moving MPS Asset development branch to use PopcornFX development bran…
0325ceb 
…ch head 69979c63, which contains the update to support O3DE's new mult-device rendering API. PopcornFX/O3DEPopcornFXPlugin@69979c6

Signed-off-by: AMZN-Gene <[email protected]>
@gadams3
Merge pull request o3de#168 from o3de/PopcornFxFix_MultiDevice
c7a703d 
Multiplayer Sample Assets: PopcornFx Supports O3DE Multidevice Rendering
@AMZN-Gene
Using PopcornFx Plugin development branch @ 8ec714f which contains a …
bb6b7fa 
…compile error fix specifically for 2409 release

Signed-off-by: AMZN-Gene <[email protected]>
@AMZN-Gene
Merge pull request o3de#169 from AMZN-Gene/2409_PopcornFxPlugin_Compi…
b222434 
…leFix

PopcornFx Plugin Compiler Fix (O3DE Engine 2409)
@nick-l-o3de
Merge remote-tracking branch 'upstream/stabilization/2409' into merge…
1607599 
…_stabilization_2409_to_main

No conflicts.
Only output from git is
```
Automatic merge went well; stopped before committing as requested
```

Signed-off-by: Nicholas Lawson <[email protected]>
@nick-l-o3de nick-l-o3de mentioned this pull request Oct 7, 2024
Open
5 tasks
@nick-l-o3de nick-l-o3de merged commit 57736dc into o3de:main Oct 9, 2024
1 check passed
@nick-l-o3de nick-l-o3de deleted the merge_stabilization_2409_to_main branch October 17, 2024 17:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@byrcolin byrcolin byrcolin approved these changes

@AMZN-Gene AMZN-Gene Awaiting requested review from AMZN-Gene

@Ulrick28 Ulrick28 Awaiting requested review from Ulrick28

@spham-amzn spham-amzn Awaiting requested review from spham-amzn

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@nick-l-o3de @byrcolin @AMZN-Gene @gadams3