Commits · c9c7089d52193c65090d4a395f09d58a015074b8 · Quentin DRUAULT-AUBIN / lo23-project

17 Dec, 2017 13 commits
- [Table] Reset timer · c9c7089d
  Quentin DRUAULT-AUBIN authored Dec 16, 2017 and Paul Jeannot committed Dec 17, 2017
  
  c9c7089d
- [Data] Fix isShipTouched · c34fbf09
  Quentin DRUAULT-AUBIN authored Dec 16, 2017 and Paul Jeannot committed Dec 17, 2017
  
  c34fbf09
- [Table] Pass my player in parameter of placeMine · fcc3e32a
  Quentin DRUAULT-AUBIN authored Dec 16, 2017 and Paul Jeannot committed Dec 17, 2017
  
  fcc3e32a
- [Com] fix notifyNewCoordinates · f22e5e0d
  Quentin DRUAULT-AUBIN authored Dec 16, 2017 and Paul Jeannot committed Dec 17, 2017
  
  f22e5e0d
- [Data] Forward mine · 7bafd58b
  Quentin DRUAULT-AUBIN authored Dec 16, 2017 and Paul Jeannot committed Dec 17, 2017
  
  7bafd58b
- [Table] Fix X and Y · 95cfb7aa
  Quentin DRUAULT-AUBIN authored Dec 16, 2017 and Paul Jeannot committed Dec 17, 2017
  
  95cfb7aa
- [Data] Call feedback · 0fd9803a
  Quentin DRUAULT-AUBIN authored Dec 16, 2017 and Paul Jeannot committed Dec 17, 2017
  
  0fd9803a
- [Controller] Fix placemine · acce769c
  Quentin DRUAULT-AUBIN authored Dec 16, 2017 and Paul Jeannot committed Dec 17, 2017
  
  acce769c
- [Controller] Get current player · 2d81716a
  Quentin DRUAULT-AUBIN authored Dec 16, 2017 and Paul Jeannot committed Dec 17, 2017
  
  2d81716a
- [Controller] Remove todo · 051f2f34
  Quentin DRUAULT-AUBIN authored Dec 16, 2017 and Paul Jeannot committed Dec 17, 2017
  
  051f2f34
- [Facade] Fix showGame() · 39a6332a
  Quentin DRUAULT-AUBIN authored Dec 16, 2017 and Paul Jeannot committed Dec 17, 2017
  
  39a6332a
- [Data] Check if the 2 players are ready · 93e67aee
  Quentin DRUAULT-AUBIN authored Dec 16, 2017 and Paul Jeannot committed Dec 17, 2017
  
  93e67aee
- [Data][Com] Set ennemy ships · bc526707
  Quentin DRUAULT-AUBIN authored Dec 16, 2017 and Paul Jeannot committed Dec 17, 2017
  
  bc526707
15 Dec, 2017 24 commits
- Merge branch 'IHM-Table/develop' into develop · 1797cac1
  Quentin DRUAULT-AUBIN authored Dec 15, 2017
  
  1797cac1
- [Ship] Handle 1-cell ships case · 551c6722
  Quentin DRUAULT-AUBIN authored Dec 14, 2017
  
  551c6722
- [Ship] Call getTemplateShips · a65b934b
  Quentin DRUAULT-AUBIN authored Dec 14, 2017
  
  a65b934b
- [Error] Add another catch for other exceptions · c76ce055
  Quentin DRUAULT-AUBIN authored Dec 14, 2017
  
  c76ce055
- [Error] Popup warning messages. · 5b0b730b
  Quentin DRUAULT-AUBIN authored Dec 14, 2017
  
  5b0b730b
- [Ship] Fix place ship on board · 13b3e459
  Quentin DRUAULT-AUBIN authored Dec 14, 2017
  
  13b3e459
- [Data] Fix setShip() · 3e011626
  Quentin DRUAULT-AUBIN authored Dec 14, 2017
  
  3e011626
