~dartsim/dartsim/+git/trunk:release-7.0

Last commit made on 2024-03-09
Get this branch:
git clone -b release-7.0 https://git.launchpad.net/~dartsim/dartsim/+git/trunk

Branch merges

Branch information

Name:
release-7.0
Repository:
lp:~dartsim/dartsim/+git/trunk

Recent commits

bb43232... by Jeongseok Lee

Merge branch 'release-6.13'

# Conflicts:
# .github/workflows/api_doc.yml
# .github/workflows/ci_macos.yml
# .github/workflows/ci_ubuntu.yml
# .github/workflows/ci_windows.yml
# dart/dynamics/BodyNode.cpp
# dart/dynamics/Skeleton.cpp
# dart/gui/osg/Viewer.cpp
# dart/io/urdf/urdf_world_parser.cpp
# package.xml

de55276... by "Jeongseok (JS) Lee" <email address hidden>

Update CHANGELOG.md

Signed-off-by: Jeongseok (JS) Lee <email address hidden>

e64f433... by "Jeongseok (JS) Lee" <email address hidden>

Update CHANGELOG.md for 6.13.1 release

Signed-off-by: Jeongseok (JS) Lee <email address hidden>

5d5f357... by "Jeongseok (JS) Lee" <email address hidden>

Bump version to 6.13.1

Signed-off-by: Jeongseok (JS) Lee <email address hidden>

284772f... by Steve Peters <email address hidden>

Fix build with urdfdom 4.0.0 (#1779)

Signed-off-by: Steve Peters <email address hidden>

b7f5dd1... by "Jeongseok (JS) Lee" <email address hidden>

Attempt to fix #1769 (#1778)

ad11157... by Jeongseok Lee

Add entt.hpp

(cherry picked from commit 1d9d0cea833bfbf1033eb1f8f0a4fb781c38d17c)

bdddb5d... by Jeongseok Lee

Fix crashing on Issue1445

(cherry picked from commit 1f2b62412342d5b11d6ed2441dcbc6c878498dd5)

cf15489... by Jeongseok Lee

Apply https://github.com/dartsim/dart/pull/1774 to main (7.0)

5d68310... by "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>

Bump github/codeql-action from 2 to 3 (#1776)

Signed-off-by: dependabot[bot] <email address hidden>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>