Merge branch 'develop' into ihm-merge (5aac1146) · 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
5aac1146

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

Commit 5aac1146 authored 5 years ago by

Valentine Reiland

Downloads
- Plain Diff

Merge branch 'develop' into ihm-merge

parents 40fd8020 301f82a2

No related merge requests found

Changes 11

Expand all Hide whitespace changes

Inline Side-by-side

Showing

client/animations/kick_1.tres 1 addition, 1 deletion

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

client/animations/kick_up.tres
client/animations/punch_1.tres 1 addition, 1 deletion

client/animations/punch_1.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 17 additions, 17 deletions

client/levels/test/game.gd
server/entities/characters/Class1/class1.gd 3 additions, 3 deletions

server/entities/characters/Class1/class1.gd
server/entities/characters/player.gd 254 additions, 117 deletions

server/entities/characters/player.gd
server/entities/characters/player.tscn 63 additions, 34 deletions

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

server/levels/test/game.gd

with 891 additions and 234 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