Commits · master · T432_DIP18_T3_B / Acetabulaire

14 Dec, 2018 32 commits
- Merge branch 'master' into 'master' · de3d7089
  RUESCAS GWENDAL authored Dec 14, 2018
```
Readme

See merge request !63
```
  de3d7089
- finitions readme · 0809bac5
  GILLMANN KILLIAN authored Dec 14, 2018
  
  0809bac5
- fix apostrophe link · e04864d6
  GILLMANN KILLIAN authored Dec 14, 2018
  
  e04864d6
- test link v2 · 9e016e10
  GILLMANN KILLIAN authored Dec 14, 2018
  
  9e016e10
- test bold link · cd9e951b
  GILLMANN KILLIAN authored Dec 14, 2018
  
  cd9e951b
- fix test · 5278532f
  GILLMANN KILLIAN authored Dec 14, 2018
  
  5278532f
- test · f9e1bdd6
  GILLMANN KILLIAN authored Dec 14, 2018
  
  f9e1bdd6
- test · 1b0a8a0a
  GILLMANN KILLIAN authored Dec 14, 2018
  
  1b0a8a0a
- test · 526e7284
  GILLMANN KILLIAN authored Dec 14, 2018
  
  526e7284
- test lien · 676ab0fa
  GILLMANN KILLIAN authored Dec 14, 2018
  
  676ab0fa
- test lien · 7b7af29c
  GILLMANN KILLIAN authored Dec 14, 2018
  
  7b7af29c
- test lien · 9b141ad9
  GILLMANN KILLIAN authored Dec 14, 2018
  
  9b141ad9
- readme · 76390e80
  GILLMANN KILLIAN authored Dec 14, 2018
  
  76390e80
- test list · f4cbc6ab
  GILLMANN KILLIAN authored Dec 14, 2018
  
  f4cbc6ab
- test list · d7a950d6
  GILLMANN KILLIAN authored Dec 14, 2018
  
  d7a950d6
- mise en forme liste readme · 0bc70721
  GILLMANN KILLIAN authored Dec 14, 2018
  
  0bc70721
- fix liste readme · 54b91e39
  GILLMANN KILLIAN authored Dec 14, 2018
  
  54b91e39
- ajout screen + test screen readme · 4b152d2d
  GILLMANN KILLIAN authored Dec 14, 2018
  
  4b152d2d
- test md · 5076b05e
  GILLMANN KILLIAN authored Dec 14, 2018
  
  5076b05e
- Merge branch 'master' into 'master' · 9faa5990
  RUESCAS GWENDAL authored Dec 14, 2018
```
Installer

See merge request !62
```
  9faa5990
- fix + installer · 69a271df
  GILLMANN KILLIAN authored Dec 14, 2018
  
  69a271df
- Merge branch 'master' of git.unistra.fr:T432_DIP18_T3_B/Acetabulaire · 365b6adb
  GILLMANN KILLIAN authored Dec 14, 2018
  
  365b6adb
- modif interface + readme · 4b27ef98
  GILLMANN KILLIAN authored Dec 14, 2018
  
  4b27ef98
- Merge branch 'master' into 'master' · 0449605b
  RUESCAS GWENDAL authored Dec 14, 2018
```
ajout d'images et de commentaires

See merge request !61
```
  0449605b
- ajout d'images et de commentaires · 5441ab2e
  RUHLMANN Olivier authored Dec 14, 2018
  
  5441ab2e
- Merge branch 'master' into 'master' · daa5917d
  RUESCAS GWENDAL authored Dec 14, 2018
```
Ajout magasin dans la scène Jeu et Images dans CreatePlante

See merge request !60
```
  daa5917d
- Ajout magasin dans la scène Jeu et Images dans CreatePlante · ac0a94b0
  RUHLMANN Olivier authored Dec 14, 2018
  
  ac0a94b0
- Merge branch 'master' into 'master' · 1b0d5b94
  RUESCAS GWENDAL authored Dec 14, 2018
```
Changement global de la scène Jeu

See merge request !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 !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 8 commits
- Merge branch 'master' into 'master' · 9bdcc638
  RUESCAS GWENDAL authored Dec 13, 2018
```
Herbier Biome

See merge request !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 !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