Merge branch 'master' into...
Merge branch 'master' into '116-add-index-memory-for-listing-searching-filtering-spatial-and-named-entities' # Conflicts: # source/RobotAPI/libraries/CMakeLists.txt
No related branches found
No related tags found
Showing
- source/RobotAPI/components/GamepadControlUnit/GamepadControlUnit.h 1 addition, 1 deletion...botAPI/components/GamepadControlUnit/GamepadControlUnit.h
- source/RobotAPI/components/RobotState/RobotStateComponent.cpp 0 additions, 39 deletions...ce/RobotAPI/components/RobotState/RobotStateComponent.cpp
- source/RobotAPI/components/RobotState/RobotStateComponent.h 0 additions, 15 deletionssource/RobotAPI/components/RobotState/RobotStateComponent.h
- source/RobotAPI/components/armem/addon/LegacyRobotStateMemoryAdapter/LegacyRobotStateMemoryAdapter.cpp 29 additions, 7 deletions...RobotStateMemoryAdapter/LegacyRobotStateMemoryAdapter.cpp
- source/RobotAPI/components/armem/addon/LegacyRobotStateMemoryAdapter/LegacyRobotStateMemoryAdapter.h 3 additions, 2 deletions...cyRobotStateMemoryAdapter/LegacyRobotStateMemoryAdapter.h
- source/RobotAPI/components/units/PlatformUnit.cpp 1 addition, 6 deletionssource/RobotAPI/components/units/PlatformUnit.cpp
- source/RobotAPI/components/units/PlatformUnit.h 1 addition, 1 deletionsource/RobotAPI/components/units/PlatformUnit.h
- source/RobotAPI/components/units/PlatformUnitObserver.cpp 13 additions, 13 deletionssource/RobotAPI/components/units/PlatformUnitObserver.cpp
- source/RobotAPI/components/units/PlatformUnitObserver.h 5 additions, 3 deletionssource/RobotAPI/components/units/PlatformUnitObserver.h
- source/RobotAPI/components/units/PlatformUnitSimulation.cpp 11 additions, 7 deletionssource/RobotAPI/components/units/PlatformUnitSimulation.cpp
- source/RobotAPI/components/units/RobotUnit/Units/PlatformSubUnit.h 0 additions, 1 deletion...botAPI/components/units/RobotUnit/Units/PlatformSubUnit.h
- source/RobotAPI/gui-plugins/PlatformUnitPlugin/PlatformUnitGuiPlugin.cpp 13 additions, 26 deletions.../gui-plugins/PlatformUnitPlugin/PlatformUnitGuiPlugin.cpp
- source/RobotAPI/gui-plugins/PlatformUnitPlugin/PlatformUnitGuiPlugin.h 4 additions, 7 deletions...PI/gui-plugins/PlatformUnitPlugin/PlatformUnitGuiPlugin.h
- source/RobotAPI/interface/armem/addon/LegacyRobotStateMemoryAdapterInterface.ice 2 additions, 1 deletion...ce/armem/addon/LegacyRobotStateMemoryAdapterInterface.ice
- source/RobotAPI/interface/core/RobotState.ice 5 additions, 5 deletionssource/RobotAPI/interface/core/RobotState.ice
- source/RobotAPI/interface/observers/PlatformUnitObserverInterface.ice 3 additions, 2 deletions...API/interface/observers/PlatformUnitObserverInterface.ice
- source/RobotAPI/interface/units/PlatformUnitInterface.ice 32 additions, 36 deletionssource/RobotAPI/interface/units/PlatformUnitInterface.ice
- source/RobotAPI/libraries/CMakeLists.txt 1 addition, 0 deletionssource/RobotAPI/libraries/CMakeLists.txt
- source/RobotAPI/libraries/armem_locations/CMakeLists.txt 30 additions, 0 deletionssource/RobotAPI/libraries/armem_locations/CMakeLists.txt
- source/RobotAPI/libraries/armem_locations/aron/Location.xml 44 additions, 0 deletionssource/RobotAPI/libraries/armem_locations/aron/Location.xml
Loading
Please register or sign in to comment