Merge branch 'hud-merge' into develop (06475577) · 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
06475577

Commit 06475577 authored 4 years ago by

Valentine Reiland

Downloads
- Plain Diff

Merge branch 'hud-merge' into develop

parents 02b57ec5 70150ecd

Branches

Tags

No related merge requests found

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

client/Globals.gd 3 additions, 0 deletions

client/Globals.gd
client/entities/characters/player.gd 4 additions, 0 deletions

client/entities/characters/player.gd
client/entities/characters/player.tscn 1 addition, 1 deletion

client/entities/characters/player.tscn
client/levels/commons/themes/descTrophies.tres 1 addition, 1 deletion

client/levels/commons/themes/descTrophies.tres
client/levels/hud/hp_hud.gd 21 additions, 0 deletions

client/levels/hud/hp_hud.gd
client/levels/hud/hud.gd 5 additions, 4 deletions

client/levels/hud/hud.gd
client/levels/hud/hud.tscn 7 additions, 4 deletions

client/levels/hud/hud.tscn
client/levels/hud/pseudo_hud.gd 19 additions, 0 deletions

client/levels/hud/pseudo_hud.gd
client/levels/mainMenu/mainMenu.gd 1 addition, 4 deletions

client/levels/mainMenu/mainMenu.gd
client/levels/selectChar/CharacterSelection.tscn 2 additions, 2 deletions

client/levels/selectChar/CharacterSelection.tscn
client/levels/selectChar/characterSelection.gd 14 additions, 7 deletions

client/levels/selectChar/characterSelection.gd
client/models/listPlayer/testTheme.tres 1 addition, 1 deletion

client/models/listPlayer/testTheme.tres
server/autoloads/gamestate.gd 1 addition, 1 deletion

server/autoloads/gamestate.gd

with 80 additions and 25 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