-
Notifications
You must be signed in to change notification settings - Fork 62
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
nick-l-o3de
merged 50 commits into
o3de:main
from
nick-l-o3de:merge_stabilization_to_main
Oct 9, 2024
Merged
Merge stabilization/2409 to main (do not apply until release day) #492
nick-l-o3de
merged 50 commits into
o3de:main
from
nick-l-o3de:merge_stabilization_to_main
Oct 9, 2024
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- 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>
MPSGameLift Gem Compile Fix
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>
GameLift Server Exporter Updates
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>
Export Script Fix
…ibraries using built in linux library package system instead of installing everything from scratch Signed-off-by: AMZN-Gene <genewalt@amazon.com>
…tallSh GameLift Install.sh Cleanup
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>
…rrain Re-Enable Terrain
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>
Update README
…ckages Signed-off-by: AMZN-Gene <genewalt@amazon.com>
Signed-off-by: AMZN-Gene <genewalt@amazon.com>
Delete Old GameLift Export Script
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>
…ssets Fix Particle Fx Asset Compilation
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>
…epadControl Player Gamepad Control
…gger for sprinting Signed-off-by: AMZN-Gene <genewalt@amazon.com>
Gamepad Control: Jump and Sprint
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>
byrcolin
approved these changes
Oct 7, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is the official PR to merge from
stabilization/2409
, intomain
foro3de-multiplayersample
after creating the commit:
(no diffs reported)