Merge branch 'ihm' of https://git.unistra.fr/projet-integrateur-cmi2/cmi2 into ihm (8fb6f3fa) · 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
8fb6f3fa

Commit 8fb6f3fa authored 5 years ago by

SCHIEBER MORGANE

Downloads
- Plain Diff

Merge branch 'ihm' of https://git.unistra.fr/projet-integrateur-cmi2/cmi2 into ihm

parents 68349a88 8733e77e

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

cmi2/SaveSettings.gd 27 additions, 0 deletions

cmi2/SaveSettings.gd
cmi2/assets/selectChar/lullaby.png 0 additions, 0 deletions

cmi2/assets/selectChar/lullaby.png
cmi2/assets/selectChar/lullaby.png.import 34 additions, 0 deletions

cmi2/assets/selectChar/lullaby.png.import
cmi2/assets/selectChar/small.ogv 0 additions, 0 deletions

cmi2/assets/selectChar/small.ogv
cmi2/assets/selectChar/testvideo.webm 0 additions, 0 deletions

cmi2/assets/selectChar/testvideo.webm
cmi2/defaultSettingsFile.cfg 3 additions, 0 deletions

cmi2/defaultSettingsFile.cfg
cmi2/project.godot 1 addition, 0 deletions

cmi2/project.godot
cmi2/saveFile.cfg 3 additions, 0 deletions

cmi2/saveFile.cfg
cmi2/scenes/Settings.gd 24 additions, 8 deletions

cmi2/scenes/Settings.gd
cmi2/scenes/Settings.tscn 9 additions, 7 deletions

cmi2/scenes/Settings.tscn
cmi2/scenes/characterSelection.gd 31 additions, 0 deletions

cmi2/scenes/characterSelection.gd
cmi2/scenes/characterSelection.tscn 75 additions, 58 deletions

cmi2/scenes/characterSelection.tscn

with 207 additions and 73 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