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>
Push before Olof merge for smooth controls.

Signed-off-by: Farbror Tiny <jens.syntax@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>
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>
Solved lots of problems.
Don't know if 3dsound still works though.

Signed-off-by: Herman Rödström <herman@rodstrom.se>
Merge branch 'olof' of github.com:rodstrom/yomibubble into jens

Conflicts:
	Game/codebase/Components/CameraComponents.cpp
	Game/codebase/Core.cpp
Loading screen working.
Still not possible to:
playstate->menustate->PlayState
Terrain probably doesn't exit cleanly

Signed-off-by: Herman Rödström <herman@rodstrom.se>
Fixed infinite jumping and disabled grass loading.

Signed-off-by: Herman Rödström <herman@rodstrom.se>
now possible to close the window by pressing the cross. And other stuff I don't remember.

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

Conflicts:
	Game/codebase/Components/PhysicsComponents.cpp
	Game/codebase/Core.cpp
	Game/codebase/States/PlayState.cpp
Commit before merge with Olof. Have worked on camera collision, not much progress though.

Signed-off-by: Farbror Tiny <jens.syntax@gmail.com>
sdf
Merge branch 'olof' of github.com:rodstrom/yomibubble into jens

Conflicts:
	Game/codebase/Components/PhysicsComponents.cpp
	Game/codebase/Core.cpp
	Game/codebase/Managers/GameObjectManager.cpp
	Game/codebase/PhysicsEngine.cpp
	Game/codebase/States/PlayState.cpp
Gate game object rotation fixed.

Signed-off-by: Olof Wallentin <olov.wallentin@gmail.com>
Started working on changing levels ingame

Signed-off-by: Olof Wallentin <olov.wallentin@gmail.com>
Fast merge before testing session. Pushing before pulling from Olof.

Signed-off-by: Farbror Tiny <jens.syntax@gmail.com>
Switcing levels now works! Also redid the Countable GUI component to be more script specific. It will load according to the name of the level.

Signed-off-by: Olof Wallentin <olov.wallentin@gmail.com>
Started working on animations, tweaked bubble physics etc.

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