Commits · 00e9e161539278cab2a06c5daa823a8c492de00a · CEYLAN EREN / Wanderer

Mar 30, 2021
- Equilibrage du jeu · 00e9e161
  SCHAAL CESAR authored 3 years ago
  
  00e9e161
- Merge branch 'master' of https://git.unistra.fr/s4/les-spice-girls/t432 · f666fee5
  SCHAAL CESAR authored 3 years ago
  
  f666fee5
- mise en place des updaters · 86cd92fe
  SCHAAL CESAR authored 3 years ago
  
  86cd92fe
- Merge branch 'master' of git.unistra.fr:s4/les-spice-girls/t432 into master · ce36c5d7
  SATTLER EMMA authored 3 years ago
  
  ce36c5d7
- Premier rendu FormAide · d4972e5f
  SATTLER EMMA authored 3 years ago
  
  d4972e5f
- Update README.md · e5353fa7
  DIAW EVA authored 3 years ago
  
  e5353fa7
- Update DcD.md · 4181f1aa
  DIAW EVA authored 3 years ago
  
  4181f1aa
- Update DcD.md · 1cbf347c
  DIAW EVA authored 3 years ago
  
  1cbf347c
- Construction de refuges à Lunéville · 08cc4fc2
  Elias Leinenweber authored 3 years ago
  
  08cc4fc2
- Correction résolution · 0a453d8b
  SCHAAL CESAR authored 3 years ago
  
  0a453d8b
- Merge branch 'master' of https://git.unistra.fr/s4/les-spice-girls/t432 · 47bf306a
  SCHAAL CESAR authored 3 years ago
  
  47bf306a
- Changements cases · cd236f75
  SCHAAL CESAR authored 3 years ago
  
  cd236f75
- Update README.md · da847e5a
  DIAW EVA authored 3 years ago
  
  da847e5a
- Merge branch 'master' of https://git.unistra.fr/s4/les-spice-girls/t432 · fb16e75c
  SCHAAL CESAR authored 3 years ago
  
  fb16e75c
- Update README.md · b1b230f7
  Elias Leinenweber authored 3 years ago
  
  b1b230f7
- Fusion merges · 57313bda
  SCHAAL CESAR authored 3 years ago
  
  57313bda
- Fusion · dd4f3c71
  SCHAAL CESAR authored 3 years ago
  
  dd4f3c71
- Cadrillage carte · fe7d08e2
  SCHAAL CESAR authored 3 years ago
  
  fe7d08e2
- résolution de bugs · 1fdc9c72
  SATTLER EMMA authored 3 years ago
  
  1fdc9c72
- Merge branch 'master' of git.unistra.fr:s4/les-spice-girls/t432 into master · 70e49274
  SATTLER EMMA authored 3 years ago
```
# Conflicts:
#	view/FormJeu.Designer.cs
#	view/FormJeu.resx
```
  70e49274
- Scrollbar ? · fc46234d
  SATTLER EMMA authored 3 years ago
  
  fc46234d
- Réparation code · 2b8dc33b
  SCHAAL CESAR authored 3 years ago
  
  2b8dc33b
- Merge branch 'master' of https://git.unistra.fr/s4/les-spice-girls/t432 · c4a819d9
  SCHAAL CESAR authored 3 years ago
  
  c4a819d9
- Modif du fond · 3b52f44f
  SATTLER EMMA authored 3 years ago
  
  3b52f44f
- Merge branch 'master' of https://git.unistra.fr/s4/les-spice-girls/t432 · 8c463996
  SCHAAL CESAR authored 3 years ago
  
  8c463996
- Update DcD.md · af31f367
  DIAW EVA authored 3 years ago
  
  af31f367
- Merge remote-tracking branch 'origin/master' · 88236fc7
  Elias Leinenweber authored 3 years ago
  
  88236fc7
- Avancé dans la map · 25366951
  Elias Leinenweber authored 3 years ago
  
  25366951
- Merge branch 'master' of git.unistra.fr:s4/les-spice-girls/t432 into master · cde6f979
  SATTLER EMMA authored 3 years ago
  
  cde6f979
- Ajout map · a2eaa721
  SATTLER EMMA authored 3 years ago
  
  a2eaa721
- Update README.md · 33d71af6
  DIAW EVA authored 3 years ago
  
  33d71af6
- Merge branch 'master' of https://git.unistra.fr/s4/les-spice-girls/t432 · 8268d070
  SCHAAL CESAR authored 3 years ago
  
  8268d070
- Ajout carte · cb155e48
  Elias Leinenweber authored 3 years ago
  
  cb155e48
- Merge branch 'master' of git.unistra.fr:s4/les-spice-girls/t432 into master · 2c706d4a
  SATTLER EMMA authored 3 years ago
  
  2c706d4a
- Modification taille forms · 8aa376cb
  SATTLER EMMA authored 3 years ago
  
  8aa376cb
- Update DcD.md · 408c32df
  DIAW EVA authored 3 years ago
  
  408c32df
- Add dcd.md · 571c31d1
  DIAW EVA authored 3 years ago
  
  571c31d1
Mar 29, 2021
- Merge branch 'master' of git.unistra.fr:s4/les-spice-girls/t432 into master · 93cf8eee
  SATTLER EMMA authored 3 years ago
  
  93cf8eee
- Revert "Merge remote-tracking branch 'origin/master'" · 606c5f89
  Elias Leinenweber authored 3 years ago
```
This reverts commit 1c6f2e0c, reversing
changes made to 3fbaffb9.
```
  606c5f89
- Ajout icone + femreture formMenu · 4cd19436
  SATTLER EMMA authored 3 years ago
  
  4cd19436

Admin message