Merge branch 'lifendeath' into develop (936c5f8f) · 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
936c5f8f

Commit 936c5f8f authored 5 years ago by

Canopteks

Downloads
- Plain Diff

Merge branch 'lifendeath' into develop

parents 1fc9be49 42da9a5d

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

client/entities/characters/player.gd 13 additions, 3 deletions

client/entities/characters/player.gd
client/entities/characters/player.tscn 4 additions, 4 deletions

client/entities/characters/player.tscn
client/levels/test/game.gd 5 additions, 0 deletions

client/levels/test/game.gd
server/autoloads/gamestate.gd 4 additions, 1 deletion

server/autoloads/gamestate.gd
server/entities/characters/player.gd 34 additions, 20 deletions

server/entities/characters/player.gd
server/entities/characters/player.tscn 5 additions, 5 deletions

server/entities/characters/player.tscn
server/levels/test/game.gd 15 additions, 4 deletions

server/levels/test/game.gd
server/levels/test/game.tscn 12 additions, 1 deletion

server/levels/test/game.tscn

with 92 additions and 38 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