Added buttons in menustate, commiting to merge code.

Signed-off-by: Anders <oakvalley.a@gmail.com>
Merge branch 'olof' of https://github.com/rodstrom/yomibubble into anders

Conflicts:
	Game/codebase/Components/VisualComponents.cpp
	Game/codebase/Managers/GameObjectManager.cpp
	Game/codebase/Managers/GameObjectManager.h
	Game/codebase/States/PlayState.cpp

Signed-off-by: Anders <oakvalley.a@gmail.com>
Merge branch 'olof' of https://github.com/rodstrom/yomibubble into anders

Conflicts:
	Game/codebase/Components/GameObjectPrereq.h
	Game/codebase/States/PlayState.cpp

Signed-off-by: Anders <oakvalley.a@gmail.com>
Merge branch 'olof' of https://github.com/rodstrom/yomibubble into anders
Fixed DBManager.cpp again after merge.
Added loopable waypoints.

Signed-off-by: Herman Rödström <herman@rodstrom.se>
TimerComponent

Signed-off-by: Anders <oakvalley.a@gmail.com>
Merge branch 'herman' of https://github.com/rodstrom/yomibubble into anders

Conflicts:
	Game/codebase/Components/ComponentsPrereq.h
	Game/codebase/Components/GameObjectPrereq.h
	Game/codebase/Components/PlayerInputComponent.cpp
	Game/codebase/Components/VisualComponents.h
	Game/codebase/Managers/GameObjectManager.cpp
	Game/codebase/Managers/GameObjectManager.h
	Game/codebase/States/PlayState.cpp

Signed-off-by: Anders <oakvalley.a@gmail.com>
Added menu, not fully functional yet

Signed-off-by: Herman Rödström <herman@rodstrom.se>
Pause and Main menu working.
Problems when returning to PlayState from MainMenu the second time, something about overlays in visualcomponents.

Signed-off-by: Herman Rödström <herman@rodstrom.se>
Started work on Level Manager to enable switching between levels during runtime.

Signed-off-by: Olof Wallentin <olov.wallentin@gmail.com>
Merge branch 'herman' of github.com:rodstrom/yomibubble into olof
Merged with Herman

Conflicts:
	Game/codebase/Artifex/Loader/DBManager.cpp
	Game/codebase/Managers/GameObjectManager.cpp
	Game/codebase/States/PlayState.cpp
	Game/codebase/States/PlayState.h

Signed-off-by: Olof Wallentin <olov.wallentin@gmail.com>
Addition:
Tweaked Controls for the gamepad so its dependant on the pressure the user presses on teh stick. same goes for the camera.

Also tweaked fixed time step in the physics engine, should be less jittery.

Merge branch 'jens' of github.com:rodstrom/yomibubble into olof

Conflicts:
	Game/codebase/Managers/GameObjectManager.cpp
	Game/codebase/States/PlayState.cpp
	Game/codebase/States/PlayState.h

Signed-off-by: Olof Wallentin <olov.wallentin@gmail.com>
Done more on raycast for environment vs camera collision. Committing before pulling from Olof for iterated jump.

Signed-off-by: Farbror Tiny <jens.syntax@gmail.com>