Merge branch 'master' into DebugDrawerFixAddClearAddBug
Conflicts: source/RobotAPI/components/DebugDrawer/DebugDrawerComponent.cpp
Showing
- CMakeLists.txt 1 addition, 1 deletionCMakeLists.txt
- data/RobotAPI/robots/Armar3/ArmarIII.xml 1 addition, 1 deletiondata/RobotAPI/robots/Armar3/ArmarIII.xml
- data/RobotAPI/tests/robotmodel/ArmarIII-Head.xml 0 additions, 472 deletionsdata/RobotAPI/tests/robotmodel/ArmarIII-Head.xml
- data/RobotAPI/tests/robotmodel/ArmarIII-LeftArm.xml 0 additions, 274 deletionsdata/RobotAPI/tests/robotmodel/ArmarIII-LeftArm.xml
- data/RobotAPI/tests/robotmodel/ArmarIII-LeftHand.xml 0 additions, 469 deletionsdata/RobotAPI/tests/robotmodel/ArmarIII-LeftHand.xml
- data/RobotAPI/tests/robotmodel/ArmarIII-RightArm.xml 0 additions, 255 deletionsdata/RobotAPI/tests/robotmodel/ArmarIII-RightArm.xml
- data/RobotAPI/tests/robotmodel/ArmarIII-RightHand.xml 0 additions, 499 deletionsdata/RobotAPI/tests/robotmodel/ArmarIII-RightHand.xml
- data/RobotAPI/tests/robotmodel/ArmarIII.xml 0 additions, 395 deletionsdata/RobotAPI/tests/robotmodel/ArmarIII.xml
- etc/doxygen/pages/GuiPlugins.dox 2 additions, 0 deletionsetc/doxygen/pages/GuiPlugins.dox
- source/RobotAPI/components/DebugDrawer/DebugDrawerComponent.cpp 136 additions, 1 deletion.../RobotAPI/components/DebugDrawer/DebugDrawerComponent.cpp
- source/RobotAPI/components/DebugDrawer/DebugDrawerComponent.h 15 additions, 0 deletions...ce/RobotAPI/components/DebugDrawer/DebugDrawerComponent.h
- source/RobotAPI/components/RobotState/test/RobotStateTest.cpp 2 additions, 2 deletions...ce/RobotAPI/components/RobotState/test/RobotStateTest.cpp
- source/RobotAPI/components/units/KinematicUnitSimulation.cpp 44 additions, 7 deletionssource/RobotAPI/components/units/KinematicUnitSimulation.cpp
- source/RobotAPI/components/units/KinematicUnitSimulation.h 9 additions, 2 deletionssource/RobotAPI/components/units/KinematicUnitSimulation.h
- source/RobotAPI/components/units/TCPControlUnit.cpp 0 additions, 40 deletionssource/RobotAPI/components/units/TCPControlUnit.cpp
- source/RobotAPI/gui-plugins/CMakeLists.txt 2 additions, 0 deletionssource/RobotAPI/gui-plugins/CMakeLists.txt
- source/RobotAPI/gui-plugins/DebugDrawerViewer/CMakeLists.txt 40 additions, 0 deletionssource/RobotAPI/gui-plugins/DebugDrawerViewer/CMakeLists.txt
- source/RobotAPI/gui-plugins/DebugDrawerViewer/DebugDrawerViewerGuiPlugin.cpp 34 additions, 0 deletions...-plugins/DebugDrawerViewer/DebugDrawerViewerGuiPlugin.cpp
- source/RobotAPI/gui-plugins/DebugDrawerViewer/DebugDrawerViewerGuiPlugin.h 51 additions, 0 deletions...ui-plugins/DebugDrawerViewer/DebugDrawerViewerGuiPlugin.h
- source/RobotAPI/gui-plugins/DebugDrawerViewer/DebugDrawerViewerWidget.ui 28 additions, 0 deletions.../gui-plugins/DebugDrawerViewer/DebugDrawerViewerWidget.ui
Loading
Please register or sign in to comment