Commit 7927f855 authored 1 year ago by Fabian Tërnava

Merge remote-tracking branch 'origin/master' into aron/dev

parents 17eb3696 e8bd802e

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/libraries/PriorKnowledge/core/FinderBase.h 34 additions, 24 deletions

source/RobotAPI/libraries/PriorKnowledge/core/FinderBase.h
source/RobotAPI/libraries/PriorKnowledge/core/FinderInfoBase.h 49 additions, 28 deletions

...e/RobotAPI/libraries/PriorKnowledge/core/FinderInfoBase.h
source/RobotAPI/libraries/PriorKnowledge/objects/ObjectFinder.cpp 165 additions, 4 deletions

...obotAPI/libraries/PriorKnowledge/objects/ObjectFinder.cpp
source/RobotAPI/libraries/PriorKnowledge/objects/ObjectFinder.h 26 additions, 15 deletions

.../RobotAPI/libraries/PriorKnowledge/objects/ObjectFinder.h
source/RobotAPI/libraries/armem_objects/client/instance/ObjectReader.cpp 88 additions, 93 deletions

.../libraries/armem_objects/client/instance/ObjectReader.cpp
source/RobotAPI/libraries/armem_objects/client/instance/ObjectReader.h 19 additions, 123 deletions

...PI/libraries/armem_objects/client/instance/ObjectReader.h
source/RobotAPI/libraries/aron/common/aron_conversions/armarx.h 5 additions, 3 deletions

.../RobotAPI/libraries/aron/common/aron_conversions/armarx.h
source/RobotAPI/libraries/aron/common/aron_conversions/eigen.cpp 2 additions, 2 deletions

...RobotAPI/libraries/aron/common/aron_conversions/eigen.cpp
source/RobotAPI/libraries/aron/common/aron_conversions/eigen.h 13 additions, 1 deletion

...e/RobotAPI/libraries/aron/common/aron_conversions/eigen.h
source/RobotAPI/libraries/aron/common/aron_conversions/framed.cpp 18 additions, 12 deletions

...obotAPI/libraries/aron/common/aron_conversions/framed.cpp
source/RobotAPI/libraries/aron/common/aron_conversions/framed.h 15 additions, 4 deletions

.../RobotAPI/libraries/aron/common/aron_conversions/framed.h
source/RobotAPI/libraries/aron/common/aron_conversions/packagepath.cpp 7 additions, 5 deletions

...PI/libraries/aron/common/aron_conversions/packagepath.cpp
source/RobotAPI/libraries/aron/common/aron_conversions/packagepath.h 16 additions, 3 deletions

...tAPI/libraries/aron/common/aron_conversions/packagepath.h
source/RobotAPI/libraries/aron/common/aron_conversions/simox.cpp 15 additions, 10 deletions

...RobotAPI/libraries/aron/common/aron_conversions/simox.cpp
source/RobotAPI/libraries/aron/common/aron_conversions/simox.h 34 additions, 11 deletions

...e/RobotAPI/libraries/aron/common/aron_conversions/simox.h
source/RobotAPI/libraries/aron/common/aron_conversions/time.cpp 25 additions, 14 deletions

.../RobotAPI/libraries/aron/common/aron_conversions/time.cpp
source/RobotAPI/libraries/aron/common/aron_conversions/time.h 31 additions, 14 deletions

...ce/RobotAPI/libraries/aron/common/aron_conversions/time.h
source/RobotAPI/libraries/aron/core/type/rw/Reader.h 1 addition, 0 deletions

source/RobotAPI/libraries/aron/core/type/rw/Reader.h
source/RobotAPI/libraries/aron/core/type/variant/detail/SpecializedVariant.h 30 additions, 20 deletions

...raries/aron/core/type/variant/detail/SpecializedVariant.h
source/RobotAPI/libraries/skills/provider/mixins/ObjectReadingSkillMixin.h 2 additions, 2 deletions

...ibraries/skills/provider/mixins/ObjectReadingSkillMixin.h

with 595 additions and 388 deletions

Please register or to comment