Closed scpeters closed 3 months ago
Port gz-physics7 as of https://github.com/gazebosim/gz-physics/commit/6bcf1af48b016a1e8300e0eed6dcd008fa044cea to main
The conflicts were difficult to resolve, due to some changes in https://github.com/gazebosim/gz-physics/commit/a1cb98905ddce83379b3f8367b3c1fd3c7ffb8fb, so I'm splitting this merge into two parts, first merging with the commit just before that one.
Branch comparison: https://github.com/gazebosim/gz-physics/compare/main...6bcf1af48b016a1e8300e0eed6dcd008fa044cea
Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)
force-pushed to fix package.xml version numbers
part 2 is in https://github.com/gazebosim/gz-physics/pull/670
➡️ Forward port
Port gz-physics7 as of https://github.com/gazebosim/gz-physics/commit/6bcf1af48b016a1e8300e0eed6dcd008fa044cea to main
The conflicts were difficult to resolve, due to some changes in https://github.com/gazebosim/gz-physics/commit/a1cb98905ddce83379b3f8367b3c1fd3c7ffb8fb, so I'm splitting this merge into two parts, first merging with the commit just before that one.
Branch comparison: https://github.com/gazebosim/gz-physics/compare/main...6bcf1af48b016a1e8300e0eed6dcd008fa044cea
Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)