Merge branch 'develop' into hud
Showing
- .gitignore 2 additions, 1 deletion.gitignore
- client/autoloads/gamestate.gd 147 additions, 38 deletionsclient/autoloads/gamestate.gd
- client/autoloads/interfaces.gd 23 additions, 6 deletionsclient/autoloads/interfaces.gd
- client/autoloads/network.gd 156 additions, 0 deletionsclient/autoloads/network.gd
- client/autoloads/saveSettings.gd 4 additions, 5 deletionsclient/autoloads/saveSettings.gd
- client/entities/characters/AnimationTree.gd 51 additions, 45 deletionsclient/entities/characters/AnimationTree.gd
- client/entities/characters/hp.gd 5 additions, 4 deletionsclient/entities/characters/hp.gd
- client/entities/characters/player.gd 20 additions, 20 deletionsclient/entities/characters/player.gd
- client/entities/characters/player.tscn 2 additions, 1 deletionclient/entities/characters/player.tscn
- client/entities/characters/pseudo.gd 5 additions, 4 deletionsclient/entities/characters/pseudo.gd
- client/entities/particles/Jump.tscn 0 additions, 38 deletionsclient/entities/particles/Jump.tscn
- client/entities/particles/Kick.tscn 0 additions, 57 deletionsclient/entities/particles/Kick.tscn
- client/entities/particles/KickUp.tscn 0 additions, 57 deletionsclient/entities/particles/KickUp.tscn
- client/entities/particles/Punch.tscn 0 additions, 58 deletionsclient/entities/particles/Punch.tscn
- 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