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.

Sign up for GitHub

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

Jump to bottom

Add MJCF (MuJoCo model file format) parser #1416

Merged
merged 6 commits into from
Sep 20, 2019
Merged

Add MJCF (MuJoCo model file format) parser #1416

merged 6 commits into from
Sep 20, 2019

Commits on Sep 16, 2019

  1. Add MJCF (MuJoCo model file format) parser

    @jslee02
    jslee02 committed Sep 16, 2019
    Configuration menu
    Copy the full SHA
    e850bc6 View commit details
    Browse the repository at this point in the history

  2. Update changelog

    @jslee02
    jslee02 committed Sep 16, 2019
    Configuration menu
    Copy the full SHA
    b5bd664 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/master' into mjcf_parser 

    # Conflicts:
#	dart/gui/osg/render/BoxShapeNode.cpp
#	dart/gui/osg/render/CapsuleShapeNode.cpp
#	dart/gui/osg/render/ConeShapeNode.cpp
#	dart/gui/osg/render/CylinderShapeNode.cpp
#	dart/gui/osg/render/EllipsoidShapeNode.cpp
#	dart/gui/osg/render/HeightmapShapeNode.hpp
#	dart/gui/osg/render/LineSegmentShapeNode.cpp
#	dart/gui/osg/render/MeshShapeNode.cpp
#	dart/gui/osg/render/MultiSphereShapeNode.cpp
#	dart/gui/osg/render/PlaneShapeNode.cpp
#	dart/gui/osg/render/PointCloudShapeNode.cpp
#	dart/gui/osg/render/SoftMeshShapeNode.cpp
#	dart/gui/osg/render/SphereShapeNode.cpp
#	dart/gui/osg/render/VoxelGridShapeNode.cpp
    @jslee02
    jslee02 committed Sep 16, 2019
    Configuration menu
    Copy the full SHA
    f92323c View commit details
    Browse the repository at this point in the history

  4. Fix python binding

    @jslee02
    jslee02 committed Sep 16, 2019
    Configuration menu
    Copy the full SHA
    29172cd View commit details
    Browse the repository at this point in the history

  5. Fix building on Windows

    Jeongseok Lee committed Sep 16, 2019
    Configuration menu
    Copy the full SHA
    7a0b6c9 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2019

  1. Fix building on windows

    Jeongseok Lee committed Sep 19, 2019
    Configuration menu
    Copy the full SHA
    485de6d View commit details
    Browse the repository at this point in the history