Commit 90e5493e authored 7 months ago by Fabian Reister

Merge remote-tracking branch 'origin/master' into feature/familiar-objects-in-object-memory

parents a59c2043 85d44a7c

No related branches found

No related tags found

1 merge request!470Familiar objects

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/skills/SkillProviderExample/BusyWaiting.cpp 32 additions, 0 deletions

...PI/components/skills/SkillProviderExample/BusyWaiting.cpp
source/RobotAPI/components/skills/SkillProviderExample/BusyWaiting.h 42 additions, 0 deletions

...tAPI/components/skills/SkillProviderExample/BusyWaiting.h
source/RobotAPI/components/skills/SkillProviderExample/CMakeLists.txt 9 additions, 0 deletions

...API/components/skills/SkillProviderExample/CMakeLists.txt
source/RobotAPI/components/skills/SkillProviderExample/Chaining.cpp 1 addition, 1 deletion

...otAPI/components/skills/SkillProviderExample/Chaining.cpp
source/RobotAPI/components/skills/SkillProviderExample/Incomplete.cpp 1 addition, 1 deletion

...API/components/skills/SkillProviderExample/Incomplete.cpp
source/RobotAPI/components/skills/SkillProviderExample/InstantKill.cpp 41 additions, 0 deletions

...PI/components/skills/SkillProviderExample/InstantKill.cpp
source/RobotAPI/components/skills/SkillProviderExample/InstantKill.h 40 additions, 0 deletions

...tAPI/components/skills/SkillProviderExample/InstantKill.h
source/RobotAPI/components/skills/SkillProviderExample/RandomChaining.cpp 72 additions, 0 deletions

...components/skills/SkillProviderExample/RandomChaining.cpp
source/RobotAPI/components/skills/SkillProviderExample/RandomChaining.h 40 additions, 0 deletions

...I/components/skills/SkillProviderExample/RandomChaining.h
source/RobotAPI/components/skills/SkillProviderExample/Recursive.cpp 49 additions, 0 deletions

...tAPI/components/skills/SkillProviderExample/Recursive.cpp
source/RobotAPI/components/skills/SkillProviderExample/Recursive.h 42 additions, 0 deletions

...botAPI/components/skills/SkillProviderExample/Recursive.h
source/RobotAPI/components/skills/SkillProviderExample/SkillProviderExample.cpp 14 additions, 0 deletions

...ents/skills/SkillProviderExample/SkillProviderExample.cpp
source/RobotAPI/components/skills/SkillProviderExample/SkillProviderExample.h 4 additions, 0 deletions

...onents/skills/SkillProviderExample/SkillProviderExample.h
source/RobotAPI/components/skills/SkillProviderExample/aron/RecursiveSkillParams.xml 11 additions, 0 deletions

...skills/SkillProviderExample/aron/RecursiveSkillParams.xml
source/RobotAPI/libraries/armem_skills/server/segment/ExecutableSkillLibrarySegment.cpp 1 addition, 1 deletion

...m_skills/server/segment/ExecutableSkillLibrarySegment.cpp
source/RobotAPI/libraries/armem_skills/server/segment/SkillEventSegment.cpp 7 additions, 3 deletions

...braries/armem_skills/server/segment/SkillEventSegment.cpp
source/RobotAPI/libraries/armem_skills/server/segment/SkillExecutionRequestSegment.cpp 2 additions, 2 deletions

...em_skills/server/segment/SkillExecutionRequestSegment.cpp
source/RobotAPI/libraries/skills/core/Skill.cpp 29 additions, 2 deletions

source/RobotAPI/libraries/skills/core/Skill.cpp
source/RobotAPI/libraries/skills/manager/SkillManagerComponentPlugin.cpp 82 additions, 62 deletions

.../libraries/skills/manager/SkillManagerComponentPlugin.cpp
source/RobotAPI/libraries/skills/manager/SkillManagerComponentPlugin.h 11 additions, 0 deletions

...PI/libraries/skills/manager/SkillManagerComponentPlugin.h

with 530 additions and 72 deletions

Please register or to comment