Commits · master · BESSON MATTEO / Acetabulaire

14 Dec, 2018 5 commits
- Merge branch 'master' into 'master' · 1b0d5b94
  RUESCAS GWENDAL authored Dec 14, 2018
```
Changement global de la scène Jeu

See merge request T432_DIP18_T3_B/Acetabulaire!59
```
  1b0d5b94
- Changement global de la scène Jeu · a8084f03
  RUHLMANN Olivier authored Dec 14, 2018
  
  a8084f03
- Merge branch 'master' into 'master' · 84404b44
  RUESCAS GWENDAL authored Dec 14, 2018
```
Modification du magasin

See merge request T432_DIP18_T3_B/Acetabulaire!58
```
  84404b44
- Merge branch 'master' of git.unistra.fr:T432_DIP18_T3_B/Acetabulaire · 414375bb
  Gwendal Ruescas authored Dec 14, 2018
  
  414375bb
- Modifications des upgrades · 81dffaa6
  Gwendal Ruescas authored Dec 14, 2018
  
  81dffaa6
13 Dec, 2018 15 commits
- Merge branch 'master' into 'master' · 9bdcc638
  RUESCAS GWENDAL authored Dec 13, 2018
```
Herbier Biome

See merge request T432_DIP18_T3_B/Acetabulaire!57
```
  9bdcc638
- lib · 3a62711e
  GILLMANN KILLIAN authored Dec 13, 2018
  
  3a62711e
- Merge branch 'master' of git.unistra.fr:T432_DIP18_T3_B/Acetabulaire · 42e734e0
  GILLMANN KILLIAN authored Dec 13, 2018
  
  42e734e0
- fix commit precedent · 3d3c0f33
  GILLMANN KILLIAN authored Dec 13, 2018
  
  3d3c0f33
- Merge branch 'master' into 'master' · ef230a3e
  RUESCAS GWENDAL authored Dec 13, 2018
```
Ajout d'images

See merge request T432_DIP18_T3_B/Acetabulaire!56
```
  ef230a3e
- Ajout d'images · bf7e97f6
  RUHLMANN Olivier authored Dec 13, 2018
  
  bf7e97f6
- conflit · 8365e9a0
  GILLMANN KILLIAN authored Dec 13, 2018
  
  8365e9a0
- Ajout Biomes, script affichage Biomes et scene Herbier Biome · a060dbea
  GILLMANN KILLIAN authored Dec 13, 2018
  
  a060dbea
- Merge branch 'master' into 'master' · dd98af61
  RUESCAS GWENDAL authored Dec 13, 2018
```
Modification des fichier textes de bases et des classes Métier

See merge request T432_DIP18_T3_B/Acetabulaire!55
```
  dd98af61
- Modification des fichier textes de bases et des classes Métier · f1851a84
  RUHLMANN Olivier authored Dec 13, 2018
  
  f1851a84
- Merge branch 'patch-1' into 'master' · 2307d59c
  RUESCAS GWENDAL authored Dec 13, 2018
```
Update README.md

See merge request T432_DIP18_T3_B/Acetabulaire!54
```
  2307d59c
- Update README.md · e10e7c7f
  RUESCAS GWENDAL authored Dec 13, 2018
  
  e10e7c7f
- Merge branch 'master' into 'master' · 4dc5c424
  RUESCAS GWENDAL authored Dec 13, 2018
```
Tableau de bord et Images des plantes

See merge request T432_DIP18_T3_B/Acetabulaire!53
```
  4dc5c424
- Nouveau Tableau de bord · 4306b75c
  RUHLMANN Olivier authored Dec 13, 2018
  
  4306b75c
- Plantes plus belles · b63e0e34
  RUHLMANN Olivier authored Dec 13, 2018
  
  b63e0e34
12 Dec, 2018 9 commits
- Merge branch 'master' into 'master' · b795772f
  RUESCAS GWENDAL authored Dec 12, 2018
```
Ajout musique (à remplacer)

See merge request T432_DIP18_T3_B/Acetabulaire!52
```
  b795772f
- Ajout musique (à remplacer) · 21c14bf5
  RUHLMANN Olivier authored Dec 12, 2018
  
  21c14bf5
- Merge branch 'master' into 'master' · 3dfe6d24
  RUESCAS GWENDAL authored Dec 12, 2018
```
Changement des images de fond de biomes et modification de la récupération des images des plantes créées par des Users

See merge request T432_DIP18_T3_B/Acetabulaire!51
```
  3dfe6d24
- commit avant pull 2 (conflits) · e30b4199
  RUHLMANN Olivier authored Dec 12, 2018
  
  e30b4199
- commit avant pull · 58b95258
  RUHLMANN Olivier authored Dec 12, 2018
  
  58b95258
- Merge branch 'master' into 'master' · e5193822
  RUESCAS GWENDAL authored Dec 12, 2018
```
Quizz final

See merge request T432_DIP18_T3_B/Acetabulaire!50
```
  e5193822
- mise à jour des gestionnaires et metiers en rapport avec les questions · eea4d14f
  BESSON MATTEO authored Dec 12, 2018
  
  eea4d14f
- Mise à jour des questions · 4c885d6e
  BESSON MATTEO authored Dec 12, 2018
  
  4c885d6e
- Ameliorations du quizz, conflits resolus · 903c046f
  BESSON MATTEO authored Dec 12, 2018
  
  903c046f
05 Dec, 2018 7 commits
- Avant pull 05/12/2018 · f4ca6617
  BESSON MATTEO authored Dec 05, 2018
  
  f4ca6617
- Merge branch 'master' into 'master' · 9091aea4
  RUESCAS GWENDAL authored Dec 05, 2018
```
Sauvegardes et chargements fonctionnels

See merge request T432_DIP18_T3_B/Acetabulaire!49
```
  9091aea4
- Sauvegardes et chargements fonctionnels · 08e60022
  RUHLMANN Olivier authored Dec 05, 2018
  
  08e60022
- Merge branch 'master' into 'master' · 3e8b9cd0
  RUESCAS GWENDAL authored Dec 05, 2018
```
Quizz fini

See merge request T432_DIP18_T3_B/Acetabulaire!48
```
  3e8b9cd0
- Quizz finis, questions a rajouter · 07627ee4
  BESSON MATTEO authored Dec 05, 2018
  
  07627ee4
- conflict · c1e7be3f
  GILLMANN KILLIAN authored Dec 05, 2018
  
  c1e7be3f
- need le merge · 1719144e
  GILLMANN KILLIAN authored Dec 05, 2018
  
  1719144e
03 Dec, 2018 4 commits
- Merge branch 'master' into 'master' · af4aa336
  RUESCAS GWENDAL authored Dec 03, 2018
```
ajout nutrition dans stats biomes

See merge request T432_DIP18_T3_B/Acetabulaire!47
```
  af4aa336
- ajout nutrition dans stats biomes · 134cb54d
  RUHLMANN Olivier authored Dec 03, 2018
  
  134cb54d
- Merge branch 'master' into 'master' · fd821e5b
  RUESCAS GWENDAL authored Dec 03, 2018
```
Algorithmes Yay

See merge request T432_DIP18_T3_B/Acetabulaire!46
```
  fd821e5b
- Algorithmes Yay · 455e82ed
  RUHLMANN Olivier authored Dec 03, 2018
  
  455e82ed