There was an error fetching the commit references. Please try again later.
Merge branch 'develop' into ihm
Showing
- .gitignore 10 additions, 1 deletion.gitignore
- client/Globals.gd 2 additions, 2 deletionsclient/Globals.gd
- client/SaveSettings.gd 0 additions, 0 deletionsclient/SaveSettings.gd
- client/animations/big_impact.tres 474 additions, 0 deletionsclient/animations/big_impact.tres
- 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/drop_object.tres 474 additions, 0 deletionsclient/animations/drop_object.tres
- client/animations/idle.tres 475 additions, 0 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/impact_jump.tres 474 additions, 0 deletionsclient/animations/impact_jump.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_kick_up.tres 474 additions, 0 deletionsclient/animations/jump_kick_up.tres
- client/animations/jump_up.tres 474 additions, 0 deletionsclient/animations/jump_up.tres
- client/animations/kick_1.tres 474 additions, 0 deletionsclient/animations/kick_1.tres
- client/animations/kick_2.tres 474 additions, 0 deletionsclient/animations/kick_2.tres
- client/animations/kick_up.tres 474 additions, 0 deletionsclient/animations/kick_up.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
Please register or sign in to comment