Skip to content

Commit

Permalink
Merge pull request #10 from Renardjojo/fix/animation_size
Browse files Browse the repository at this point in the history
Closes #9
  • Loading branch information
Renardjojo authored Nov 3, 2022
2 parents 891e990 + 27f33e0 commit ac15246
Show file tree
Hide file tree
Showing 12 changed files with 18 additions and 36 deletions.
1 change: 1 addition & 0 deletions deps/Boxer
Submodule Boxer added at 0451c5
3 changes: 0 additions & 3 deletions resources/sprites/drag1.png

This file was deleted.

3 changes: 0 additions & 3 deletions resources/sprites/drag2.png

This file was deleted.

4 changes: 2 additions & 2 deletions resources/sprites/grab.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions resources/sprites/idle.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions resources/sprites/idle2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions resources/sprites/jumpAir.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions resources/sprites/jumpEnd.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions resources/sprites/sleep.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions resources/sprites/startJump.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions resources/sprites/walk.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 1 addition & 14 deletions src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1558,22 +1558,9 @@ struct RandomDelayTransitionMultipleExit : public RandomDelayTransition

struct StartLeftClicTransition : public StateMachine::Node::Transition
{
protected:
bool leftWasPressed = false;

public:
bool canTransition(GameData& blackBoard) final
{
if (blackBoard.leftButtonEvent == GLFW_PRESS)
{
if (leftWasPressed)
{
leftWasPressed = false;
return true;
}
leftWasPressed = true;
}
return false;
return blackBoard.leftButtonEvent == GLFW_PRESS;
};
};

Expand Down

0 comments on commit ac15246

Please sign in to comment.