Commits · 72e101619bbcdeaabeb74efc95220b431fdb76a1 · Talitha Girard / LO23

Nov 28, 2022
- feat : intégration de ihm-main dans dev · 72e10161
  Florestan Biaux authored 2 years ago
  
  72e10161
- Merge branch 'DL-53 ' into 'dev' · 53499466
  Louis Greiner authored 2 years ago
  
  Stop tracking .vs folder See merge request !59
  53499466
Nov 27, 2022
- Stop tracking .vs folder · 4eda71f1
  Pierre Roussel authored 2 years ago
  
  4eda71f1
Nov 22, 2022
- fix: wrong merge from ihm game · be6cb175
  Louis Greiner authored 2 years ago
  
  be6cb175
- Merge branch 'data' into 'dev' · df888389
  Pierre Roussel authored 2 years ago
  
  Data See merge request !55
  df888389
- Data · 360215b2
  Nina Forde authored 2 years ago and Pierre Roussel committed 2 years ago
  
  360215b2
- Revert "Merge branch 'bourimer/features/v1Beta' into 'ihm-game'" · 4ba39402
  Merwane Bouri authored 2 years ago
  
  This reverts commit 1808c9d1, reversing changes made to 9ba0a419.
  4ba39402
- fix: resolve conflict merge dev into ihm-game · a6cd358b
  Merwane Bouri authored 2 years ago
  
  a6cd358b
- Merge branch 'bourimer/features/v1Beta' into 'ihm-game' · 1808c9d1
  Gabrielle Van De Vijver authored 2 years ago
  
  Ajout des classes temporaires dans DTO, initialisation d'un objet LightGame... See merge request !51
  1808c9d1
- del \n in gameViewModel · ae4e1995
  Merwane Bouri authored 2 years ago
  
  ae4e1995
- Ajout des bindings pour les infos relatives à GameView. · 7e5a8243
  Merwane Bouri authored 2 years ago
  
  7e5a8243
- Ajout des classes temporaires dans DTO, initialisation d'un objet LightGame... · dddf76a1
  Merwane Bouri authored 2 years ago
  
  Ajout des classes temporaires dans DTO, initialisation d'un objet LightGame pour l'affichage d'une partie.
  dddf76a1
- Ajout des relais pour les boutons fold, call, raise · d8d77439
  Merwane Bouri authored 2 years ago
  
  d8d77439
Nov 21, 2022
- Merge branch 'data' into 'dev' · 56638be4
  Louis Greiner authored 2 years ago
  
  Porting code from data to dev See merge request !47
  56638be4
- Porting code from data to dev · 8c4a9eba
  Pierre Roussel authored 2 years ago and Louis Greiner committed 2 years ago
  
  8c4a9eba
Nov 20, 2022
- Merge branch 'comm' into 'dev' · 328e1fb1
  Anthony Noir authored 2 years ago
  
  Comm See merge request !45
  328e1fb1
- fix: build issues · b97ad260
  Anthony Noir authored 2 years ago
  
  b97ad260
- merged dev to comm · b15dc6f6
  Anthony Noir authored 2 years ago
  
  b15dc6f6
Nov 18, 2022
- Merge branch 'data' into 'dev' · 89cab2af
  Pierre Roussel authored 2 years ago
  
  Merging 'data' into 'dev' See merge request !40
  89cab2af
- Merging 'data' into 'dev' · 94eebe9b
  Pierre Roussel authored 2 years ago
  
  94eebe9b
- Merge branch 'maurinde/feature/corecomm' into 'comm' · 998bb5c0
  Anthony Noir authored 2 years ago
  
  Maurinde/feature/corecomm See merge request !41
  998bb5c0
Nov 17, 2022
- feat(comm) improve communication · 6c5cc654
  Denis Maurin authored 2 years ago
  
  6c5cc654
- Revert "Revert "[ADD] dossier"" · 9ba0a419
  Merwane Bouri authored 2 years ago
  
  This reverts commit 101ce196.
  9ba0a419
- Merge branch 'ihm-game' into bourimer/cleaning-ihm-game · e06cefd9
  Merwane Bouri authored 2 years ago
  
  e06cefd9
- Revert "[ADD] dossier" · 101ce196
  Merwane Bouri authored 2 years ago
  
  This reverts commit c9760150.
  101ce196
- Revert "[modif] change namespace" · d2d8508a
  Merwane Bouri authored 2 years ago
  
  This reverts commit d8fdd014.
  d2d8508a
- Revert "Merge branch 'evangoet/features/IHM-Game-Core' into 'ihm-game'" · adee3cb2
  Merwane Bouri authored 2 years ago
  
  This reverts commit 15adb933, reversing changes made to 6682bffc.
  adee3cb2
- Revert "change gameview xaml" · a199e4c8
  Merwane Bouri authored 2 years ago
  
  This reverts commit ec35f844.
  a199e4c8
- Revert "change gameWiew " · c508d9cb
  Merwane Bouri authored 2 years ago
  
  This reverts commit 90f9f49c.
  c508d9cb
- Revert "add parameter image" · 812307bc
  Merwane Bouri authored 2 years ago
  
  This reverts commit b7163347.
  812307bc
- Revert "add image" · 0e7a6c37
  Merwane Bouri authored 2 years ago
  
  This reverts commit f23f5c6a.
  0e7a6c37
- Revert "[ADD] main window" · 7b55e1e9
  Merwane Bouri authored 2 years ago
  
  This reverts commit 92c855e8.
  7b55e1e9
- Revert "changer initilisation du projet pour ouvrir la fenêtre gamevie, pas encore fonctionnelle" · 77813c80
  Merwane Bouri authored 2 years ago
  
  This reverts commit 875c67d0.
  77813c80
- Revert "[ADD] dossier pour commencer implémentation" · d6658df0
  Merwane Bouri authored 2 years ago
  
  This reverts commit 14642259.
  d6658df0
- remove main_verso from dir Pages and put the right dir images/main_verso.png · c88c40d9
  Merwane Bouri authored 2 years ago
  
  c88c40d9
Nov 16, 2022

Finition de l'affichage gameView, manque les images des utilisateurs, puis la... · a5822c3f

Merwane Bouri authored 2 years ago

Finition de l'affichage gameView, manque les images des utilisateurs, puis la relier l'affichage des variables avec le code. Comment afficher les cartes du joueur principal.

a5822c3f

Nov 15, 2022
- feature/comm_basic_structure · 6f5513c2
  Anthony Noir authored 2 years ago and Louis Greiner committed 2 years ago
  
  6f5513c2
- fix: build successful · 8d271b49
  Benjamin Vivat authored 2 years ago
  
  8d271b49
- fix: excluding useless classes · 857087ce
  Corentin authored 2 years ago
  
  857087ce
- Merge branch 'comm' of https://gitlab.utc.fr/girardta/lo23 into comm · a417656c
  Louis Greiner authored 2 years ago
  
  a417656c