Merge branch 'ihm-merge' into develop (aa56bebe) · Commits · projet integrateur cmi2 / MusicArena · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

MusicArena
- Activity
- Members
- Labels
- Releases
- Container Registry
- Incidents
- Service Desk

Snippets Groups Projects

Admin message

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.

projet integrateur cmi2
MusicArena
Commits
aa56bebe

Commit aa56bebe authored 5 years ago by

Valentine Reiland

Downloads
- Plain Diff

Merge branch 'ihm-merge' into develop

parents 301f82a2 e7f6f80a

Branches

Tags

Changes 11

Expand all Hide whitespace changes

Inline Side-by-side

Showing

client/Globals.gd 1 addition, 0 deletions

client/Globals.gd
client/SaveSettings.gd 3 additions, 1 deletion

client/SaveSettings.gd
client/levels/credits/Credits.tscn 2 additions, 0 deletions

client/levels/credits/Credits.tscn
client/levels/endGame/EndGame.tscn 165 additions, 181 deletions

client/levels/endGame/EndGame.tscn
client/levels/login/Login.tscn 16 additions, 16 deletions

client/levels/login/Login.tscn
client/levels/mainMenu/MainMenu.tscn 1310 additions, 1310 deletions

client/levels/mainMenu/MainMenu.tscn
client/levels/mainMenu/mainMenu.gd 5 additions, 0 deletions

client/levels/mainMenu/mainMenu.gd
client/levels/profile/profile.gd 1 addition, 1 deletion

client/levels/profile/profile.gd
client/levels/selectGame/multiSelectMenu.gd 1 addition, 1 deletion

client/levels/selectGame/multiSelectMenu.gd
client/levels/settings/settings.gd 10 additions, 2 deletions

client/levels/settings/settings.gd
client/saveFile.cfg 4 additions, 4 deletions

client/saveFile.cfg

with 1518 additions and 1516 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment