Merge branch 'animation-godot' of git.unistra.fr:projet-integrateur-cmi2/cmi2 into animation-godot
Showing
- client/animations/controlled_fall.tres 475 additions, 0 deletionsclient/animations/controlled_fall.tres
- client/animations/dash.tres 474 additions, 0 deletionsclient/animations/dash.tres
- client/animations/double_jump.tres 474 additions, 0 deletionsclient/animations/double_jump.tres
- client/animations/drop_object.tres 474 additions, 0 deletionsclient/animations/drop_object.tres
- client/animations/idle.tres 69 additions, 69 deletionsclient/animations/idle.tres
- client/animations/impact_1.tres 474 additions, 0 deletionsclient/animations/impact_1.tres
- client/animations/impact_2.tres 474 additions, 0 deletionsclient/animations/impact_2.tres
- client/animations/jump_kick_down.tres 474 additions, 0 deletionsclient/animations/jump_kick_down.tres
- client/animations/jump_kick_side.tres 474 additions, 0 deletionsclient/animations/jump_kick_side.tres
- client/animations/jump_up.tres 67 additions, 67 deletionsclient/animations/jump_up.tres
- client/animations/kick_1.tres 0 additions, 0 deletionsclient/animations/kick_1.tres
- client/animations/kick_2.tres 1 addition, 1 deletionclient/animations/kick_2.tres
- client/animations/pick_up_object.tres 474 additions, 0 deletionsclient/animations/pick_up_object.tres
- client/animations/punch_1.tres 474 additions, 0 deletionsclient/animations/punch_1.tres
- client/animations/punch_2.tres 23 additions, 23 deletionsclient/animations/punch_2.tres
- client/animations/run.tres 69 additions, 69 deletionsclient/animations/run.tres
- client/animations/wait.escn 0 additions, 992 deletionsclient/animations/wait.escn
- client/entities/characters/AnimationTree.gd 50 additions, 13 deletionsclient/entities/characters/AnimationTree.gd
- client/entities/characters/player.tscn 66 additions, 515 deletionsclient/entities/characters/player.tscn
- client/levels/test/game.gd 1 addition, 1 deletionclient/levels/test/game.gd
Please register or sign in to comment