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

05 Jan, 2018 22 commits
- Final commit · 2731f183
  Quentin DRUAULT-AUBIN authored Jan 05, 2018
  
  2731f183
- add conservation of decimal · d3ced366
  Peining authored Jan 05, 2018
  
  d3ced366
- Merge branch 'ihm-main/develop' into 'develop' · 6ff43a96
  Peining Li authored Jan 05, 2018
```
Ihm main/develop

See merge request qdruault/lo23-project!186
```
  6ff43a96
- Merge branch 'ihm-main/develop' of https://gitlab.utc.fr/qdruault/lo23-project... · ff3c062e
  Peining authored Jan 05, 2018
```
Merge branch 'ihm-main/develop' of https://gitlab.utc.fr/qdruault/lo23-project into ihm-main/develop
```
  ff3c062e
- clear code · 32cfd7ec
  Peining authored Jan 05, 2018
  
  32cfd7ec
- Merge branch 'ihm-main/develop' into 'develop' · 39742e9e
  Peining Li authored Jan 05, 2018
```
Ihm main/develop

See merge request !185
```
  39742e9e
- Merge branch 'IHM-Main/secondinteg' into 'ihm-main/develop' · ea067936
  Peining Li authored Jan 05, 2018
```
Ihm main/secondinteg

See merge request qdruault/lo23-project!183
```
  ea067936
- Merge branch 'ihm-main/min_size' into 'ihm-main/develop' · 1015757e
  Peining Li authored Jan 05, 2018
```
Ihm main/min size

See merge request qdruault/lo23-project!182
```
  1015757e
- Merge branch 'ihm-main/networkInterface2' of... · 8e57f8d3
  Audrick Libraire authored Jan 05, 2018
```
Merge branch 'ihm-main/networkInterface2' of https://gitlab.utc.fr/qdruault/lo23-project into ihm-main/networkInterface2
```
  8e57f8d3
- [ihm-main] playerprofil fxml · 22a40a40
  Audrick Libraire authored Jan 05, 2018
  
  22a40a40
- [ihm-main] playerprofil fxml · d5e2a439
  Audrick Libraire authored Jan 05, 2018
  
  d5e2a439
- [IHM-Main] gamelist on ai game fix · 19336f5e
  Xuhao Lin authored Jan 05, 2018
  
  19336f5e
- Merge branch 'IHM-Table/fix-fake-attack' into 'develop' · 5711a8fc
  Quentin DRUAULT-AUBIN authored Jan 05, 2018
```
Ihm table/fix fake attack

See merge request qdruault/lo23-project!164
```
  5711a8fc
- [Table] Fix fake attack player param · d9335c99
  Quentin DRUAULT-AUBIN authored Jan 05, 2018
  
  d9335c99
- output · b6801b0f
  jo authored Jan 04, 2018
  
  b6801b0f
- [Table] Fix timer stopped · 3e5b3a02
  Quentin DRUAULT-AUBIN authored Dec 26, 2017
  
  3e5b3a02
- [Table] Fix reset · 6dd41f8c
  Quentin DRUAULT-AUBIN authored Dec 24, 2017
  
  6dd41f8c
- [Data] FIx attack -1 -1 · 8c926837
  Quentin DRUAULT-AUBIN authored Dec 24, 2017
  
  8c926837
- [IHM-Main] gamelist AI fix · 0b171e9a
  Xuhao Lin authored Jan 05, 2018
  
  0b171e9a
- Merge branch 'bugfin' into 'develop' · 300cd316
  Jo authored Jan 05, 2018
```
Bugfin

See merge request qdruault/lo23-project!178
```
  300cd316
- [IHM-MAIN] add min size for columns of login page · 391273a5
  Camille Quenin authored Jan 05, 2018
  
  391273a5
- [IHM-MAIN] add min size + delete one useless loading of spaceage font · 1e22ff75
  Camille Quenin authored Jan 05, 2018
  
  1e22ff75
04 Jan, 2018 18 commits
- Merge branch 'develop' into 'ihm-main/develop' · 69bd18e9
  Peining Li authored Jan 04, 2018
```
Develop

See merge request qdruault/lo23-project!181
```
  69bd18e9
- Merge branch 'ihm-main/develop' into 'develop' · 2eb37cee
  Peining Li authored Jan 04, 2018
```
Change pie chart color

See merge request qdruault/lo23-project!180
```
  2eb37cee
- Change pie chart color · 7b4bccd6
  Peining authored Jan 04, 2018
  
  7b4bccd6
- Data | update pom xml · e1982390
  dkonam authored Jan 04, 2018
  
  e1982390
- Data | fix users · fc4eb4f1
  dkonam authored Jan 04, 2018
  
  fc4eb4f1
- Merge branch 'develop' of https://gitlab.utc.fr/qdruault/lo23-project into develop · de3bcf9b
  dkonam authored Jan 04, 2018
  
  de3bcf9b
- Data | fix users · 25479717
  dkonam authored Jan 04, 2018
  
  25479717
- Merge branch 'ihm-main/develop' into 'develop' · 8355536a
  Peining Li authored Jan 04, 2018
```
Ihm main/develop

See merge request qdruault/lo23-project!179
```
  8355536a
- Merge branch 'ihm-main/develop' of https://gitlab.utc.fr/qdruault/lo23-project... · de69ba12
  Peining authored Jan 04, 2018
```
Merge branch 'ihm-main/develop' of https://gitlab.utc.fr/qdruault/lo23-project into ihm-main/develop
```
  de69ba12
- add alert popup if the value of birthday is null when updating · 55ba0041
  Peining authored Jan 04, 2018
  
  55ba0041
- [ihmTable] fix partie 2 joueurs bateaux grises · b9ee3b43
  Thibault Chiche authored Jan 04, 2018
  
  b9ee3b43
- [Spec] Change condition for update spec · 186ffff9
  Théo Hordequin authored Jan 04, 2018
  
  186ffff9
- resolution bug spectateur · be8c5cfe
  Antonin Deneux authored Jan 04, 2018
  
  be8c5cfe
- Merge branch 'ihm-main/develop' into 'develop' · 8a070187
  Peining Li authored Jan 04, 2018
```
Ihm main/develop

See merge request qdruault/lo23-project!177
```
  8a070187
- Merge branch 'ihm-main/networkInterface2' into 'ihm-main/develop' · aaa4e365
  Peining Li authored Jan 04, 2018
```
[ihm-main] title fix

See merge request qdruault/lo23-project!176
```
  aaa4e365
- [ihm-main] title fix · 039b54d7
  Audrick Libraire authored Jan 04, 2018
  
  039b54d7
- resolution bug spectateur · 2a776f0f
  Antonin Deneux authored Jan 04, 2018
  
  2a776f0f
- Merge branch 'ihm-main/develop' into 'develop' · c36616fa
  Peining Li authored Jan 04, 2018
```
Ihm main/develop

See merge request qdruault/lo23-project!174
```
  c36616fa