Camera working somewhat, not colliding while joystick is moving though :(

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

Conflicts:
	Game/codebase/Components/CameraComponents.cpp
	Game/codebase/States/PlayState.cpp
Working on camcollision
Got rid of lots of warnings

Signed-off-by: Herman Rödström <herman@rodstrom.se>
Small progress in camcollision

Signed-off-by: Herman Rödström <herman@rodstrom.se>
Minimum distance, not working properly

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

Conflicts:
	Game/codebase/Components/CameraComponents.cpp
	Game/codebase/Managers/CollisionManager.cpp
	Game/codebase/States/PlayState.cpp

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

Signed-off-by: Herman Rödström <herman@rodstrom.se>
Started tweaking particle effects.

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

Conflicts:
	Game/codebase/States/PlayState.cpp

Signed-off-by: Olof Wallentin <olov.wallentin@gmail.com>
- Load particles from artifex loader.
- Feedback when pink bubble is about to die.
- Pink bubble is now based on distance instead of time.

Signed-off-by: Olof Wallentin <olov.wallentin@gmail.com>
Committ before merge with Olof 28-05-13

Signed-off-by: Farbror Tiny <jens.syntax@gmail.com>
After successful merge with Olof 28-05-2013

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

Merge complete.

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

Signed-off-by: andekd <oakvalley.a@gmail.com>