Commits · sprint/cycle8 · Andre Gerhard Ortmann / ARrobot · GitLab

Snippets Groups Projects

Dec 06, 2020
- Merge branch 'feature/dragdroptouchinput' into 'develop' · 71e8e54b
  Kai Biermeier authored Dec 6, 2020
  View commits for tag sprint/cycle8 sprint/cycle8
  
  71e8e54b
- Feature/dragdroptouchinput · 9adea581
  Niladri Mondal authored Dec 6, 2020 and Kai Biermeier committed Dec 6, 2020
  
  9adea581
- Merge branch 'feature/ball_fixing' into 'develop' · b24a0676
  Kai Biermeier authored Dec 6, 2020
  b24a0676
- Feature/ball fixing · 81aed1ce
  Damilola Gbadamosi authored Dec 6, 2020 and Kai Biermeier committed Dec 6, 2020
  
  81aed1ce
- Merge branch 'feature/removeros' into 'develop' · 10e40255
  Kai Biermeier authored Dec 6, 2020
  10e40255
- Feature/removeros · 7bc9d65d
  Hassen Smaoui authored Dec 6, 2020 and Kai Biermeier committed Dec 6, 2020
  
  7bc9d65d
- Merge branch 'revert-60a59475 ' into 'develop' · 3bd1e6bc
  Kai Biermeier authored Dec 6, 2020
  3bd1e6bc
- Revert "Merge branch 'feature/detect_plane' into 'develop'" · ed9c6170
  Kai Biermeier authored Dec 6, 2020
  ed9c6170
- Merge branch 'feature/detect_plane' into 'develop' · 60a59475
  Kai Biermeier authored Dec 6, 2020
  60a59475
- Revert "Material fix" · 4b8ce8c5
  Juliet Chukwuemeka authored Dec 6, 2020 and Kai Biermeier committed Dec 6, 2020
  4b8ce8c5
- Merge branch 'feature/ultrasonic_raycasting' into 'develop' · fdbdb986
  Kai Biermeier authored Dec 6, 2020
  fdbdb986
- Feature/ultrasonic raycasting · cfa4bc00
  Sarah Claudia Krings authored Dec 6, 2020 and Kai Biermeier committed Dec 6, 2020
  
  cfa4bc00
- Merge branch 'feature/fix_robot_dropping' into 'develop' · 58ee2141
  Kai Biermeier authored Dec 6, 2020
  58ee2141
- Merge branch 'feature/syntax_test_fix' into 'develop' · a64a030e
  Kai Biermeier authored Dec 6, 2020
  a64a030e
- Feature/syntax test fix to develop: Fixing all scene errors · 6746249d
  Prakhar Rathi authored Dec 6, 2020 and Kai Biermeier committed Dec 6, 2020
  
  6746249d
- Merge branch 'feature/proper_codegen_int' into 'develop' · 99843f4a
  Kai Biermeier authored Dec 6, 2020
  99843f4a
- implement extension to allow for non pure waypoint programs · 2c852b80
  Kai Biermeier authored Dec 6, 2020
  
  2c852b80
Nov 27, 2020
- Fix disabled plane · 9049f347
  Sarah authored Nov 27, 2020
  
  9049f347
Nov 23, 2020
- Merge branch 'feature/grabdropv2' into 'develop' · 20af1b37
  Kai Biermeier authored Nov 23, 2020
  20af1b37
Nov 22, 2020
- final changes to grab&drop · 259869d8
  Niladri Mondal authored Nov 22, 2020
  
  259869d8
- Merge branch 'conarch' into 'develop' · 0a75b062
  Kai Biermeier authored Nov 22, 2020
  View commits for tag sprint/cycle7 sprint/cycle7
  
  0a75b062
- Conarch · 2c2af007
  Niladri Mondal authored Nov 22, 2020 and Kai Biermeier committed Nov 22, 2020
  
  2c2af007
- Merge branch 'feature/scenario-gen' into 'develop' · a83d56e7
  Kai Biermeier authored Nov 22, 2020
  a83d56e7
- Feature/scenario gen · 0c4ccf43
  Kai Biermeier authored Nov 22, 2020
  
  0c4ccf43
- Merge branch 'feature/robot_physics_animations' into 'develop' · 619eb60d
  Kai Biermeier authored Nov 22, 2020
  619eb60d
- Merge Feature/robot physics animations into develop · b1f03d85
  Sarah Claudia Krings authored Nov 22, 2020 and Kai Biermeier committed Nov 22, 2020
  
  b1f03d85
- Merge branch 'feature/artouchv5' into 'develop' · 4b5f3cca
  Kai Biermeier authored Nov 22, 2020
  4b5f3cca
- Feature/artouchv5 · 1f39f05f
  Niladri Mondal authored Nov 22, 2020 and Kai Biermeier committed Nov 22, 2020
  
  1f39f05f
Nov 21, 2020
- Merge branch 'feature/onscreentouch' into 'develop' · a67b9cfb
  Kai Biermeier authored Nov 21, 2020
  a67b9cfb
- Feature/onscreentouch · e44fc39c
  Hassen Smaoui authored Nov 21, 2020 and Kai Biermeier committed Nov 21, 2020
  
  e44fc39c
- Merge branch 'feature/grab_and_drop' into 'develop' · 090af8b1
  Kai Biermeier authored Nov 21, 2020
  090af8b1
- Sphere Interaction · e1dba3c0
  Damilola Gbadamosi authored Nov 21, 2020 and Kai Biermeier committed Nov 21, 2020
  e1dba3c0
Nov 17, 2020
- Merge branch 'feature/aronscreensync' into 'develop' · 89b22863
  Kai Biermeier authored Nov 17, 2020
  89b22863
- Sync Fix · 4f07d57e
  Hassen Smaoui authored Nov 17, 2020
  
  4f07d57e
Nov 16, 2020
- Merge branch 'feature/onscreentouchinput' into 'develop' · 8275ab47
  Kai Biermeier authored Nov 16, 2020
  8275ab47
- Revert "Update" · f1c69d8e
  Hassen Smaoui authored Nov 16, 2020 and Kai Biermeier committed Nov 16, 2020
  f1c69d8e
- Merge branch 'feature/artouchv3' into 'develop' · 077b055b
  Kai Biermeier authored Nov 16, 2020
  077b055b
- Feature/artouchv3 · 461b815c
  Niladri Mondal authored Nov 16, 2020 and Kai Biermeier committed Nov 16, 2020
  
  461b815c
Nov 08, 2020
- Merge branch 'fix/build-error-dotnet' into 'develop' · abaaa95f
  Kai Biermeier authored Nov 8, 2020
  View commits for tag sprint/cycle6 sprint/cycle6
  
  abaaa95f
- fix · ad84395e
  Kai Biermeier authored Nov 8, 2020
  
  ad84395e