Commits · main · LAU KING / Projet_Intégrateur_Big_Two

Apr 10, 2025
- ajout CR de la réunion du 09 avril · 87893760
  klau authored 6 days ago
  
  87893760
- Merge branch 'main' of ssh://git.unistra.fr/klau/projet_chor_dai_di · 4667e8ec
  klau authored 6 days ago
  
  4667e8ec
Apr 09, 2025
- Remember the music value for the ui · 2781c397
  Guillaume IMHOFF authored 1 week ago
  
  2781c397
- Merge branch 'game_server' into 'main' · 2a6ef0d3
  IMHOFF GUILLAUME authored 1 week ago
```
Update merge

See merge request !9
```
  2a6ef0d3
- Merge branch 'main' of git.unistra.fr:klau/projet_chor_dai_di into game_server · 12bde883
  Guillaume IMHOFF authored 1 week ago
  
  12bde883
Apr 08, 2025
- ajout de CR d'activité du 8 Avril · b9e62e8d
  klau authored 1 week ago
  
  b9e62e8d
Apr 04, 2025
- ready to presentation · 966f5164
  Guillaume IMHOFF authored 1 week ago
  
  966f5164
- ready to presentation · ebe1f6ee
  Guillaume IMHOFF authored 1 week ago
  
  ebe1f6ee
- merge main · 03847852
  Guillaume IMHOFF authored 1 week ago
  
  03847852
- debug · ead05aaf
  Guillaume IMHOFF authored 1 week ago
  
  ead05aaf
- test · 5466e531
  CARPENTIER-KEITZL EDGAR authored 1 week ago
  
  5466e531
- Merge branch 'main' of git.unistra.fr:klau/projet_chor_dai_di into game_server · 1a215715
  Guillaume IMHOFF authored 1 week ago
  
  1a215715
- Merge branch 'figma_boy' into 'main' · 896da1b3
  KAMEL SEIFELDIN authored 1 week ago
```
Figma boy

See merge request !8
```
  896da1b3
- merge main · 587ea80f
  Guillaume IMHOFF authored 1 week ago
  
  587ea80f
- Merge branch 'test/tout_par_tour' into 'main' · 94cab30c
  CARPENTIER-KEITZL EDGAR authored 1 week ago
```
Test/tout par tour

See merge request !7
```
  94cab30c
- Merge branch 'main' into 'test/tout_par_tour' · aee8c200
  CARPENTIER-KEITZL EDGAR authored 1 week ago
```
# Conflicts:
#   godot_project/GameStarter/LoginPage.tscn
#   godot_project/GameStarter/choose_mode_page.gd
#   godot_project/assets/ui/Popup Settings.png.import
#   godot_project/global.gd
```
  aee8c200
Apr 03, 2025
- avatar pop script · 84d609a7
  KAMEL SEIFELDIN authored 1 week ago
  
  84d609a7
- added profile page and pop page but no script · 47be33da
  KAMEL SEIFELDIN authored 1 week ago
  
  47be33da
- Merge branch 'game_server' of git.unistra.fr:klau/projet_chor_dai_di into game_server · bb70ff92
  Guillaume IMHOFF authored 1 week ago
  
  bb70ff92
- improvement client for the client back end ui interaction · 19d3d1e1
  Guillaume IMHOFF authored 1 week ago
  
  19d3d1e1
- improvement on ui and backend interaction · 1c9bc937
  vm8.0 authored 1 week ago
  
  1c9bc937
- forgot to commit · fe146070
  Guillaume IMHOFF authored 1 week ago
  
  fe146070
- ajout de la page de fin de partie avec bug · 0204ffda
  CARPENTIER-KEITZL EDGAR authored 1 week ago
  
  0204ffda
Apr 02, 2025
- ajout CR réunion du 2 avril · c1e5f4d1
  klau authored 2 weeks ago
  
  c1e5f4d1
- Merge branch 'FIGMA_TEAM' into 'main' · be37adee
  BARBUTOV FILIP authored 2 weeks ago
```
Figma team

See merge request !6
```
  be37adee
- Merge branch 'main' into 'FIGMA_TEAM' · 3c8efe8d
  BARBUTOV FILIP authored 2 weeks ago
```
# Conflicts:
#   godot_project/Game/scripts/button.gd.uid
#   godot_project/Game/scripts/card_manager.gd.uid
#   godot_project/Game/scripts/card_manager_enemy.gd.uid
#   godot_project/Game/scripts/card_slot.gd.uid
#   godot_project/Game/scripts/cartes.gd.uid
#   godot_project/Game/scripts/cartes_enemy.gd.uid
#   godot_project/Game/scripts/enemy_hand.gd.uid
#   godot_project/Game/scripts/player_hand.gd.uid
#   godot_project/GameStarter/choose_mode_page.gd.uid
#   godot_project/GameStarter/connection_page.gd.uid
#   godot_project/GameStarter/create_page.gd.uid
#   godot_project/GameStarter/home_page.gd.uid
#   godot_project/GameStarter/login_page.gd
#   godot_project/GameStarter/login_page.gd.uid
#   godot_project/GameStarter/rules_page.gd.uid
#   godot_project/GameStarter/sound_button.gd.uid
#   godot_project/global.gd.uid
#   godot_project/sprite/notification.gd.uid
```
  3c8efe8d
- final version of settings, everything works · fefb8c80
  BARBUTOV FILIP authored 2 weeks ago
  
  fefb8c80
- update to get the cards · 3a08d9cb
  Guillaume IMHOFF authored 2 weeks ago
  
  3a08d9cb
- sound settings effects on/off · 9f7f5e62
  BARBUTOV FILIP authored 2 weeks ago
  
  9f7f5e62
- sound button settings · 8723f894
  BARBUTOV FILIP authored 2 weeks ago
  
  8723f894
- Merge branch 'game_server' of git.unistra.fr:klau/projet_chor_dai_di into game_server · 24f1197f
  Guillaume IMHOFF authored 2 weeks ago
  
  24f1197f
- id working and global variable set · 18c7fc83
  Guillaume IMHOFF authored 2 weeks ago
  
  18c7fc83
- id working now lets make card come through everybody · 08bb36cc
  vm8.0 authored 2 weeks ago
  
  08bb36cc
- Merge branch 'FIGMA_TEAM' of https://git.unistra.fr/klau/projet_chor_dai_di into FIGMA_TEAM · 6888132a
  BARBUTOV FILIP authored 2 weeks ago
  
  6888132a
- taking out sound slider homepage and making the one in settings work · b34e9ba4
  BARBUTOV FILIP authored 2 weeks ago
  
  b34e9ba4
- Merge branch 'FIGMA_TEAM' of ssh://git.unistra.fr/klau/projet_chor_dai_di into FIGMA_TEAM · a080fa2c
  klau authored 2 weeks ago
  
  a080fa2c
- Merge branch 'main' of git.unistra.fr:klau/projet_chor_dai_di into game_server · b726b13e
  Guillaume IMHOFF authored 2 weeks ago
  
  b726b13e
- id testing · dfcabcc1
  Guillaume IMHOFF authored 2 weeks ago
  
  dfcabcc1
- fix settings button · 4bfa8ca8
  BARBUTOV FILIP authored 2 weeks ago
  
  4bfa8ca8
- ajustement de l'affichage · b5eb77be
  CARPENTIER-KEITZL EDGAR authored 2 weeks ago
  
  b5eb77be

Admin message