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

tkothadev/gitflow_230411_o3de-multiplayersample-assets #157

Conversation

tkothadev
Copy link
Contributor

This PR merges changes from stabilization to development as of 4/11/2023.

No conflicts were detected for this merge.

mcphedar and others added 3 commits April 7, 2023 12:00
Signed-off-by: mcphedar <mcphedar@amazon.com>
updated shield gen prefab damage and fire rate.
…v/gitflow_230411_o3de-multiplayersample-assets

Signed-off-by: T.J. Kotha <112996779+tkothadev@users.noreply.github.com>
@tkothadev tkothadev requested review from a team April 12, 2023 18:24
@tkothadev tkothadev changed the title Tkothadev/gitflow 230411 o3de multiplayersample assets tkothadev/gitflow_230411_o3de-multiplayersample-assets Apr 12, 2023
@tkothadev tkothadev requested a review from a team April 12, 2023 19:06
@tkothadev tkothadev merged commit 0167c47 into o3de:development Apr 12, 2023
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.

4 participants