armem/dev (!235) · Merge requests · Software / ArmarX / RobotAPI

Merged Rainer Kartmann requested to merge armem/dev into master 2 years ago

May 23, 2022
- Merge branch 'master' into armem/dev · 73a616ab
  Rainer Kartmann authored 2 years ago
  
  # Conflicts: # source/RobotAPI/components/armem/server/ObjectMemory/ObjectMemory.cpp
  73a616ab
May 06, 2022
- Add icon for MemoryViewer · eabf72f0
  Rainer Kartmann authored 2 years ago
  
  eabf72f0
May 05, 2022
- Merge branch 'master' into armem/dev · 2a18c20c
  Rainer Kartmann authored 2 years ago
  
  2a18c20c
- Merge branch 'master' into armem/dev · 9f7f152a
  Rainer Kartmann authored 2 years ago
  
  9f7f152a
- Merge branch '90-replace-global-memoryupdates-topic-by-memory-specific-ones' into 'armem/dev' · 729af9b5
  Rainer Kartmann authored 2 years ago
  
  Resolve "Replace global MemoryUpdates topic by memory-specific ones" See merge request ArmarX/RobotAPI!237
  729af9b5
May 04, 2022
- Merge branch 'master' into armem/dev · 7abf77dd
  Rainer Kartmann authored 2 years ago
  
  7abf77dd
May 03, 2022
- Merge branch 'master' into armem/dev · 81f13fcb
  Rainer Kartmann authored 2 years ago
  
  81f13fcb
May 02, 2022
- Merge branch 'master' into armem/dev · bc8f93c2
  Rainer Kartmann authored 2 years ago
  
  # Conflicts: # source/RobotAPI/components/armem/server/ExampleMemory/ExampleMemory.cpp
  bc8f93c2
Apr 27, 2022
- Disable using the global memory updates topic · 4a63ac7f
  Rainer Kartmann authored 2 years ago
  
  4a63ac7f
- Make memory servers provide memory-specific topics · f4985162
  Rainer Kartmann authored 2 years ago
  
  f4985162
- Let the MemoryListener use the respective topic when subscribing a memory ID · afe4852a
  Rainer Kartmann authored 2 years ago
  
  afe4852a
- Replace usage of deprecated functions · 6204102f
  Rainer Kartmann authored 2 years ago
  
  6204102f
- Fix ExampleMemoryTest · c551849d
  Rainer Kartmann authored 2 years ago
  
  c551849d
- Fix aronCodeGenerationTest · 4b71d3eb
  Rainer Kartmann authored 2 years ago
  
  4b71d3eb
- Merge branch 'armem/for-each-instance-in' into 'armem/dev' · 805f1ee0
  Rainer Kartmann authored 2 years ago
  
  Add forEachInstanceIn(memory ID, function) to memory types See merge request ArmarX/RobotAPI!233
  805f1ee0
- Merge branch 'master' into armem/for-each-instance-in · ecfebfb6
  Rainer Kartmann authored 2 years ago
  
  ecfebfb6
Apr 22, 2022
- Remove deprecated functions · 340eee09
  Rainer Kartmann authored 2 years ago
  
  340eee09
- Add forEachInstanceIn(memory ID, function) to memory types · 57a8d88c
  Rainer Kartmann authored 2 years ago
  
  57a8d88c

armem/dev

Merge request reports

Activity