Commits · 163a912c9177256524492f5e760ef2c437b84eaf · Software / ArmarX / RobotAPI

Apr 17, 2023

Merge remote-tracking branch 'origin/master' into... · 163a912c

Tobias Gröger authored 1 year ago

Merge remote-tracking branch 'origin/master' into feature/move-laser-scanner-feature-extraction-to-navigation

163a912c

Apr 11, 2023
- Fix empty parent of aron type objects · 07870f31
  Christoph Pohl authored 1 year ago
  
  07870f31
Apr 01, 2023

Merge remote-tracking branch 'origin/master' into... · 24bc76cc

Tobias Gröger authored 2 years ago

Merge remote-tracking branch 'origin/master' into feature/move-laser-scanner-feature-extraction-to-navigation

24bc76cc

Mar 30, 2023
- Add possibility to add global namespace to aron component configs via the plugins prefix · 7a0f7f68
  Christoph Pohl authored 2 years ago
  
  7a0f7f68
- Move most functionality of SkillProviderComponentPluginUser to the Plugin · f5cf7e70
  Christoph Pohl authored 2 years ago
  
  f5cf7e70
Mar 27, 2023
- Merge branch 'fabianpk' into 'master' · 84a1b906
  Fabian Tërnava authored 2 years ago
  
  Merge fabianpk dev branch See merge request !337
  84a1b906
- Merge branch 'fabianpk' of https://git.h2t.iar.kit.edu/sw/armarx/robot-api into fabianpk · 331987f7
  Fabian Tërnava authored 2 years ago
  
  331987f7
- Merge branch 'test/fabianpk' into 'fabianpk' · 3a6290fc
  Fabian Tërnava authored 2 years ago
  
  Test/fabianpk See merge request !338
  3a6290fc
- Merge branch 'skills/dev' into test/fabianpk · bf18e9fe
  Fabian Tërnava authored 2 years ago
  
  # Conflicts: # source/RobotAPI/libraries/armem_skills/server/segment/ExecutableSkillLibrarySegment.cpp
  bf18e9fe
- Merge branch 'aron/dev' into test/fabianpk · be7fb4a1
  Fabian Tërnava authored 2 years ago
  
  be7fb4a1
- Merge remote-tracking branch 'origin/aron/dev' into fabianpk · 0d53c33e
  Fabian Tërnava authored 2 years ago
  
  0d53c33e
- merge · 380f8c54
  Fabian Tërnava authored 2 years ago
  
  380f8c54
- Merge remote-tracking branch 'origin/master' into fabianpk · 0658d898
  Fabian Tërnava authored 2 years ago
  
  # Conflicts: # source/RobotAPI/libraries/armem/core/base/EntityInstanceBase.h
  0658d898
- Merge branch 'armem/dev' into 'master' · 048b653e
  Fabian Tërnava authored 2 years ago
  
  Rename time created See merge request !330
  048b653e
- removed metadata base class. removed nodata dependency to metadata (added by accident) · 26a9af2d
  Fabian Tërnava authored 2 years ago
  
  26a9af2d
- Merge remote-tracking branch 'origin/master' into armem/dev · b06671b1
  Fabian Tërnava authored 2 years ago
  
  b06671b1
- Merge remote-tracking branch 'origin/armem/readd_time_created' into fabianpk · 78803028
  Fabian Tërnava authored 2 years ago
  
  # Conflicts: # source/RobotAPI/libraries/armem/core/base/EntityInstanceBase.h
  78803028
- Merge remote-tracking branch 'origin/armem/dev' into fabianpk · 8bdeb379
  Fabian Tërnava authored 2 years ago
  
  8bdeb379
- Merge remote-tracking branch 'origin/master' into fabianpk · 7bfdb41c
  Fabian Tërnava authored 2 years ago
  
  7bfdb41c
- Merge branch 'fix/improve-cppgen' into 'master' · 8eb1e505
  Fabian Tërnava authored 2 years ago
  
  Fix/improve cppgen See merge request !336
  8eb1e505
- fix codegeneratio of extending objects. Make toAron and fromAron methods... · a550f66b
  Fabian Tërnava authored 2 years ago
  
  fix codegeneratio of extending objects. Make toAron and fromAron methods virtual. Add special base classes for objects and enums which allow template calling of toAron and fromAron methods
  a550f66b
Mar 23, 2023
- Remove include of base class types for extending aron objects · ce09a039
  Christoph Pohl authored 2 years ago
  
  ce09a039
- Make non-static reader and writer mathods virtual or final in case of inheritance · bbdd449c
  Christoph Pohl authored 2 years ago
  
  bbdd449c
Mar 22, 2023
- add default initialization for enum values · 8cabc63e
  Fabian Tërnava authored 2 years ago
  
  8cabc63e
- generate default construction of enums · e4253c36
  Fabian Tërnava authored 2 years ago
  
  e4253c36
- use cppgen improvements · 0b65f864
  Fabian Tërnava authored 2 years ago
  
  0b65f864
Mar 20, 2023
- Fix wrong toAronDTO for IntEnums · 76123799
  Christoph Pohl authored 2 years ago
  
  76123799
- Merge branch 'feature/gamepad-upgrade' into... · 8a98a004
  Tobias Gröger authored 2 years ago
  
  Merge branch 'feature/gamepad-upgrade' into feature/move-laser-scanner-feature-extraction-to-navigation
  8a98a004
- Clean up working directory · 71a79207
  Tobias Gröger authored 2 years ago
  
  71a79207
- Rename accessed to numAccessed · 5416f1cd
  Rainer Kartmann authored 2 years ago
  
  5416f1cd
- Add todo for doc · 61e186e2
  Rainer Kartmann authored 2 years ago
  
  61e186e2
- Fix formatting, update doc · 2c4ff64c
  Rainer Kartmann authored 2 years ago
  
  2c4ff64c
- Merge branch 'master' into armem/dev · 636b0c7a
  Rainer Kartmann authored 2 years ago
  
  636b0c7a
Mar 19, 2023

Merge remote-tracking branch 'origin/master' into... · 14dc123f

Tobias Gröger authored 2 years ago

Merge remote-tracking branch 'origin/master' into feature/move-laser-scanner-feature-extraction-to-navigation

14dc123f

Mar 17, 2023
- add camel2snake conversion · 2943965b
  Fabian Tërnava authored 2 years ago
  
  2943965b
- Merge remote-tracking branch 'origin/master' into fabianpk · b010670c
  Fabian Tërnava authored 2 years ago
  
  b010670c
- Aron generates enums seperately from classes (Allows forward declaration). · 9e1e89e0
  Fabian Tërnava authored 2 years ago
  
  9e1e89e0
- Merge remote-tracking branch 'origin/master' into... · fb1a89da
  Tobias Gröger authored 2 years ago
  
  Merge remote-tracking branch 'origin/master' into feature/move-laser-scanner-feature-extraction-to-navigation
  fb1a89da
Mar 16, 2023
- Merge branch 'master' of https://git.h2t.iar.kit.edu/sw/armarx/robot-api into armem/dev · 0c1ba18f
  Fabian Tërnava authored 2 years ago
  
  0c1ba18f
- Merge branch 'master' of https://git.h2t.iar.kit.edu/sw/armarx/robot-api into skills/dev · c2ad9ed3
  Fabian Tërnava authored 2 years ago
  
  c2ad9ed3