Merge branch 'bling' into develop (6ca22026) · 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
6ca22026

Commit 6ca22026 authored 5 years ago by

STAVRIDIS ADONIS

:speech_balloon:

Downloads
- Plain Diff

Merge branch 'bling' into develop

parents 565702f7 338f8eac

Branches

Tags

No related merge requests found

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

client/entities/characters/hp.gd 9 additions, 0 deletions

client/entities/characters/hp.gd
client/entities/items/beer.tscn 46 additions, 2 deletions

client/entities/items/beer.tscn
client/entities/items/hot_dog.tscn 46 additions, 3 deletions

client/entities/items/hot_dog.tscn
client/entities/sfx/heal.wav 0 additions, 0 deletions

client/entities/sfx/heal.wav
client/entities/sfx/heal.wav.import 21 additions, 0 deletions

client/entities/sfx/heal.wav.import
client/entities/sfx/healSfx.tscn 9 additions, 0 deletions

client/entities/sfx/healSfx.tscn
client/entities/vfx/Heal.tscn 49 additions, 0 deletions

client/entities/vfx/Heal.tscn
client/entities/vfx/Item.tscn 50 additions, 0 deletions

client/entities/vfx/Item.tscn
client/entities/vfx/plus.png 0 additions, 0 deletions

client/entities/vfx/plus.png
client/entities/vfx/plus.png.import 36 additions, 0 deletions

client/entities/vfx/plus.png.import
client/entities/vfx/star.png 0 additions, 0 deletions

client/entities/vfx/star.png
client/entities/vfx/star.png.import 36 additions, 0 deletions

client/entities/vfx/star.png.import
client/entities/vfx/vfx.gd 1 addition, 1 deletion

client/entities/vfx/vfx.gd

with 303 additions and 6 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