Merge branch 'master' of https://gitlab.com/ArmarX/RobotAPI
No related branches found
No related tags found
Showing
- CMakeLists.txt 2 additions, 2 deletionsCMakeLists.txt
- data/RobotAPI/robots/Armar3/ArmarIII-Head.xml 1 addition, 1 deletiondata/RobotAPI/robots/Armar3/ArmarIII-Head.xml
- data/RobotAPI/robots/Armar3/ArmarIII-LeftArm.xml 4 additions, 4 deletionsdata/RobotAPI/robots/Armar3/ArmarIII-LeftArm.xml
- source/RobotAPI/components/units/HandUnit.cpp 10 additions, 0 deletionssource/RobotAPI/components/units/HandUnit.cpp
- source/RobotAPI/components/units/HandUnit.h 2 additions, 2 deletionssource/RobotAPI/components/units/HandUnit.h
- source/RobotAPI/components/units/HapticObserver.cpp 23 additions, 0 deletionssource/RobotAPI/components/units/HapticObserver.cpp
- source/RobotAPI/components/units/HeadIKUnit.cpp 4 additions, 1 deletionsource/RobotAPI/components/units/HeadIKUnit.cpp
- source/RobotAPI/components/units/HeadIKUnit.h 1 addition, 0 deletionssource/RobotAPI/components/units/HeadIKUnit.h
- source/RobotAPI/components/units/KinematicUnitObserver.cpp 3 additions, 2 deletionssource/RobotAPI/components/units/KinematicUnitObserver.cpp
- source/RobotAPI/gui-plugins/SensorActorWidgetsPlugin/ArmarXPlotter/ArmarXPlotter.cpp 8 additions, 4 deletions.../SensorActorWidgetsPlugin/ArmarXPlotter/ArmarXPlotter.cpp
- source/RobotAPI/interface/speech/SpeechInterface.ice 8 additions, 0 deletionssource/RobotAPI/interface/speech/SpeechInterface.ice
- source/RobotAPI/interface/units/HandUnitInterface.ice 6 additions, 0 deletionssource/RobotAPI/interface/units/HandUnitInterface.ice
Loading
Please register or sign in to comment