Merge branch 'develop' of github.com:AnonymusRaccoon/Bomberman into parser

# Conflicts:
#	sources/Map/Map.cpp
#	sources/Runner/GameScene.cpp
#	sources/Runner/PauseMenuScene.cpp
#	sources/Runner/Runner.cpp
#	sources/System/Controllable/ControllableSystem.cpp
#	sources/System/Lobby/LobbySystem.cpp

sources/Component/Controllable/ControllableComponent.hpp

@@ -34,14 +34,16 @@ namespace BBM
 
 			//! @brief The X and Z abscis of the movement.
 			Vector2f move;
-			//! @brief input value to select
-			bool select = false;
-			//! @brief input value for bomb
+			//! @brief input value for secondary inputs.
+			bool secondary = false;
+			//! @brief input value for bomb and selection
 			bool bomb = false;
 			//! @brief input value for pause
 			bool pause = false;
 			//! @brief The layout used for this controllable.
 			Layout layout = NONE;
+			//! @brief True if buttons should be triggered every frame where the key is down, false if the button should only be triggered once the key is released.
+			bool fastClick = false;
 
 			//! @inherit
 			WAL::Component *clone(WAL::Entity &entity) const override;

sources/Component/Gamepad/GamepadComponent.hpp

@@ -22,9 +22,9 @@ namespace BBM
 			int _ID;
 		public:
 			//! @brief jump key
-			Button keyJump = GAMEPAD_BUTTON_RIGHT_FACE_DOWN;
+			Button keySecondary = GAMEPAD_BUTTON_RIGHT_FACE_RIGHT;
 			//! @brief bomb key
-			Button keyBomb = GAMEPAD_BUTTON_RIGHT_FACE_RIGHT;
+			Button keyBomb = GAMEPAD_BUTTON_RIGHT_FACE_DOWN;
 			//! @brief pause key
 			Button keyPause = GAMEPAD_BUTTON_MIDDLE;
 			//! @brief move right key

sources/Component/Keyboard/KeyboardComponent.cpp

@@ -16,16 +16,16 @@ namespace BBM
 			this->keyDown = KEY_S;
 			this->keyLeft = KEY_A;
 			this->keyRight = KEY_D;
-			this->keyJump = KEY_SPACE;
-			this->keyBomb = KEY_E;
+			this->keyBomb = KEY_SPACE;
+			this->keySecondary = KEY_LEFT_CONTROL;
 			this->keyPause = KEY_ESCAPE;
 		} else {
 			this->keyUp = KEY_UP;
 			this->keyDown = KEY_DOWN;
 			this->keyLeft = KEY_LEFT;
 			this->keyRight = KEY_RIGHT;
-			this->keyJump = KEY_RIGHT_CONTROL;
-			this->keyBomb = KEY_ENTER;
+			this->keyBomb = KEY_RIGHT_CONTROL;
+			this->keySecondary = KEY_RIGHT_SHIFT;
 			this->keyPause = KEY_BACKSPACE;
 		}
 	}

sources/Component/Keyboard/KeyboardComponent.hpp

@@ -18,7 +18,7 @@ namespace BBM
 	{
 	public:
 		//! @brief jump key
-		Key keyJump = KEY_SPACE;
+		Key keySecondary = KEY_SPACE;
 		//! @brief bomb key
 		Key keyBomb = KEY_E;
 		//! @brief pause key

sources/Component/Tag/TagComponent.hpp

@@ -54,6 +54,7 @@ namespace BBM
 	constexpr const char Blowable[] = "Blowable";
 	// interact with visual features like camera
 	constexpr const char Player[] = "Player";
+	constexpr const char Background[] = "Background";
 	constexpr const char Unbreakable[] = "Unbreakable";
 	constexpr const char Breakable[] = "Breakable";
 	constexpr const char Hole[] = "Hole";

sources/Component/Timer/TimerComponent.hpp

@@ -15,6 +15,9 @@ namespace BBM
 	class TimerComponent : public WAL::Component
 	{
 	public:
+		//! @brief Is the ticking of this component disabled?
+		bool disabled = false;
+
 		//! @brief The callback to call when the timer ring.
 		WAL::Callback<WAL::Entity &, WAL::Wal &> callback;
 		//! @brief The ring delay of this timer component.