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
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>
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>
Commented out waypoint creation. Readded OgreOggSound section.

Signed-off-by: Olof Wallentin <olov.wallentin@gmail.com>
Fixed bug for flying player. Tweaked on Bubble and in bubble state. You can switch bubble state when inside the bubble. New animations for on bubble idle and walk. More to come soon. Tweaked deletion of game objects to be more safe. Bubbles now have a in-world limit that can be set in a text document. Pink bubbles have a set lifetime.

Signed-off-by: Olof Wallentin <olov.wallentin@gmail.com>
Working animation blending. Make sure you have the latest Yomi mesh and skeleton file.

Signed-off-by: Olof Wallentin <olov.wallentin@gmail.com>
Fixed collision bug that caused collision to not always register with the player.

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