Merge branch 'super-loading-screen' into develop (16618dc2) · 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
16618dc2

Commit 16618dc2 authored 4 years ago by

SCHIEBER MORGANE

Downloads
- Plain Diff

Merge branch 'super-loading-screen' into develop

parents b85ad242 65070908

Branches super-loading-screen

Tags

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

client/levels/loadingScreen/LoadingScreen.tscn 151 additions, 16 deletions

client/levels/loadingScreen/LoadingScreen.tscn
client/levels/loadingScreen/assets/charaPic.png 0 additions, 0 deletions

client/levels/loadingScreen/assets/charaPic.png
client/levels/loadingScreen/assets/charaPic.png.import 34 additions, 0 deletions

client/levels/loadingScreen/assets/charaPic.png.import
client/levels/loadingScreen/assets/fond.png 0 additions, 0 deletions

client/levels/loadingScreen/assets/fond.png
client/levels/loadingScreen/assets/fond.png.import 34 additions, 0 deletions

client/levels/loadingScreen/assets/fond.png.import
client/levels/loadingScreen/assets/fond2.png 0 additions, 0 deletions

client/levels/loadingScreen/assets/fond2.png
client/levels/loadingScreen/assets/fond2.png.import 34 additions, 0 deletions

client/levels/loadingScreen/assets/fond2.png.import
client/levels/loadingScreen/loadingScreen.gd 53 additions, 0 deletions

client/levels/loadingScreen/loadingScreen.gd
client/levels/test/game.gd 2 additions, 0 deletions

client/levels/test/game.gd
client/levels/test/game.tscn 154 additions, 1 deletion

client/levels/test/game.tscn

with 462 additions and 17 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