Commits · d6b193a88e16f75c136ccb8620abea24ab0c4055 · Software / ArmarX / ArmarXGui

Oct 20, 2023
- Better distinction for linked scenarios and makeLocal functionality · d6b193a8
  Peter Naumann authored 1 year ago
  
  d6b193a8
Oct 19, 2023
- Make linked app instance properties non-editable · 9fb0a48f
  Peter Naumann authored 1 year ago
  
  9fb0a48f
Oct 18, 2023
- Merge branch 'ci' into 'master' · 92b5765c
  Rainer Kartmann authored 1 year ago
  
  Use docker images generated by ArmarXCore for CI and build own docker images See merge request !89
  92b5765c
- Build and test Docker Containers on Master · f918e982
  Rainer Kartmann authored 1 year ago
  
  f918e982
- Merge branch 'fix/gui-plugin-loading' into 'master' · b8ff136c
  Rainer Kartmann authored 1 year ago
  
  Fix automatic loading for some gui plugins See merge request !88
  b8ff136c
- Merge branch 'master' into fix/gui-plugin-loading · 9d95ee76
  Rainer Kartmann authored 1 year ago
  
  # Conflicts: # source/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.cpp
  9d95ee76
- Remove ccache from docker workspace · 5b71ecb8
  Rainer Kartmann authored 1 year ago
  
  5b71ecb8
- Test building docker containers on CI branch · 255ade6c
  Rainer Kartmann authored 1 year ago
  
  255ade6c
- Add dockerfiles, build docker images and test in docker containers · 375e59d5
  Rainer Kartmann authored 1 year ago
  
  375e59d5
- Use docker image generated by ArmarXCore for CI · 1207cb5a
  Rainer Kartmann authored 1 year ago
  
  1207cb5a
- Add logging for new gui plugins in cache · 94291ec9
  Peter Naumann authored 1 year ago
  
  94291ec9
- Add '_qt_plugin' suffix to recognize new gui plugins · 93ae4973
  Peter Naumann authored 1 year ago
  
  93ae4973
Oct 12, 2023
- Merge branch 'main-widgets' into 'master' · 9e67d43b
  Rainer Kartmann authored 1 year ago
  
  Main Widgets: Replace Working Memory GUI with MemoryViewer, reorder See merge request !87
  9e67d43b
- Swap scenario manager and system state monitor · 827a1579
  Rainer Kartmann authored 1 year ago
  
  827a1579
- Replace macro by constants, fix minor warnings · b22777d3
  Rainer Kartmann authored 1 year ago
  
  b22777d3
Oct 11, 2023
- Change order to roughly from "basic" to "advanced" · d1debe55
  Rainer Kartmann authored 1 year ago
  
  d1debe55
- Restore previous order · 171f620a
  Rainer Kartmann authored 1 year ago
  
  171f620a
- Keep order in which widgets are added to mainWidgets · 649f8b38
  Rainer Kartmann authored 1 year ago
  
  649f8b38
- Auto format · 885c638f
  Rainer Kartmann authored 1 year ago
  
  885c638f
Aug 30, 2023
- organized includes (unknown author @ ARMAR-DE) · 215be30b
  ARMAR-DE authored 1 year ago
  
  215be30b
Aug 08, 2023
- Merge branch 'master' of git.h2t.iar.kit.edu:sw/armarx/armarx-gui · f22b8348
  Christoph Pohl authored 1 year ago
  
  f22b8348
- clang autoformat · ca0b6bcf
  Christoph Pohl authored 1 year ago
  
  Signed-off-by: ARMAR-DE <>
  ca0b6bcf
- Fix `armarx gui` trying to start the old memory if `MemoryX` is not in the workspace · e45512cd
  Christoph Pohl authored 1 year ago
  
  Signed-off-by: ARMAR-DE <>
  e45512cd
Aug 03, 2023
- Merge branch 'feature/scenario-manager-armarx-package-autodiscovery' into 'master' · e5af0efd
  Fabian Reister authored 1 year ago
  
  ScenarioManager: auto-discovering all ArmarX packages See merge request !82
  e5af0efd
- finishing implementation · ccc5ec17
  Fabian Reister authored 1 year ago
  
  ccc5ec17
- Merge remote-tracking branch 'origin/master' into... · 790b5d1f
  Fabian Reister authored 1 year ago
  
  Merge remote-tracking branch 'origin/master' into feature/scenario-manager-armarx-package-autodiscovery
  790b5d1f
Aug 02, 2023
- Merge branch 'fix/statechart-editor-cmake-namespaced-packages' into 'master' · ab748ebf
  Fabian Reister authored 1 year ago
  
  StatechartEditor: CMake namespaced packages See merge request !86
  ab748ebf
- minor fixes; especially for displaying package name · 97e6a6df
  Fabian Reister authored 1 year ago
  
  97e6a6df
- draft · c3e3c0c0
  armar-user authored 1 year ago
  
  c3e3c0c0
Aug 01, 2023
- Merge branch 'ci' into 'master' · 6a702b78
  Rainer Kartmann authored 1 year ago
  
  Add CI pipeline See merge request !85
  6a702b78
Jul 31, 2023
- Add CI pipeline · f55ef29c
  Rainer Kartmann authored 1 year ago
  
  f55ef29c
Jun 23, 2023
- Add debugging traces · ecf23230
  Christoph Pohl authored 1 year ago
  
  ecf23230
May 17, 2023
- Move settings into workspace specific files · fe42403a
  Christoph Pohl authored 1 year ago
  
  View commit fe42403a 4 tags
  
  fe42403a
May 08, 2023
- replace @ with -at- in gui name (committed by FR) · c23e06c4
  armar-user authored 1 year ago
  
  View commits for tag demo/2023-05-05/armar6a-1 demo/2023-05-05/armar6a-1
  
  c23e06c4
Apr 29, 2023

Merge remote-tracking branch 'origin/master' into... · 261a2d78

Fabian Reister authored 1 year ago

Merge remote-tracking branch 'origin/master' into feature/scenario-manager-armarx-package-autodiscovery

261a2d78

Apr 27, 2023
- Merge branch 'add-user-and-hostname-to-gui-name' into 'master' · 15844519
  Rainer Kartmann authored 1 year ago
  
  Add user and hostname to gui name See merge request !84
  View commit 15844519 2 tags
  
  15844519
- Use function to make name · 1f4a967e
  Rainer Kartmann authored 1 year ago
  
  1f4a967e
- Remove redundancy, cleanup includes · e217fb6d
  Rainer Kartmann authored 1 year ago
  
  e217fb6d
- Move code to cpp · 8e726501
  Rainer Kartmann authored 1 year ago
  
  8e726501
- Add username and hostname to name of an ArmarX Gui · b3252ec4
  Rainer Kartmann authored 1 year ago
  
  b3252ec4