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

Snippets Groups Projects

Nov 22, 2020
- 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
- Merge branch 'feature/send_command_to_nxt' into 'develop' · dce14fb9
  Kai Biermeier authored Nov 8, 2020
  dce14fb9
- Initial translation of touch input commands to nxt code generator. · d3e32533
  Prakhar Rathi authored Nov 8, 2020 and Kai Biermeier committed Nov 8, 2020
  
  d3e32533
- Merge branch 'feature/ARtouchV2' into 'develop' · 0cee83db
  Kai Biermeier authored Nov 8, 2020
  0cee83db
- Feature/ARtouchv2-New Command · 13958261
  Niladri Mondal authored Nov 8, 2020 and Kai Biermeier committed Nov 8, 2020
  
  13958261
- Merge branch 'feature/fix_robots_broken_by_merge' into 'develop' · 60988294
  Kai Biermeier authored Nov 8, 2020
  60988294
Nov 07, 2020
- Fix ev3 in all scenes, new prefab for robot with plane · 3d290d4b
  Sarah authored Nov 7, 2020
  
  3d290d4b
- Merge branch 'mr/nxt-physics-wo-scene' into 'develop' · 06559c5b
  Kai Biermeier authored Nov 7, 2020
  06559c5b
- changes of... · 63a71c19
  Kai Biermeier authored Nov 7, 2020
  63a71c19
- Merge branch 'feature/sessionManagement' into 'develop' · 76c6fa1b
  Kai Biermeier authored Nov 7, 2020
  76c6fa1b
- Session Management Feature + Tests + Replaced robots in scene logic (sphereRobot -> EV3) · 18162d0e
  Hassen Smaoui authored Nov 7, 2020 and Kai Biermeier committed Nov 7, 2020
  
  18162d0e
- Merge branch 'feature/code-generation' into 'develop' · 6b2fbd37
  Kai Biermeier authored Nov 7, 2020
  6b2fbd37
- initialize code generation · 38e8321b
  Kai Biermeier authored Nov 7, 2020
  
  38e8321b
Nov 06, 2020
- Merge branch 'feature/ci-required-tests-checker' into 'develop' · 42a4db03
  Kai Biermeier authored Nov 6, 2020
  42a4db03
- dont fail on test fail · 7c9c8c88
  Kai Biermeier authored Nov 6, 2020
  
  7c9c8c88
Oct 25, 2020
- Merge branch 'feature/test_uiv2' into 'develop' · 5a082f6b
  Kai Biermeier authored Oct 25, 2020
  View commits for tag sprint/cycle5 sprint/cycle5
  
  5a082f6b
- Feature/test uiv2 · 7718fbf9
  Niladri Mondal authored Oct 25, 2020 and Kai Biermeier committed Oct 25, 2020
  
  7718fbf9
- Merge branch 'feature/robot_animation' into 'develop' · 6739b779
  Kai Biermeier authored Oct 25, 2020
  6739b779
- Feature/robot animation · a3c75781
  Sarah Claudia Krings authored Oct 25, 2020 and Kai Biermeier committed Oct 25, 2020
  
  a3c75781
Oct 24, 2020
- Merge branch 'feature/targetselector' into 'develop' · 306b9302
  Kai Biermeier authored Oct 24, 2020
  306b9302
- Update Menu_TouchInput.prefab · f6039694
  Damilola Gbadamosi authored Oct 24, 2020 and Kai Biermeier committed Oct 24, 2020
  f6039694