Commits · cf2f9fc9373a59d17edc196d0f9dfe6f354ace01 · Victor / Krabi

Feb 27, 2016
- Merge branch 'master' of /srv/git/hook_robotique/../repositories/gitRobotique · cf2f9fc9
  root authored Feb 27, 2016
  
  cf2f9fc9
- - Added first code for Majiks (remote Bluetooth controler - standalone & multiplateform) · f648b52b
  GigAnon authored Feb 27, 2016
```
- Lots of stuff based on Pika's work (but refactored & improved)
- Uses Qt5.5, Qwt6, C++11
- Uses Winsock2 on Windows
- Build tested with: MSVC14 x64, Mingw x86, GCC ARM (Android)
```
  f648b52b
Feb 26, 2016
- Merge branch 'master' of /srv/git/hook_robotique/../repositories/gitRobotique · a7a93fd3
  root authored Feb 26, 2016
  
  a7a93fd3
- Merge branch 'master' of em6.club.resel.fr:gitRobotique · 02e226fb
  Arnaud Cadot authored Feb 26, 2016
  
  02e226fb
- Merge branch 'master' of /srv/git/hook_robotique/../repositories/gitRobotique · cb683799
  root authored Feb 26, 2016
  
  cb683799
- Merge branch 'master' of em6.clubs.resel.fr:gitRobotique · e9a4de64
  GigAnon authored Feb 26, 2016
  
  e9a4de64
- Oops · 3207e7c8
  GigAnon authored Feb 26, 2016
  
  3207e7c8
Feb 25, 2016
- Added simulator support for the beacon sensor · 71ac4e29
  Arnaud Cadot authored Feb 25, 2016
  
  71ac4e29
- Merge branch 'master' of /srv/git/hook_robotique/../repositories/gitRobotique · eafc362f
  root authored Feb 25, 2016
  
  eafc362f
- correction des noms des classes de DistanceSensor à Tourelle dans tout le fichier · 1b5da5df
  Victor Dubois authored Feb 25, 2016
  
  1b5da5df
- Merge branch 'master' of /srv/git/hook_robotique/../repositories/gitRobotique · d0d8777c
  root authored Feb 25, 2016
  
  d0d8777c
- Added Table::getBeaconsRelativePosition · 8553b610
  Arnaud Cadot authored Feb 25, 2016
  
  8553b610
- Merge branch 'master' of /srv/git/hook_robotique/../repositories/gitRobotique · e0893d7c
  root authored Feb 25, 2016
  
  e0893d7c
- Added rules to .gitignore · 9664fe7e
  Arnaud Cadot authored Feb 25, 2016
  
  9664fe7e
- Merge branch 'master' of /srv/git/hook_robotique/../repositories/gitRobotique · 5525ec96
  root authored Feb 25, 2016
  
  5525ec96
- Cleaned up some more · 0499e87b
  Arnaud Cadot authored Feb 25, 2016
  
  0499e87b
- Merge branch 'master' of /srv/git/hook_robotique/../repositories/gitRobotique · 135f8256
  root authored Feb 25, 2016
  
  135f8256
- Intégration des fichiers pour la classe tourelle. · f742c128
  Victor Dubois authored Feb 25, 2016
```
Suppression des vieux fichiers correspondants.
```
  f742c128
Feb 24, 2016
- Merge branch 'master' of /srv/git/hook_robotique/../repositories/gitRobotique · 6fcf32af
  root authored Feb 24, 2016
  
  6fcf32af
- Correction de l'indentation + suppression de commentaires sur une stratégie obsolète · 20fecac4
  Guillaume Buret authored Feb 24, 2016
  
  20fecac4
- Merge branch 'master' of /srv/git/hook_robotique/../repositories/gitRobotique · e2183b52
  root authored Feb 24, 2016
  
  e2183b52
- Retrait de code concernant les bougies (vieille coupe de robotique ?) · abde32cc
  Guillaume Buret authored Feb 24, 2016
  
  abde32cc
- Merge branch 'master' of /srv/git/hook_robotique/../repositories/gitRobotique · 777e9132
  root authored Feb 24, 2016
  
  777e9132
- Retrait de vieux code (coupe 2013/2014) · a31253fb
  Victor Dubois authored Feb 24, 2016
  
  a31253fb
- Retrait de vieux code · c3b6210c
  Victor Dubois authored Feb 24, 2016
  
  c3b6210c
- Merge branch 'master' of /srv/git/hook_robotique/../repositories/gitRobotique · a6cb9cf4
  root authored Feb 24, 2016
  
  a6cb9cf4
- Added Krabi2016 / KrabiJunior 2016 ; removed obsolete project files · 23e9c750
  Arnaud Cadot authored Feb 24, 2016
  
  23e9c750
- Merge branch 'master' of /srv/git/hook_robotique/../repositories/gitRobotique · 779b486b
  root authored Feb 24, 2016
  
  779b486b
- Cleaned up the depot, suppressed some warnings in simulator · 79c4f7ae
  Arnaud Cadot authored Feb 24, 2016
  
  79c4f7ae
Feb 11, 2016
- Merge branch 'master' of /srv/git/hook_robotique/../repositories/gitRobotique · abaa49a5
  root authored Feb 11, 2016
  
  abaa49a5
- ajout fichiers tourelle · 1dcfe79c
  Victor Dubois authored Feb 11, 2016
  
  1dcfe79c
Jan 24, 2016
- Merge branch 'master' of /srv/git/hook_robotique/../repositories/gitRobotique · 8e99f530
  root authored Jan 24, 2016
  
  8e99f530
- simulateur 2016 WIP · f4d061ff
  Victor Dubois authored Jan 24, 2016
  
  f4d061ff
Oct 07, 2015
- Merge branch 'master' of /srv/git/hook_robotique/../repositories/gitRobotique · 40bb3f89
  root authored Oct 07, 2015
  
  40bb3f89
- Hum, un return mal placé a été commité... · 1f0a8e27
  Alexandre Manoury authored Oct 07, 2015
  
  1f0a8e27
Jun 23, 2015
- Merge branch 'master' of /srv/git/hook_robotique/../repositories/gitRobotique · 93983e3b
  root authored Jun 23, 2015
  
  93983e3b
- Merge conflict · f1a2518a
  Dylan SADOUN authored Jun 23, 2015
  
  f1a2518a
- Modifs Pika pour debug bluetooth avant forum · c11d7ff8
  Dylan SADOUN authored Jun 23, 2015
  
  c11d7ff8
Jun 13, 2015

Merge branch 'master' of /srv/git/hook_robotique/../repositories/gitRobotique · b8b97886
root authored Jun 13, 2015

b8b97886

Merge branch 'master' of em6.club.resel.fr:gitRobotique · 60da31c6

Axel Baudot authored Jun 13, 2015

Conflicts:
	stm32/include/position.h
	stm32/src/main.cpp
	stm32/src/position.cpp
	stm32/src/simul/table.cpp
	stm32/src/strategie/krabi2015.cpp
	stm32/src/strategie/strategieV2.cpp
	stm32/src/strategie/strategiev3.cpp
	stm32/src/strategie/tapis.cpp

60da31c6