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.

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 (do not apply until release day) #492

Merged
merged 50 commits into from
Oct 9, 2024

Conversation

nick-l-o3de
Copy link
Contributor

This is the official PR to merge from stabilization/2409, into main for o3de-multiplayersample

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

after creating the commit:

git diff upstream/stabilization/2409

(no diffs reported)

spham-amzn and others added 30 commits August 29, 2023 07:39
 - Renamed, refactored export_standalone_monolithic.py->export_mps.py to use recently refactored `export-project` scripts in O3DE
- Updated testing instructions per changes to export_mps.py (formerly export_standalone_monolithic.py)
- Updates based on update to how the cmake build args are passed in

Co-authored-by: Gene Walters <32776221+AMZN-Gene@users.noreply.github.com>
Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
Signed-off-by: Gene Walters <genewalt@amazon.com>
…_2.17.3

Upgrade Popcorn Fx Assets to 2.17.3
Signed-off-by: Gene Walters <genewalt@amazon.com>
Signed-off-by: Gene Walters <genewalt@amazon.com>
…cle assets to point to fbx.azmodel instead of fbx. Popcorn should probably use another way to match source files with the product it needs to look up.

Signed-off-by: AMZN-Gene <genewalt@amazon.com>
…rades

Adding popcorn particles that were upgraded to 2.17.2 to 2.17.3
…ng install.sh for gamelift linux servers to install system libraries

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
…Linux OS; and this example ought to work in AL2

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
…ng install.sh for gamelift linux servers to install system libraries

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
Signed-off-by: Gene Walters <genewalt@amazon.com>
…Linux OS; and this example ought to work in AL2

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
Signed-off-by: Gene Walters <genewalt@amazon.com>
…ard-dev/o3de-multiplayersample into ExportScriptGameLift

Re-signing using the proper signature.
Signed-off-by: Gene Walters <genewalt@amazon.com>
…t inlux install script

Signed-off-by: Gene Walters <genewalt@amazon.com>
Signed-off-by: AMZN-Gene <genewalt@amazon.com>
…_3.18

Popcorn Fx Library Upgrade (2.17->2.18)
Signed-off-by: AMZN-Gene <genewalt@amazon.com>
…ibraries using built in linux library package system instead of installing everything from scratch

Signed-off-by: AMZN-Gene <genewalt@amazon.com>
Signed-off-by: AMZN-Gene <genewalt@amazon.com>
…CrashWorkAround

Removing Terrain Gradient Until Crash Fixed
…ltiplayer Sample NewstarBase

Signed-off-by: AMZN-Gene <genewalt@amazon.com>
Signed-off-by: AMZN-Gene <genewalt@amazon.com>
* Fix compile and python errors from the export script
* Fix argument for exp.bundle_assets

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
Audio gem was moved to O3DE extras, so users will need to git pull o3de extras and register the audio wwise gem. 
Signed-off-by: AMZN-Gene <genewalt@amazon.com>


Signed-off-by: Gene Walters <32776221+AMZN-Gene@users.noreply.github.com>
AMZN-Gene and others added 20 commits June 5, 2024 13:22
…ckages

Signed-off-by: AMZN-Gene <genewalt@amazon.com>
Signed-off-by: AMZN-Gene <genewalt@amazon.com>
Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
Co-authored-by: Gene Walters <32776221+AMZN-Gene@users.noreply.github.com>
…ng occlusion culling bus

This is another example of a multiplayer entity filtering component that should prevent network replication for players or objects that cannot be seen by the client, if there is an active occlusion culling system that utilizes the occlusion request bus.

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
… names

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
…lume_extensions

Alternate example of multiplier sample entity filtering component using occlusion culling bus
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
Removing deprecated function call from multiplayer sample settings
Signed-off-by: AMZN-Gene <genewalt@amazon.com>
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
…ty_id_to_stab2409

Cherry picking occlusion request bus updates from development branch
…right trigger shoots gun, start button opens menu

Signed-off-by: AMZN-Gene <genewalt@amazon.com>
Signed-off-by: AMZN-Gene <genewalt@amazon.com>
…gger for sprinting

Signed-off-by: AMZN-Gene <genewalt@amazon.com>
This is to be submitted on release day.

testing:
`git diff upstream/stabilization/2409`
indicates that there are no changes / diffs between this
resulting branch, and stabilization/2409.

Signed-off-by: Nicholas Lawson <70027408+nick-l-o3de@users.noreply.github.com>
@nick-l-o3de nick-l-o3de merged commit 3f0b8d2 into o3de:main Oct 9, 2024
1 check passed
@nick-l-o3de nick-l-o3de deleted the merge_stabilization_to_main branch October 17, 2024 17:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants