solve conflicts (8f8927ce) · 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
8f8927ce

Commit 8f8927ce authored 5 years ago by

Valentine Reiland

Downloads
- Plain Diff

solve conflicts

parents 1c248bf5 c67a3c7b

Branches

Tags

Changes 11

Expand all Hide whitespace changes

Inline Side-by-side

Showing

cmi2/assets/selectChar/jauge.png 0 additions, 0 deletions

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

cmi2/assets/selectChar/jauge.png.import
cmi2/assets/selectChar/jaugefill.png 0 additions, 0 deletions

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

cmi2/assets/selectChar/jaugefill.png.import
cmi2/labelSkillFont.tres 11 additions, 0 deletions

cmi2/labelSkillFont.tres
cmi2/project.godot 0 additions, 1 deletion

cmi2/project.godot
cmi2/scenes/GridContainer.gd 1 addition, 1 deletion

cmi2/scenes/GridContainer.gd
cmi2/scenes/Login.tscn 15 additions, 15 deletions

cmi2/scenes/Login.tscn
cmi2/scenes/MultiSelectMenu.tscn 3 additions, 3 deletions

cmi2/scenes/MultiSelectMenu.tscn
cmi2/scenes/characterSelection.gd 6 additions, 5 deletions

cmi2/scenes/characterSelection.gd
cmi2/scenes/characterSelection.tscn 200 additions, 124 deletions

cmi2/scenes/characterSelection.tscn

with 304 additions and 149 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