- [Com] Fix showGame() call · b701ba12
  Quentin DRUAULT-AUBIN authored Dec 13, 2017
  
  b701ba12
- [Stats Pannel] Integration of the stat pannel when J1 or J2 plays · 85b8b2ab
  Paul Jeannot authored Dec 12, 2017 and Quentin DRUAULT-AUBIN committed Dec 15, 2017
  
  85b8b2ab
- opponentHasLeftGame + refacto popup · 1c05ca75
  Quentin DRUAULT-AUBIN authored Dec 13, 2017
  
  1c05ca75
- Connection lost · d55ba504
  Quentin DRUAULT-AUBIN authored Dec 12, 2017
  
  d55ba504
- finishGame() done · 10d88054
  Antonin Deneux authored Dec 12, 2017 and Quentin DRUAULT-AUBIN committed Dec 15, 2017
  
  10d88054
- [Ship] Refactor coordinates computing + tests · 66bf55bc
  Paul Jeannot authored Dec 12, 2017 and Quentin DRUAULT-AUBIN committed Dec 15, 2017
  
  66bf55bc
- [Fix] comment error data class Message · 24db309e
  Théo Hordequin authored Dec 12, 2017 and Quentin DRUAULT-AUBIN committed Dec 15, 2017
  
  24db309e
- Recharge de partie · 46d3c6cf
  jo authored Dec 12, 2017 and Quentin DRUAULT-AUBIN committed Dec 15, 2017
  
  46d3c6cf
- [Ship] Compute coordinates between start/end point of a given ship · 8ad6c03b
  Paul Jeannot authored Dec 12, 2017 and Quentin DRUAULT-AUBIN committed Dec 15, 2017
  
  8ad6c03b
- Clean code · fa0ca785
  Quentin DRUAULT-AUBIN authored Dec 06, 2017
  
  fa0ca785
- [Ship] Attack destroyed ship · b35cad66
  Quentin DRUAULT-AUBIN authored Dec 06, 2017
  
  b35cad66
- [Ship] Feedback on the grid · e374b140
  Quentin DRUAULT-AUBIN authored Dec 06, 2017
  
  e374b140
- [Facade] Change showGame signature · 7d1f4a1e
  Quentin DRUAULT-AUBIN authored Dec 05, 2017
  
  7d1f4a1e
- Ajout du math.min dans la fonction de placement de bateaux · db6af770
  Antonin Deneux authored Dec 05, 2017 and Quentin DRUAULT-AUBIN committed Dec 15, 2017
  
  db6af770
- Ajout de placeShip · 5cbaaa5d
  Antonin Deneux authored Dec 05, 2017 and Quentin DRUAULT-AUBIN committed Dec 15, 2017
  
  5cbaaa5d
- comment · 0d7ad7ed
  jo authored Dec 05, 2017 and Quentin DRUAULT-AUBIN committed Dec 15, 2017
  
  0d7ad7ed
- change opacity when ship is destroyed · 0561432f
  jo authored Dec 05, 2017 and Quentin DRUAULT-AUBIN committed Dec 15, 2017
  
  0561432f
13 Dec, 2017 3 commits
- Merge branch 'IHM-Main/secondinteg' into 'develop' · c1d984ce
  Peining Li authored Dec 13, 2017
```
Ihm main/secondinteg

See merge request !133
```
  c1d984ce
- Merge branch 'develop' of https://gitlab.utc.fr/qdruault/lo23-project into IHM-Main/secondinteg · 299b8aa7
  Xuhao Lin authored Dec 13, 2017
  
  299b8aa7
- Merge branch 'ihm-main/develop' of https://gitlab.utc.fr/qdruault/lo23-project... · 4b2f8cdf
  Xuhao Lin authored Dec 13, 2017
```
Merge branch 'ihm-main/develop' of https://gitlab.utc.fr/qdruault/lo23-project into IHM-Main/secondinteg
```
  4b2f8cdf