Commits · test · Jamal ATTOU / projetS2-2021-3-SF

24 Jun, 2021 32 commits
- Jamal : implémentation de la flotte dans menujeu 1.0 · 7f1be19f
  Jamal ATTOU authored Jun 24, 2021
  
  7f1be19f
- Jamal : implémentation de la flotte dans menujeu 1.0 · 0b5f5563
  Jamal ATTOU authored Jun 24, 2021
  
  0b5f5563
- Jamal : implémentation de la flotte dans menujeu · d2f425eb
  Jamal ATTOU authored Jun 24, 2021
  
  d2f425eb
- Merge remote-tracking branch 'origin/master' into master · ba03204c
  Jamal ATTOU authored Jun 24, 2021
  
  ba03204c
- julien : nouvelle flotte · 1946898f
  Julien VACHER authored Jun 24, 2021
  
  1946898f
- Merge remote-tracking branch 'origin/master' into master · 0c8da125
  Julien VACHER authored Jun 24, 2021
  
  0c8da125
- Merge remote-tracking branch 'origin/master' into master · 6327dbb6
  E203647F authored Jun 24, 2021
```
# Conflicts:
#	out/production/battleship-student-project-2021/controleurs/ListenerJouer.class
```
  6327dbb6
- Arthur : ListenerClavierJoin · 4d562e14
  E203647F authored Jun 24, 2021
  
  4d562e14
- julien : nouvelle flotte · 0c88a1e1
  Julien VACHER authored Jun 24, 2021
  
  0c88a1e1
- Jamal : interface jeu new vers · d1be8816
  Jamal ATTOU authored Jun 24, 2021
  
  d1be8816
- Arthur : ListenerClavierJoin · 6965d6a8
  E203647F authored Jun 24, 2021
  
  6965d6a8
- Arthur : Controleur ListenerBoutonJoin (test si l'id appartient au network) [UPDATE] · 4f7556a8
  E203647F authored Jun 24, 2021
  
  4f7556a8
- Merge remote-tracking branch 'origin/master' into master · cb7acf7b
  E203647F authored Jun 24, 2021
```
# Conflicts:
#	out/production/battleship-student-project-2021/controleurs/ListenerBoutonJoin.class
#	out/production/battleship-student-project-2021/vues/MenuPartie.class
```
  cb7acf7b
- Arthur : Controleur ListenerBoutonJoin (test si l'id appartient au network) · 3d1d4904
  E203647F authored Jun 24, 2021
  
  3d1d4904
- Merge remote-tracking branch 'origin/master' into master · 88c5cdbc
  Julien VACHER authored Jun 24, 2021
```
# Conflicts:
#	out/production/battleship-student-project-2021/controleurs/ListenerBoutonCreate.class
#	out/production/battleship-student-project-2021/controleurs/ListenerBoutonInscription.class
#	out/production/battleship-student-project-2021/controleurs/ListenerBoutonJoin.class
#	out/production/battleship-student-project-2021/controleurs/ListenerClavierInscription.class
#	out/production/battleship-student-project-2021/vues/MenuJeu.class
#	out/production/battleship-student-project-2021/vues/MenuPartie.class
```
  88c5cdbc
- julien : creation nouvelle flotte · e5a0cc18
  Julien VACHER authored Jun 24, 2021
  
  e5a0cc18
- Jocelyn - Mise en page Menu Partie · a95f6505
  Jocelyn MASSEROT authored Jun 24, 2021
  
  a95f6505
- Merge remote-tracking branch 'origin/master' into master · fb63bafa
  E203647F authored Jun 24, 2021
  
  fb63bafa
- Arthur : update controleurs ListenerBoutonInscription et... · 08125783
  E203647F authored Jun 24, 2021
```
Arthur : update controleurs ListenerBoutonInscription et ListenerClavierInscription avec le test si un pseudo existe déjà sur le network
```
  08125783
- Jocelyn - Correct affichage lors d'une partie · b6e84df5
  Jocelyn MASSEROT authored Jun 24, 2021
  
  b6e84df5
- Merge remote-tracking branch 'origin/master' into master · b242f295
  Julien VACHER authored Jun 24, 2021
  
  b242f295
- Arthur : update controleurs ListenerBoutonInscription et ListenerBoutonCreate · ce8f1c2d
  E203647F authored Jun 24, 2021
  
  ce8f1c2d
- Arthur : update controleurs ListenerBoutonInscription et ListenerBoutonCreate · f0a36289
  E203647F authored Jun 24, 2021
  
  f0a36289
- Merge remote-tracking branch 'origin/master' into master · f1a0bb60
  Julien VACHER authored Jun 24, 2021
```
# Conflicts:
#	out/production/battleship-student-project-2021/controleurs/ListenerBoutonCreate.class
#	out/production/battleship-student-project-2021/controleurs/ListenerClavierInscription.class
#	out/production/battleship-student-project-2021/controleurs/ListenerJouer.class
#	out/production/battleship-student-project-2021/vues/AccueilMenu.class
#	out/production/battleship-student-project-2021/vues/MenuCreationFlotte.class
#	out/production/battleship-student-project-2021/vues/MenuFlotte.class
#	out/production/battleship-student-project-2021/vues/MenuJeu.class
#	out/production/battleship-student-project-2021/vues/MenuPartie.class
```
  f1a0bb60
- julien : commit de passage(pour récuperer un push) · 82ec6fa6
  Julien VACHER authored Jun 24, 2021
  
  82ec6fa6
- julien : commit de passage(pour récuperer un push) · 69edc976
  Julien VACHER authored Jun 24, 2021
  
  69edc976
- Arthur : Inscription network + création de partie · 69f917fe
  E203647F authored Jun 24, 2021
  
  69f917fe
- Arthur : Inscription network + création de partie · f3b11724
  E203647F authored Jun 24, 2021
  
  f3b11724
- Jocelyn - Changement de drapeaux · b02912bc
  Jocelyn MASSEROT authored Jun 24, 2021
  
  b02912bc
- Merge remote-tracking branch 'origin/master' into master · 84504e32
  Jamal ATTOU authored Jun 24, 2021
  
  84504e32
- Jamal Jocelyn : Menu Jeu · 9ef93d58
  Jamal ATTOU authored Jun 24, 2021
  
  9ef93d58
- Update suivi.md · e23a222c
  Jamal ATTOU authored Jun 24, 2021
  
  e23a222c
23 Jun, 2021 8 commits
- Merge remote-tracking branch 'origin/master' into master · 6fffee5d
  Jamal ATTOU authored Jun 23, 2021
  
  6fffee5d
- Jamal Julien supp+add des bateau v1 · d86c116c
  Jamal ATTOU authored Jun 23, 2021
  
  d86c116c
- Arthur : ListenerClavierInscription · 359a27ac
  E203647F authored Jun 23, 2021
  
  359a27ac
- Arthur et Jocelyn : Changement d'odre des vues + création de vue MenuPartie · 3e18898d
  E203647F authored Jun 23, 2021
  
  3e18898d
- Merge remote-tracking branch 'origin/master' into master · 0e80e58d
  Jamal ATTOU authored Jun 23, 2021
  
  0e80e58d
- Jamal Julien Detection bateau · 2bf23994
  Jamal ATTOU authored Jun 23, 2021
  
  2bf23994
- Arthur : changement de la vue du choix de partie · 7b81bd31
  E203647F authored Jun 23, 2021
  
  7b81bd31
- Merge remote-tracking branch 'origin/master' into master · ea8f6472
  E203647F authored Jun 23, 2021
  
  ea8f6472