Merge branch 'main' into 'FIGMA_TEAM'
# 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
Showing
- Compte-rendu/20250312-CR-réunion-equipe-5A.pdf 0 additions, 0 deletionsCompte-rendu/20250312-CR-réunion-equipe-5A.pdf
- Compte-rendu/20250318-CR-activité-equipe-5A.pdf 0 additions, 0 deletionsCompte-rendu/20250318-CR-activité-equipe-5A.pdf
- Compte-rendu/20250319-CR-réunion-equipe-5A.pdf 0 additions, 0 deletionsCompte-rendu/20250319-CR-réunion-equipe-5A.pdf
- Compte-rendu/20250325-CR-activité-equipe-5A.pdf 0 additions, 0 deletionsCompte-rendu/20250325-CR-activité-equipe-5A.pdf
- Compte-rendu/20250326-CR-réunion-equipe-5A.pdf 0 additions, 0 deletionsCompte-rendu/20250326-CR-réunion-equipe-5A.pdf
- Compte-rendu/20250401-CR-activité-equipe-5A.pdf 0 additions, 0 deletionsCompte-rendu/20250401-CR-activité-equipe-5A.pdf
- README.md 16 additions, 8 deletionsREADME.md
- backend/database-handler/bdd_script.py 4 additions, 1 deletionbackend/database-handler/bdd_script.py
- backend/database-handler/main.py 5 additions, 1 deletionbackend/database-handler/main.py
- godot_project/Game/scripts/button.gd.uid 1 addition, 1 deletiongodot_project/Game/scripts/button.gd.uid
- godot_project/Game/scripts/card_manager.gd.uid 1 addition, 1 deletiongodot_project/Game/scripts/card_manager.gd.uid
- godot_project/Game/scripts/card_manager_enemy.gd.uid 1 addition, 1 deletiongodot_project/Game/scripts/card_manager_enemy.gd.uid
- godot_project/Game/scripts/card_slot.gd.uid 1 addition, 1 deletiongodot_project/Game/scripts/card_slot.gd.uid
- godot_project/Game/scripts/cartes.gd.uid 1 addition, 1 deletiongodot_project/Game/scripts/cartes.gd.uid
- godot_project/Game/scripts/cartes_enemy.gd.uid 1 addition, 1 deletiongodot_project/Game/scripts/cartes_enemy.gd.uid
- godot_project/Game/scripts/enemy_hand.gd.uid 1 addition, 1 deletiongodot_project/Game/scripts/enemy_hand.gd.uid
- godot_project/Game/scripts/player_hand.gd.uid 1 addition, 1 deletiongodot_project/Game/scripts/player_hand.gd.uid
- godot_project/GameStarter/choose_mode_page.gd.uid 1 addition, 1 deletiongodot_project/GameStarter/choose_mode_page.gd.uid
- godot_project/GameStarter/connection_page.gd.uid 1 addition, 1 deletiongodot_project/GameStarter/connection_page.gd.uid
- godot_project/GameStarter/create_page.gd 15 additions, 1 deletiongodot_project/GameStarter/create_page.gd
Please register or sign in to comment