Merge branch 'hud' of https://git.unistra.fr/projet-integrateur-cmi2/cmi2 into hud
Showing
- .gitignore 2 additions, 1 deletion.gitignore
- client/animations/kick_1.tres 1 addition, 1 deletionclient/animations/kick_1.tres
- client/animations/kick_up.tres 474 additions, 0 deletionsclient/animations/kick_up.tres
- client/animations/punch_1.tres 1 addition, 1 deletionclient/animations/punch_1.tres
- client/autoloads/gamestate.gd 160 additions, 61 deletionsclient/autoloads/gamestate.gd
- client/autoloads/interfaces.gd 142 additions, 0 deletionsclient/autoloads/interfaces.gd
- client/autoloads/network.gd 156 additions, 0 deletionsclient/autoloads/network.gd
- client/autoloads/saveSettings.gd 71 additions, 0 deletionsclient/autoloads/saveSettings.gd
- client/defaultSettingsFile.cfg 15 additions, 0 deletionsclient/defaultSettingsFile.cfg
- client/entities/characters/AnimationTree.gd 117 additions, 9 deletionsclient/entities/characters/AnimationTree.gd
- client/entities/characters/hp.gd 5 additions, 4 deletionsclient/entities/characters/hp.gd
- client/entities/characters/player.gd 35 additions, 16 deletionsclient/entities/characters/player.gd
- client/entities/characters/player.tscn 65 additions, 63 deletionsclient/entities/characters/player.tscn
- client/entities/characters/pseudo.gd 5 additions, 4 deletionsclient/entities/characters/pseudo.gd
- client/entities/sfx/crit.wav 0 additions, 0 deletionsclient/entities/sfx/crit.wav
- client/entities/sfx/crit.wav.import 21 additions, 0 deletionsclient/entities/sfx/crit.wav.import
- client/entities/sfx/critSfx.tscn 9 additions, 0 deletionsclient/entities/sfx/critSfx.tscn
- client/entities/sfx/hit1.wav 0 additions, 0 deletionsclient/entities/sfx/hit1.wav
- client/entities/sfx/hit1.wav.import 21 additions, 0 deletionsclient/entities/sfx/hit1.wav.import
- client/entities/sfx/hit1Sfx.tscn 10 additions, 0 deletionsclient/entities/sfx/hit1Sfx.tscn
Please register or sign in to comment