Commits · 1f8c84d0990bc672b593ea1fc12228e20511f259 · Quentin DRUAULT-AUBIN / lo23-project

19 Dec, 2017 40 commits
- [Com] maj knowIp · 1f8c84d0
  Thibault Chiche authored Dec 19, 2017
  
  1f8c84d0
- Merge branch 'develop' of https://gitlab.utc.fr/qdruault/lo23-project into develop · 327a4231
  Thibault Chiche authored Dec 19, 2017
  
  327a4231
- test · 01312435
  dkonam authored Dec 19, 2017
  
  01312435
- Merge branch 'develop' of https://gitlab.utc.fr/qdruault/lo23-project into develop · e34f9de9
  Thibault Chiche authored Dec 19, 2017
  
  e34f9de9
- [Com]maj m_bleu/rouge · 08948c83
  Thibault Chiche authored Dec 19, 2017
  
  08948c83
- test · bd36ae2c
  dkonam authored Dec 19, 2017
  
  bd36ae2c
- test · acde0b2b
  dkonam authored Dec 19, 2017
  
  acde0b2b
- test · 2483ffa1
  dkonam authored Dec 19, 2017
  
  2483ffa1
- Merge branch 'develop' of https://gitlab.utc.fr/qdruault/lo23-project into develop · 1ac0224a
  dkonam authored Dec 19, 2017
  
  1ac0224a
- test · b5e2be36
  dkonam authored Dec 19, 2017
  
  b5e2be36
- [Com] fix signOut · 7c742fff
  Thibault Chiche authored Dec 19, 2017
  
  7c742fff
- test · 92635b61
  dkonam authored Dec 19, 2017
  
  92635b61
- test · d5ef4b9b
  dkonam authored Dec 19, 2017
  
  d5ef4b9b
- test · c2a4a86c
  dkonam authored Dec 19, 2017
  
  c2a4a86c
- Merge branch 'Data/debugCreationConnection' into develop · 2107a4a6
  dkonam authored Dec 19, 2017
  
  2107a4a6
- Merge branch 'develop' of https://gitlab.utc.fr/qdruault/lo23-project into develop · 866f389a
  dkonam authored Dec 19, 2017
  
  866f389a
- test · 93dcf76f
  dkonam authored Dec 19, 2017
  
  93dcf76f
- [IHMTable] Fix bug in case of NPE with fake attack at (-1;-1) · edd7cc48
  Paul Jeannot authored Dec 19, 2017
  
  edd7cc48
- add logs · a751fe33
  Paul Jeannot authored Dec 19, 2017
  
  a751fe33
- deleting old file when updating playerName · ef04318c
  Lucille Fargeau authored Dec 19, 2017
  
  ef04318c
- Merge branch 'ihm-main/develop' into 'develop' · c2d69a4a
  Peining Li authored Dec 19, 2017
```
Ihm main/develop

See merge request !144
```
  c2d69a4a
- Merge branch 'IHM-Main/secondinteg' into 'ihm-main/develop' · d22a5fec
  Peining Li authored Dec 19, 2017
```
Ihm main/secondinteg

See merge request !143
```
  d22a5fec
- [IHM-MAIN] bug fix · 835aecf4
  Xuhao Lin authored Dec 19, 2017
  
  835aecf4
- Merge branch 'develop' of https://gitlab.utc.fr/qdruault/lo23-project into IHM-Main/secondinteg · 36695175
  Xuhao Lin authored Dec 19, 2017
  
  36695175
- Merge branch 'develop' of https://gitlab.utc.fr/qdruault/lo23-project into develop · 66a2b540
  dkonam authored Dec 19, 2017
  
  66a2b540
- test · 058d3cbf
  dkonam authored Dec 19, 2017
  
  058d3cbf
- ia dopé · 7f31a3af
  dkonam authored Dec 19, 2017
  
  7f31a3af
- Merge branch 'develop' of https://gitlab.utc.fr/qdruault/lo23-project into IHM-Main/secondinteg · 1901bd02
  Xuhao Lin authored Dec 19, 2017
  
  1901bd02
- Merge branch 'ihm-main/develop' into 'develop' · c78411a9
  Peining Li authored Dec 19, 2017
```
Ihm main/develop

See merge request !142
```
  c78411a9
- Merge branch 'ihm-main/user-avatar' into 'ihm-main/develop' · 8a5415ff
  Peining Li authored Dec 19, 2017
```
Ihm main/user avatar

See merge request !141
```
  8a5415ff
- Remove placeholder images for the player's avatar · d6b35a64
  Louis Groisne authored Dec 19, 2017
  
  d6b35a64
- Add label next to the player's avatar in a few views · a04f3303
  Louis Groisne authored Dec 19, 2017
  
  a04f3303
- Add the username next to the player's avatar in the menu view · 3448c832
  Louis Groisne authored Dec 19, 2017
  
  3448c832
- Add the player's avatar in a few scenes · 6abf56c4
  Louis Groisne authored Dec 19, 2017
  
  6abf56c4
- Add a test to check if the avatar was already gotten · 9dadc8b8
  Louis Groisne authored Dec 19, 2017
  
  9dadc8b8
- Add the player's avatar in the MenuController · e8835716
  Louis Groisne authored Dec 19, 2017
  
  e8835716
- Retrieve the player's avatar from the AbstractController · 3dcf8ec5
  Louis Groisne authored Dec 19, 2017
  
  3dcf8ec5
- ia + fix data · aee9a0e2
  dkonam authored Dec 19, 2017
  
  aee9a0e2
- test · da26dd03
  dkonam authored Dec 19, 2017
  
  da26dd03
- test · be00d440
  dkonam authored Dec 19, 2017
  
  be00d440