Skip to content
Snippets Groups Projects
Commit 3c8efe8d authored by BARBUTOV FILIP's avatar BARBUTOV FILIP
Browse files

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
parents fefb8c80 b8a901ee
Branches
Tags
1 merge request!6Figma team
Showing
with 50 additions and 21 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment