Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

RobotAPI
- Activity
- Members
- Labels
- Container Registry
- Model registry

Snippets Groups Projects

affc2c8e

Commit affc2c8e authored 2 years ago by Fabian Reister

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into...

Merge remote-tracking branch 'origin/master' into feature/component-plugin-for-memory-reader-and-writer

parents c4a92841 ad8ac030

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/ArViz/Client/Elements.h 1 addition, 0 deletions

source/RobotAPI/components/ArViz/Client/Elements.h
source/RobotAPI/components/ArViz/Coin/VisualizationPolygon.h 13 additions, 0 deletions

source/RobotAPI/components/ArViz/Coin/VisualizationPolygon.h
source/RobotAPI/components/DebugDrawerToArViz/DebugDrawerToArViz.cpp 2 additions, 2 deletions

...tAPI/components/DebugDrawerToArViz/DebugDrawerToArViz.cpp
source/RobotAPI/components/armem/addon/LegacyRobotStateMemoryAdapter/LegacyRobotStateMemoryAdapter.cpp 2 additions, 2 deletions

...RobotStateMemoryAdapter/LegacyRobotStateMemoryAdapter.cpp
source/RobotAPI/gui-plugins/PlatformUnitPlugin/PlatformUnitGuiPlugin.cpp 32 additions, 26 deletions

.../gui-plugins/PlatformUnitPlugin/PlatformUnitGuiPlugin.cpp
source/RobotAPI/libraries/armem_robot_state/common/localization/TransformHelper.cpp 1 addition, 1 deletion

...armem_robot_state/common/localization/TransformHelper.cpp

with 51 additions and 31 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment