Commits · develop · Andre Gerhard Ortmann / ARrobot

May 18, 2021
- Merge branch 'feature/website_year6969' into 'develop' · 63904bcd
  Kai Biermeier authored 3 years ago
  
  Feature/website year6969 See merge request skrings/varobotprojectgroup!120
  63904bcd
- Feature/website year6969 · 1c811631
  Hassen Smaoui authored 3 years ago and Kai Biermeier committed 3 years ago
  
  1c811631
Mar 23, 2021
- Merge branch 'feature/website' into 'develop' · 61fc7f2d
  Kai Biermeier authored 3 years ago
  
  update fckmylife See merge request skrings/varobotprojectgroup!119
  61fc7f2d
- update fckmylife · cdbd8b79
  Hassen Smaoui authored 3 years ago and Kai Biermeier committed 3 years ago
  
  cdbd8b79
- Merge branch 'feature/website_enhancement_final' into 'develop' · 48dab166
  Kai Biermeier authored 3 years ago
  
  Feature/website enhancement final See merge request skrings/varobotprojectgroup!118
  48dab166
- Feature/website enhancement final · a8626095
  Hassen Smaoui authored 3 years ago and Kai Biermeier committed 3 years ago
  
  a8626095
Mar 22, 2021
- Merge branch 'feature/website_enhancement_final' into 'develop' · 1d4193b6
  Kai Biermeier authored 3 years ago
  
  Feature/website enhancement final See merge request skrings/varobotprojectgroup!117
  1d4193b6
- Feature/website enhancement final · 4d0b573c
  Hassen Smaoui authored 3 years ago and Kai Biermeier committed 3 years ago
  
  4d0b573c
Mar 17, 2021
- Merge branch 'feature/website_enhancement_v3' into 'develop' · ff8f0a2b
  Kai Biermeier authored 3 years ago
  
  Feature/website enhancement v3 See merge request skrings/varobotprojectgroup!114
  ff8f0a2b
- Reworked team section (with pictures) + Fixed elements showing on top of the... · 179c001c
  Hassen Smaoui authored 3 years ago and Kai Biermeier committed 3 years ago
  
  Reworked team section (with pictures) + Fixed elements showing on top of the navbar when scrolling + Content modification.
  179c001c
Mar 16, 2021
- Merge branch 'feature/final_mods' into 'develop' · 11f2dd83
  Kai Biermeier authored 3 years ago
  
  Feature/final mods See merge request skrings/varobotprojectgroup!116
  11f2dd83
- Feature/final mods · fc006c43
  Sarah Claudia Krings authored 3 years ago and Kai Biermeier committed 3 years ago
  
  fc006c43
Mar 06, 2021

Merge branch 'feature/integrate_simulation' into 'develop' · 289d7b81
Kai Biermeier authored 4 years ago
```
Feature/integrate simulation

See merge request skrings/varobotprojectgroup!113
```
289d7b81

Kai Biermeier authored 4 years ago

+ new position selection button
+ simulate robot button
+ normal background for session management panel
+ strength code panel to full panel

92c4917d

Feb 28, 2021
- Merge branch 'feature/website_enhancement_v2' into 'develop' · 76337c9b
  Kai Biermeier authored 4 years ago
  
  Feature/website enhancement v2 See merge request skrings/varobotprojectgroup!112
  76337c9b
- Feature/website enhancement v2 · 717b435a
  Hassen Smaoui authored 4 years ago and Kai Biermeier committed 4 years ago
  
  717b435a
- Merge branch 'feature/integrate_simulation' into 'develop' · 370236a0
  Kai Biermeier authored 4 years ago
  
  Feature/integrate simulation See merge request skrings/varobotprojectgroup!110
  370236a0
- some important ajustments · 7cf4bf90
  Sarah Claudia Krings authored 4 years ago and Kai Biermeier committed 4 years ago
  
  + new position selection button + simulate robot button + normal background for session management panel + strength code panel to full panel
  7cf4bf90
Feb 13, 2021
- Merge branch 'feature/helpicon' into 'develop' · e6971151
  Kai Biermeier authored 4 years ago
  
  Feature/helpicon See merge request skrings/varobotprojectgroup!109
  View commits for tag sprint/cycle12 sprint/cycle12
  
  e6971151
