Merge branch 'armem/dev' of https://gitlab.com/ArmarX/RobotAPI into armem/dev
No related branches found
No related tags found
Showing
- etc/mongocxx/install_mongocxx.sh 3 additions, 0 deletionsetc/mongocxx/install_mongocxx.sh
- scenarios/ArMemCore/ArMemCore.scx 1 addition, 0 deletionsscenarios/ArMemCore/ArMemCore.scx
- scenarios/ArMemCore/config/ArVizStorage.cfg 212 additions, 0 deletionsscenarios/ArMemCore/config/ArVizStorage.cfg
- scenarios/ArMemExample/config/ExampleMemory.cfg 38 additions, 6 deletionsscenarios/ArMemExample/config/ExampleMemory.cfg
- scenarios/ArMemExample/config/ExampleMemoryClient.cfg 8 additions, 0 deletionsscenarios/ArMemExample/config/ExampleMemoryClient.cfg
- scenarios/ArMemObjectMemory/ArMemObjectMemory.scx 7 additions, 7 deletionsscenarios/ArMemObjectMemory/ArMemObjectMemory.scx
- scenarios/ArMemObjectMemory/config/ObjectMemory.cfg 70 additions, 12 deletionsscenarios/ArMemObjectMemory/config/ObjectMemory.cfg
- source/RobotAPI/components/ArViz/Client/Elements.cpp 7 additions, 4 deletionssource/RobotAPI/components/ArViz/Client/Elements.cpp
- source/RobotAPI/components/ArViz/Client/Elements.h 7 additions, 2 deletionssource/RobotAPI/components/ArViz/Client/Elements.h
- source/RobotAPI/components/armem/server/ObjectMemory/ObjectMemory.cpp 19 additions, 11 deletions...API/components/armem/server/ObjectMemory/ObjectMemory.cpp
- source/RobotAPI/components/armem/server/ObjectMemory/ObjectMemory.h 1 addition, 1 deletion...otAPI/components/armem/server/ObjectMemory/ObjectMemory.h
- source/RobotAPI/interface/units/RobotUnit/NJointTaskSpaceDMPController.ice 6 additions, 4 deletions...nterface/units/RobotUnit/NJointTaskSpaceDMPController.ice
- source/RobotAPI/libraries/ArmarXObjects/ObjectFinder.cpp 44 additions, 63 deletionssource/RobotAPI/libraries/ArmarXObjects/ObjectFinder.cpp
- source/RobotAPI/libraries/ArmarXObjects/ObjectFinder.h 22 additions, 6 deletionssource/RobotAPI/libraries/ArmarXObjects/ObjectFinder.h
- source/RobotAPI/libraries/ArmarXObjects/ObjectID.cpp 5 additions, 0 deletionssource/RobotAPI/libraries/ArmarXObjects/ObjectID.cpp
- source/RobotAPI/libraries/ArmarXObjects/ObjectID.h 2 additions, 0 deletionssource/RobotAPI/libraries/ArmarXObjects/ObjectID.h
- source/RobotAPI/libraries/ArmarXObjects/ObjectInfo.cpp 47 additions, 10 deletionssource/RobotAPI/libraries/ArmarXObjects/ObjectInfo.cpp
- source/RobotAPI/libraries/ArmarXObjects/ObjectInfo.h 31 additions, 5 deletionssource/RobotAPI/libraries/ArmarXObjects/ObjectInfo.h
- source/RobotAPI/libraries/ArmarXObjects/test/ArmarXObjectsTest.cpp 43 additions, 1 deletion...botAPI/libraries/ArmarXObjects/test/ArmarXObjectsTest.cpp
- source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointTaskSpaceImpedanceDMPController.cpp 79 additions, 15 deletions...s/DMPController/NJointTaskSpaceImpedanceDMPController.cpp
Loading
Please register or sign in to comment