Merge branch 'main' into 'test/tout_par_tour' (aee8c200) · Commits · LAU KING / Projet_Intégrateur_Big_Two

Snippets Groups Projects

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

Commit aee8c200 authored 1 month ago by

CARPENTIER-KEITZL EDGAR

Browse files

Merge branch 'main' into 'test/tout_par_tour'

# 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

parents 0204ffda c1e5f4d1

Branches

Hide whitespace changes

Inline Side-by-side

Showing with 214 additions and 5 deletions

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

Please register or to comment

Admin message

Merge branch 'main' into 'test/tout_par_tour'

Some changes are not shown.