- Feature/helpicon · 0a45da45
  Niladri Mondal authored 4 years ago and Kai Biermeier committed 4 years ago
  
  0a45da45
- Merge branch 'feature/ui2' into 'develop' · f67b2542
  Kai Biermeier authored 4 years ago
  
  Voice command implemented in all scenes See merge request skrings/varobotprojectgroup!107
  f67b2542
- Voice command implemented in all scenes · 77190096
  Juliet Chukwuemeka authored 4 years ago and Kai Biermeier committed 4 years ago
  
  77190096
Feb 06, 2021
- Merge branch 'fix/physics-engine-build' into 'develop' · 2700b580
  Kai Biermeier authored 4 years ago
  
  fix physics-engine build See merge request skrings/varobotprojectgroup!106
  2700b580
- fix physics-engine build · 5fadd33f
  Kai Biermeier authored 4 years ago
  
  5fadd33f
Feb 05, 2021
- Merge branch 'feature/simulation_cleanup' into 'develop' · ae3c6859
  Kai Biermeier authored 4 years ago
  
  Feature/simulation cleanup See merge request skrings/varobotprojectgroup!105
  ae3c6859
- Feature/simulation cleanup · 8465a32a
  Sarah Claudia Krings authored 4 years ago and Kai Biermeier committed 4 years ago
  
  8465a32a
Feb 04, 2021
- Merge branch 'feature/lego_planedetect' into 'develop' · 832283f3
  Kai Biermeier authored 4 years ago
  
  Merge plane detection for both NXT scenes See merge request skrings/varobotprojectgroup!104
  832283f3
- Merge plane detection for both NXT scenes · caac42c6
  Juliet Chukwuemeka authored 4 years ago and Kai Biermeier committed 4 years ago
  
  caac42c6
Jan 31, 2021
- Merge branch 'feature/voice-commands-scene' into 'develop' · bf35f200
  Kai Biermeier authored 4 years ago
  
  add make and run voice command See merge request skrings/varobotprojectgroup!103
  View commits for tag sprint/cycle11 sprint/cycle11
  
  bf35f200
- add make and run voice command · 9f05447b
  Kai Biermeier authored 4 years ago
  
  9f05447b
- Merge branch 'feature/add_image_materials' into 'develop' · 06433191
  Kai Biermeier authored 4 years ago
  
  Feature/add image materials See merge request skrings/varobotprojectgroup!99
  06433191
- Feature/add image materials · 10cef333
  Sarah Claudia Krings authored 4 years ago and Kai Biermeier committed 4 years ago
  
  10cef333
- Merge branch 'feature/lego_planedetect' into 'develop' · aa1a11e0
  Kai Biermeier authored 4 years ago
  
  Feature/lego planedetect See merge request skrings/varobotprojectgroup!100
  aa1a11e0
- Feature/lego planedetect · cf3b14de
  Juliet Chukwuemeka authored 4 years ago and Kai Biermeier committed 4 years ago
  
  cf3b14de
- Merge branch 'feature/website_enhancement' into 'develop' · 52d8fa0f
  Kai Biermeier authored 4 years ago
  
  Feature/website enhancement See merge request skrings/varobotprojectgroup!102
  52d8fa0f
- Feature/website enhancement · 4168f607
  Hassen Smaoui authored 4 years ago and Kai Biermeier committed 4 years ago
  
  4168f607
- Merge branch 'feature/voice-commands' into 'develop' · 38aa0a62
  Kai Biermeier authored 4 years ago
  
  Feature/voice commands See merge request skrings/varobotprojectgroup!101
  38aa0a62
- Feature/voice commands · 032e0bd6
  Kai Biermeier authored 4 years ago
  
  032e0bd6
- Merge branch 'feature/ui' into 'develop' · 9a5fc058
  Kai Biermeier authored 4 years ago
  
  Feature/ui See merge request skrings/varobotprojectgroup!98
  9a5fc058
- Feature/ui · e9278223
  Kai Biermeier authored 4 years ago
  
  e9278223