Commits · 19ed1263ffdb54fdd1726d18d8d0a8167d87ec73 · shield / Corp

07 May, 2018 22 commits
- core documented · 19ed1263
  Guillaume Ortega authored May 07, 2018
  
  19ed1263
- Merge branch 'master' into 'master' · a12763a1
  Edouard Menayde authored May 07, 2018
```
fix grammar mission

See merge request !89
```
  a12763a1
- Merge branch 'doc/characters' into 'master' · 433f8309
  Edouard Menayde authored May 07, 2018
```
characters documented

See merge request !90
```
  433f8309
- characters documented · 5bd19295
  Guillaume Ortega authored May 07, 2018
  
  5bd19295
- mission fix grammar · b2768725
  Loic authored May 07, 2018
  
  b2768725
- Merge branch 'master' of https://forge.univ-lyon1.fr/shield/Corp · aa1c86b1
  Loic authored May 07, 2018
  
  aa1c86b1
- Merge branch 'gui/fixes' into 'master' · d6fb8912
  Edouard Menayde authored May 07, 2018
```
Fixed 2 bugs

See merge request !87
```
  d6fb8912
- Merge branch 'fix/countries' into 'master' · ca3baf58
  Edouard Menayde authored May 07, 2018
```
new countries added

See merge request !88
```
  ca3baf58
- Merge branch 'fix/lastCommit' into 'master' · f4b68c78
  Edouard Menayde authored May 07, 2018
```
errors fixed

See merge request !85
```
  f4b68c78
- 🚑 fixed 2 bugs · e3d72cd8
  Edouard Menayde authored May 07, 2018
  
  e3d72cd8
- new countries added · 116d5314
  Guillaume Ortega authored May 07, 2018
  
  116d5314
- Merge branch 'master' of https://forge.univ-lyon1.fr/shield/Corp · 24c40583
  Loic authored May 07, 2018
  
  24c40583
- Merge branch 'fix/bug' into 'master' · d1bd54b8
  Edouard Menayde authored May 07, 2018
```
Fixing bug

See merge request !86
```
  d1bd54b8
- Merge master · a42b0e16
  Edouard Menayde authored May 07, 2018
  
  a42b0e16
- 🚑 fixes · 110e4bec
  Edouard Menayde authored May 07, 2018
  
  110e4bec
- Merge branch 'master' of https://forge.univ-lyon1.fr/shield/Corp · fda168c4
  Loic authored May 07, 2018
  
  fda168c4
- errors fixed · 8c14d3e7
  Guillaume Ortega authored May 07, 2018
  
  8c14d3e7
- Merge branch 'gui/musicButton' into 'master' · 46ab4b2d
  Edouard Menayde authored May 07, 2018
```
Music toggle button fonctionnal

See merge request !84
```
  46ab4b2d
- Merge branch 'master' of https://forge.univ-lyon1.fr/shield/Corp · e92262f3
  Loic authored May 07, 2018
  
  e92262f3
- Merge branch 'master' into 'master' · 404475ae
  Edouard Menayde authored May 07, 2018
```
Misison generator super mission equalizer

See merge request !83
```
  404475ae
- Merge branch 'master' of https://forge.univ-lyon1.fr/shield/Corp · 38e62a26
  Loic authored May 07, 2018
  
  38e62a26
- Music toggle button fonctionnal · beeaa14c
  Guillaume Ortega authored May 07, 2018
  
  beeaa14c
06 May, 2018 18 commits
- code indent · 69749080
  Loic authored May 06, 2018
  
  69749080
- Mission Generator super mission equalizer · d0e62160
  Loic authored May 06, 2018
  
  d0e62160
- Merge branch 'core/gameOver' into 'master' · c4523096
  Edouard Menayde authored May 06, 2018
```
Core/game over

See merge request !82
```
  c4523096
- Merge branch 'master' of https://forge.univ-lyon1.fr/shield/Corp · a3f769ec
  Loic authored May 06, 2018
  
  a3f769ec
- Game Over available · 855f4764
  Guillaume Ortega authored May 06, 2018
  
  855f4764
- Game Over available · f81bd800
  Guillaume Ortega authored May 06, 2018
  
  f81bd800
- Game Over available · 336381b8
  Guillaume Ortega authored May 06, 2018
  
  336381b8
- Merge branch 'core/save-money' into 'master' · 0fce972a
  Edouard Menayde authored May 06, 2018
```
Save money

See merge request !81
```
  0fce972a
- ✨ save money · f72adc65
  Edouard Menayde authored May 06, 2018
  
  f72adc65
- Merge branch 'master' into 'master' · d63c8f54
  Edouard Menayde authored May 06, 2018
```
Add injury days in feedlist

See merge request !79
```
  d63c8f54
- Merge branch 'gui/improvements' into 'master' · b1573789
  Edouard Menayde authored May 06, 2018
```
Gui improvements

See merge request !80
```
  b1573789
- Merge branch 'master' of https://forge.univ-lyon1.fr/shield/Corp · b670f239
  Loic authored May 06, 2018
  
  b670f239
- Add injury days in feedlist · 4acd205c
  Loic authored May 06, 2018
  
  4acd205c
- ✨ add up and touch arrow for character · 07301138
  Edouard Menayde authored May 06, 2018
  
  07301138
- Merge branch 'master' into 'master' · b9075db2
  Edouard Menayde authored May 06, 2018
```
add commentary in code and clean

See merge request !77
```
  b9075db2
- add comentary · fe78447d
  Loic authored May 06, 2018
  
  fe78447d
- Merge branch 'master' of https://forge.univ-lyon1.fr/shield/Corp into gui/improvements · 90ddc905
  Edouard Menayde authored May 06, 2018
  
  90ddc905
- 💄 hide debug window · cfead083
  Edouard Menayde authored May 06, 2018
  
  cfead083