Commits · master · Software / ArmarX / MemoryX

Mar 18, 2025
- Add new file · 4762f5e2
  Joana Plewnia authored 1 month ago
  
  4762f5e2
- Add new directory · cd082f9d
  Joana Plewnia authored 1 month ago
  
  cd082f9d
Feb 17, 2025
- Merge branch 'fix-missing-includes-from-simox' into 'master' · 3ef58335
  Fabian Reister authored 2 months ago
  
  Fix missing includes from simox See merge request !53
  3ef58335
- add missing includes · 4f15136f
  Julian Tusch authored 2 months ago
  
  4f15136f
- remove deprecated include · 4a6a4a63
  Julian Tusch authored 2 months ago
  
  4a6a4a63
Dec 23, 2024
- moving FindPackage.cmake modules to Simox · 1127d986
  Fabian Reister authored 4 months ago
  
  1127d986
Dec 17, 2024
- Merge branch 'chore/clang-format-17' into 'master' · 5947086a
  Fabian Reister authored 4 months ago
  
  running clang-format-17 on codebase See merge request !51
  5947086a
- fixing build (adding missing includes) · eae545fb
  Fabian Reister authored 4 months ago
  
  eae545fb
- clang-format-17: tests: moving <MemoryX/Test.h> up · 9d026d3a
  Fabian Reister authored 4 months ago
  
  9d026d3a
Dec 16, 2024
- running clang-format-17 on codebase (ice) · 7d769022
  Fabian Reister authored 4 months ago
  
  7d769022
- running clang-format-17 on codebase · c3f1ce40
  Fabian Reister authored 4 months ago
  
  c3f1ce40
Dec 11, 2024
- fixing / optimizing includes · a85242be
  Fabian Reister authored 4 months ago
  
  a85242be
Jan 15, 2024
- Merge remote-tracking branch 'origin/master' into... · 9accf22a
  Fabian Tërnava authored 1 year ago
  
  Merge remote-tracking branch 'origin/master' into fix/statechart-editor-says-libMemoryXUpdater.so-does-not-exist
  View commit 9accf22a 6 tags
  
  9accf22a
Jan 02, 2024
- Merge branch 'chore/ubuntu-24-upgrade' into 'master' · c43a9320
  Christoph Pohl authored 1 year ago
  
  Fix array-bounds compile errors under Gcc13 See merge request !50
  View commit c43a9320 7 tags
  
  c43a9320
Dec 22, 2023
- Fix array-bounds compile errors under Gcc13 · 5fcf46dc
  Christoph Pohl authored 1 year ago
  
  5fcf46dc
Nov 20, 2023
- Fix cyclic dependencies and remove static libraries · 374b9622
  Christoph Pohl authored 1 year ago
  
  374b9622
Nov 17, 2023
- update cmake for IVT · e1dd65af
  ARMAR-6 User authored 1 year ago
  
  Signed-off-by: Fabian R. Jianfeng <jianfeng.gao@kit.edu>
  e1dd65af
Nov 08, 2023
- Fix libMemoryXUpdater.so not existing, because MemoryXUpdater was built as static library. · 8c6585fc
  armar-user authored 1 year ago
  
  Reverts part of 34fe7f8c. May break compilation on Ubuntu 20 and 22 due to a cyclic dependency between libraries.
  8c6585fc
Jan 18, 2023
- Merge branch 'update/armarx-core-test' into 'master' · 37655f6a
  Rainer Kartmann authored 2 years ago
  
  Update to changes in ArmarXCore See merge request !49
  View commit 37655f6a 8 tags
  
  37655f6a
- Update to changes in ArmarXCore · 68fb7d93
  Rainer Kartmann authored 2 years ago
  
  68fb7d93
Dec 20, 2022
- Merge branch 'fix/task-nullptr-error' into 'master' · c733cdbb
  Rainer Kartmann authored 2 years ago
  
  fix task nullptr error See merge request !48
  c733cdbb
Dec 19, 2022
- fix task nullptr error · e2af298b
  Tobias Jacob authored 2 years ago
  
  e2af298b
Nov 11, 2022
- Merge branch 'chore-and-fix/platform-unit-listener-itf' into 'master' · 6ace3b0f
  Fabian Reister authored 2 years ago
  
  fix: removing legacy itf methods (deleted) See merge request !47
  6ace3b0f
- fix: removing legacy itf methods (deleted) · 2083a84f
  Fabian Reister authored 2 years ago
  
  2083a84f
Apr 20, 2022
- cmake: qt5_add_resources instead of adding qrc files directly to sources · e049c7fb
  Fabian Reister authored 3 years ago
  
  View commit e049c7fb 9 tags
  
  e049c7fb
Mar 24, 2022
- Merge branch 'update/armem-uses-armarx-date-time' into 'master' · 731e0607
  Rainer Kartmann authored 3 years ago
  
  Update to using armarx DateTime See merge request ArmarX/MemoryX!45
  731e0607
Mar 23, 2022
- Update to using armarx DateTime · 049bb745
  Rainer Kartmann authored 3 years ago
  
  049bb745
Mar 01, 2022
- added a parameter so that some components do not load all objects form prior knowledge data · 1a35e010
  armar-user authored 3 years ago
  
  1a35e010
Feb 07, 2022
- Add object class mapping to WMObjectPoseProvider · 4c29b3da
  armar-user authored 3 years ago
  
  4c29b3da
Feb 03, 2022
- Merge branch 'update/move-scene-snapshot' into 'master' · 69b60286
  Rainer Kartmann authored 3 years ago
  
  Update to changes in armem_objects See merge request ArmarX/MemoryX!44
  69b60286
- Update to changes in armem_objects · 972e41cb
  Rainer Kartmann authored 3 years ago
  
  972e41cb
- Merge branch 'dev' into 'master' · b0e73503
  Rainer Kartmann authored 3 years ago
  
  Make Importer more reusable See merge request ArmarX/MemoryX!43
  b0e73503
Feb 02, 2022
- move ArmarXObjectsToMemory to importers library · b8cc7d6f
  Rainer Kartmann authored 3 years ago
  
  b8cc7d6f
- Fix handling scene names · 5afd90a8
  Rainer Kartmann authored 3 years ago
  
  5afd90a8
- Split function · 38604c11
  Rainer Kartmann authored 3 years ago
  
  38604c11
Jan 21, 2022
- Fix missing headers · 5c85cb95
  Christoph Pohl authored 3 years ago
  
  5c85cb95
Jan 03, 2022
- ArViz: Use unified commit API · b8f47478
  Fabian Paus authored 3 years ago
  
  b8f47478
- Fixed compilation issues under ubuntu 21.10 · 6e25d620
  Christoph Pohl authored 3 years ago
  
  6e25d620
Dec 03, 2021
- Handle empty frame names · c6106b2f
  Rainer Kartmann authored 3 years ago
  
  c6106b2f
Nov 26, 2021
- Cleanup gui plugin page · f1fc5c76
  Rainer Kartmann authored 3 years ago
  
  f1fc5c76