Skip to content
Snippets Groups Projects
Commit a6ba3ad3 authored by Mirko Wächter's avatar Mirko Wächter
Browse files

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

* origin/master:
  Scaling support for RobotStateComponent (also fixes issues with poses of scaled models in the world)
  fixed statechart profile prefix
  RobotStateComponentName is added as an optional property..It was hard coded
  fixed kinematicunit gui dialog: combobox update was not correctly handled
  fixed ft observer visu update cycle
  optimized force torque observer performance

Conflicts:
	source/RobotAPI/components/RobotState/RobotStateComponent.h
parents f7be83bd 7563fe58
No related branches found
No related tags found
Loading
Showing
with 120 additions and 41 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 to comment