Skip to content

Demo update#260

Closed
Antoni-Robotec wants to merge 6 commits intoo3de:developmentfrom
Antoni-Robotec:demo_update
Closed

Demo update#260
Antoni-Robotec wants to merge 6 commits intoo3de:developmentfrom
Antoni-Robotec:demo_update

Conversation

@Antoni-Robotec
Copy link
Copy Markdown
Contributor

@Antoni-Robotec Antoni-Robotec commented Sep 4, 2023 •
edited by michalpelka
Loading

An update to the demo so that it's compatible with the latest o3de-extras stabilization branch.

Includes the changes from #249, #259, #237 and #240, so those PRs can be closed when this is merged.

AMZN-alexpete and others added 3 commits March 21, 2023 10:03
@AMZN-alexpete
upgrade engine finder to support engine versions
e343b98 
O3DE has been updated to support engine compatibility and version checks, but older projects must update their cmake scripts to take advantage of this new functionality

Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
@jhanca-robotecai
update prefabs to new format
bc4ccec 
Signed-off-by: Jan Hanca <jan.hanca@robotec.ai>
@Antoni-Robotec
Demo update
66dfa36 
Signed-off-by: Antoni Puch <antoni.puch@robotec.ai>
@jhanca-robotecai
Copy link
Copy Markdown
Contributor

jhanca-robotecai commented Sep 5, 2023

Please double-check with the stabilization branch as well (both o3de and o3de-extras). Thanks.

@Antoni-Robotec
Copy link
Copy Markdown
Contributor Author

Antoni-Robotec commented Sep 14, 2023 •
edited
Loading

Please double-check with the stabilization branch as well (both o3de and o3de-extras). Thanks.

In the current version it definitely won't work with them as it requires o3de/o3de-extras#492, which isn't even in the o3de-extras development branch yet.
We can remove the usage of the feature from o3de/o3de-extras#492, but that increases jitteriness of the Kraken. I'll also investigate the possibility of switching to articulation links, which should solve the problem, but as Michał noticed, the lack of support for connections between classic joints and articulation links in o3de (o3de/o3de#16188) will be an issue.
It does work with the o3de stabilization branch though.

@Antoni-Robotec
Merge branch 'update-enginefinder' into demo_update
2eb821c
@Antoni-Robotec
Merge branch 'jh/update_prefabs' into demo_update
d0929d3 
Signed-off-by: Antoni Puch <antoni.puch@robotec.ai>
@Antoni-Robotec
Polishing values to make it look good
08e4edb 
Signed-off-by: Antoni Puch <antoni.puch@robotec.ai>
@Antoni-Robotec Antoni-Robotec marked this pull request as ready for review September 25, 2023 14:36
@michalpelka michalpelka self-requested a review October 6, 2023 19:58
This was referenced Oct 6, 2023
Closed
Closed
Closed
Merged
@jhanca-robotecai
Copy link
Copy Markdown
Contributor

jhanca-robotecai commented Oct 26, 2023

@michalpelka could you please confirm if we can close this PR? I assume so based on your comment in #262.

@jhanca-robotecai
Copy link
Copy Markdown
Contributor

jhanca-robotecai commented Dec 20, 2023

Changes from this PR were integrated in #262, this PR is outdated. Closing without removing the source branch. Please reopen if necessary.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@michalpelka michalpelka Awaiting requested review from michalpelka

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@Antoni-Robotec @jhanca-robotecai @AMZN-alexpete