fixed merge bugs.

Signed-off-by: Olof Wallentin <olov.wallentin@gmail.com>
Unsuccessful merge with Anders, committing before taking fixed merge version from Olof.

Signed-off-by: Farbror Tiny <jens.syntax@gmail.com>
removed lib files from git branch

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

Conflicts:
	Game/codebase/States/IntroMovieState.cpp
Fixed Bubble Z write order. Tweaked Animation blender, still buggy...

Signed-off-by: Olof Wallentin <olov.wallentin@gmail.com>
Quick update.
Merge branch 'olof' of github.com:rodstrom/yomibubble into jens
New sound effect implementations. Fixed the flaws in the tutorial graphics.

Signed-off-by: Farbror Tiny <jens.syntax@gmail.com>
Quick audiomanager clean-up fix.

Signed-off-by: Farbror Tiny <jens.syntax@gmail.com>
tweaked animation blending, less buggy than before but still not perfect.

Signed-off-by: Olof Wallentin <olov.wallentin@gmail.com>
Merge branch 'jens' of github.com:rodstrom/yomibubble into olof
Great improvements in camera, stepless following in all directions, different speeds in x, y, z.

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

Signed-off-by: Herman Rödström <herman@rodstrom.se>
Fixed creating bubbles inside of objects.
Stopped creating bubbles when the player jumps/falls.

Signed-off-by: Olof Wallentin <olov.wallentin@gmail.com>
Merge branch 'herman' of github.com:rodstrom/yomibubble into olof
Fixed crash bug when bubbles pop
Fixed movement bug when bouncing

Signed-off-by: Olof Wallentin <olov.wallentin@gmail.com>
Added Win State with default background image
Fixed up intro logo state.
Made it so entering the gate on level3 will move the player to win state and then to menu state.

Signed-off-by: Olof Wallentin <olov.wallentin@gmail.com>
Hardcoded plugin loading and added the Ogre Configuration Box on startup.

Signed-off-by: Olof Wallentin <olov.wallentin@gmail.com>
Fixed up version for SGA
Merge branch 'olof' of github.com:rodstrom/yomibubble into jens