Put player_variables in config-folder for easier merges

Signed-off-by: Herman Rödström <herman@rodstrom.se>
Totts maybe animates, cant test yet because of new materials

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

Conflicts:
	Game/codebase/Artifex/Loader/DBManager.cpp

Totts are animated, however they aren't walking towards their waypoints.

Signed-off-by: Herman Rödström <herman@rodstrom.se>
Added loading screen between levels

Signed-off-by: Herman Rödström <herman@rodstrom.se>
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>
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 with camcollision, preparing merge

Signed-off-by: Herman Rödström <herman@rodstrom.se>
Working animation blending. Make sure you have the latest Yomi mesh and skeleton file.

Signed-off-by: Olof Wallentin <olov.wallentin@gmail.com>
Working on Tottar. Committing before merge with Olof.

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

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

Preparing to recreate camera from scratch

Signed-off-by: Herman Rödström <herman@rodstrom.se>
Fixed collision bug that caused collision to not always register with the player.

Signed-off-by: Olof Wallentin <olov.wallentin@gmail.com>
Fail merge with Olof. Committing before pulling from master.

Signed-off-by: Farbror Tiny <jens.syntax@gmail.com>
Successful merge with master branch.

Signed-off-by: Farbror Tiny <jens.syntax@gmail.com>
Started implementing the ability to pick up objects. Raycast detection to detect what is in front of the player.

Signed-off-by: Olof Wallentin <olov.wallentin@gmail.com>
Merge branch 'jens' of github.com:rodstrom/yomibubble into olof
Dont pull;) Cam collision starting to work, extremely bugged though

Signed-off-by: Herman Rödström <herman@rodstrom.se>
Fixed animation blending with totts. Still hardcoded for Hidgehog.

Signed-off-by: Olof Wallentin <olov.wallentin@gmail.com>
Test commit, fucked up version.

Signed-off-by: Farbror Tiny <jens.syntax@gmail.com>
Merge branch 'olof' of github.com:rodstrom/yomibubble into jens
Successful merge! Tott collision is working!

Signed-off-by: Farbror Tiny <jens.syntax@gmail.com>