Merge branch 'new-inputs' into develop (3b8e57ab) · 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
3b8e57ab

There was an error fetching the commit references. Please try again later.

Commit 3b8e57ab authored 5 years ago by

STAVRIDIS ADONIS

💬

Downloads
- Plain Diff

Merge branch 'new-inputs' into develop

parents 9c0e85b1 c61a4bbb

No related merge requests found

Changes 10

Expand all Hide whitespace changes

Inline Side-by-side

Showing

client/animations/kick_up.tres 474 additions, 0 deletions

client/animations/kick_up.tres
client/entities/characters/AnimationTree.gd 12 additions, 9 deletions

client/entities/characters/AnimationTree.gd
client/entities/characters/player.gd 2 additions, 1 deletion

client/entities/characters/player.gd
client/entities/characters/player.tscn 61 additions, 49 deletions

client/entities/characters/player.tscn
client/levels/test/game.gd 10 additions, 14 deletions

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

server/autoloads/gamestate.gd
server/entities/characters/Class1/class1.gd 1 addition, 1 deletion

server/entities/characters/Class1/class1.gd
server/entities/characters/player.gd 181 additions, 88 deletions

server/entities/characters/player.gd
server/entities/characters/player.tscn 21 additions, 1 deletion

server/entities/characters/player.tscn
server/levels/test/game.gd 3 additions, 2 deletions

server/levels/test/game.gd

with 766 additions and 166 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