Merge branch 'master' into refactor/new_arch_armem
# Conflicts: # source/RobotAPI/libraries/DSControllers/Gaussians.h
No related branches found
No related tags found
Showing
- scenarios/ArMemObjectMemory/config/global.cfg 1 addition, 1 deletionscenarios/ArMemObjectMemory/config/global.cfg
- source/RobotAPI/components/ArViz/Example/ArVizExample.cpp 2 additions, 2 deletionssource/RobotAPI/components/ArViz/Example/ArVizExample.cpp
- source/RobotAPI/components/DSObstacleAvoidance/main.cpp 1 addition, 1 deletionsource/RobotAPI/components/DSObstacleAvoidance/main.cpp
- source/RobotAPI/components/DynamicObstacleManager/DynamicObstacleManager.cpp 1 addition, 1 deletion...ponents/DynamicObstacleManager/DynamicObstacleManager.cpp
- source/RobotAPI/components/DynamicObstacleManager/DynamicObstacleManager.h 1 addition, 1 deletion...omponents/DynamicObstacleManager/DynamicObstacleManager.h
- source/RobotAPI/components/DynamicObstacleManager/ManagedObstacle.cpp 1 addition, 1 deletion...API/components/DynamicObstacleManager/ManagedObstacle.cpp
- source/RobotAPI/components/DynamicObstacleManager/ManagedObstacle.h 1 addition, 1 deletion...otAPI/components/DynamicObstacleManager/ManagedObstacle.h
- source/RobotAPI/components/DynamicObstacleManager/test/DynamicObstacleManagerTest.cpp 3 additions, 3 deletions...ynamicObstacleManager/test/DynamicObstacleManagerTest.cpp
- source/RobotAPI/components/NaturalIKTest/NaturalIKTest.cpp 5 additions, 5 deletionssource/RobotAPI/components/NaturalIKTest/NaturalIKTest.cpp
- source/RobotAPI/components/RobotState/RobotStateComponent.cpp 12 additions, 11 deletions...ce/RobotAPI/components/RobotState/RobotStateComponent.cpp
- source/RobotAPI/components/SimpleEpisodicMemoryKinematicUnitConnector/CMakeLists.txt 0 additions, 31 deletions...SimpleEpisodicMemoryKinematicUnitConnector/CMakeLists.txt
- source/RobotAPI/components/SimpleEpisodicMemoryKinematicUnitConnector/SimpleEpisodicMemoryKinematicUnitConnector.cpp 0 additions, 69 deletions...tConnector/SimpleEpisodicMemoryKinematicUnitConnector.cpp
- source/RobotAPI/components/SimpleEpisodicMemoryKinematicUnitConnector/SimpleEpisodicMemoryKinematicUnitConnector.h 0 additions, 59 deletions...nitConnector/SimpleEpisodicMemoryKinematicUnitConnector.h
- source/RobotAPI/components/SimpleEpisodicMemoryKinematicUnitConnector/test/CMakeLists.txt 0 additions, 5 deletions...eEpisodicMemoryKinematicUnitConnector/test/CMakeLists.txt
- source/RobotAPI/components/SimpleEpisodicMemoryKinematicUnitConnector/test/SimpleEpisodicMemoryKinematicUnitConnectorTest.cpp 0 additions, 37 deletions...r/test/SimpleEpisodicMemoryKinematicUnitConnectorTest.cpp
- source/RobotAPI/components/armem/CMakeLists.txt 1 addition, 1 deletionsource/RobotAPI/components/armem/CMakeLists.txt
- source/RobotAPI/components/armem/addon/CMakeLists.txt 1 addition, 0 deletionssource/RobotAPI/components/armem/addon/CMakeLists.txt
- source/RobotAPI/components/armem/addon/LegacyRobotStateMemoryAdapter/CMakeLists.txt 18 additions, 0 deletions.../armem/addon/LegacyRobotStateMemoryAdapter/CMakeLists.txt
- source/RobotAPI/components/armem/addon/LegacyRobotStateMemoryAdapter/LegacyRobotStateMemoryAdapter.cpp 290 additions, 0 deletions...RobotStateMemoryAdapter/LegacyRobotStateMemoryAdapter.cpp
- source/RobotAPI/components/armem/addon/LegacyRobotStateMemoryAdapter/LegacyRobotStateMemoryAdapter.h 125 additions, 0 deletions...cyRobotStateMemoryAdapter/LegacyRobotStateMemoryAdapter.h
Loading
Please register or sign in to comment