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>
Fixed variable loader and default camera position and angle. Committing before merge with master branch.

Signed-off-by: Farbror Tiny <jens.syntax@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>
Updated camera functionality.

Signed-off-by: Farbror Tiny <jens.syntax@gmail.com>
Menus working fully, pause menu looks like shit temporarily. Beginning to implement support for controller in menu.

Signed-off-by: Herman Rödström <herman@rodstrom.se>
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>
Added unique ID to each GameObject and a default creation method. Changed "nextlevel" to "gate" in DBManager.cpp.

Signed-off-by: Olof Wallentin <olov.wallentin@gmail.com>
Changed so a GameObject can get another game object directly without the need to call game object manager. This so you don't have to include the game object manager just for getting a game object.

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

Conflicts:
	Game/codebase/Game.cpp
	Game/codebase/InputSystem.cpp

Pause menu to Main menu broken. Something about maps and iterators being changed while accessed, can't find where.

Signed-off-by: Herman Rödström <herman@rodstrom.se>
Moved m_sound_manager out of the states. Nothing works...
Preparing to revert.

Signed-off-by: Herman Rödström <herman@rodstrom.se>
Played around with some values and timers, trying to get release working from explorer...

Signed-off-by: Olof Wallentin <olov.wallentin@gmail.com>