Push before Olof merge for smooth controls.

Signed-off-by: Farbror Tiny <jens.syntax@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>
Merge branch 'olof' of github.com:rodstrom/yomibubble into jens

Conflicts:
	Game/codebase/Components/CameraComponents.cpp
	Game/codebase/Core.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
Fast merge before testing session. Pushing before pulling from Olof.

Signed-off-by: Farbror Tiny <jens.syntax@gmail.com>
Started working on animations, tweaked bubble physics etc.

Signed-off-by: Olof Wallentin <olov.wallentin@gmail.com>
Commit before merging with Olof before tuesday testing.

Signed-off-by: Farbror Tiny <jens.syntax@gmail.com>
Fixed a few camera issues.

Signed-off-by: Farbror Tiny <jens.syntax@gmail.com>
New classes AnimationManager and Player States and PlayerStateManager.cpp. Includes proper Animation transition and detailed Player State activities.

Signed-off-by: Olof Wallentin <olov.wallentin@gmail.com>
Committing before alpha-merge with Olof. Have fixed more variable values and smaller issues.

Signed-off-by: Farbror Tiny <jens.syntax@gmail.com>
Successful merge with Olof before Alpha.

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

Conflicts:
	Game/codebase/Artifex/Loader/DBManager.cpp
	Game/codebase/Components/CameraComponents.cpp
	Game/codebase/Components/GameObjectPrereq.h
	Game/codebase/Components/PlayerInputComponent.cpp
	Game/codebase/Managers/GameObjectManager.cpp
	Game/codebase/Managers/VariableManager.cpp
	Game/codebase/States/PlayState.cpp

Blowing blue bubbles broken

Signed-off-by: Herman Rödström <herman@rodstrom.se>
Working with camcollision, preparing merge

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