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>
Working with camcollision, preparing merge

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

Preparing to recreate camera from scratch

Signed-off-by: Herman Rödström <herman@rodstrom.se>
Dont pull;) Cam collision starting to work, extremely bugged though

Signed-off-by: Herman Rödström <herman@rodstrom.se>
Camera collides, no action yet though
Extra: Keyboard/Mouse-input works okay

Signed-off-by: Herman Rödström <herman@rodstrom.se>
Camcollision works, needs lots of tweaking

Signed-off-by: Herman Rödström <herman@rodstrom.se>
Fixed a few sound bugs after the new physics system. Have written a base for the tott system, and implemented speech bubbles.

Signed-off-by: Farbror Tiny <jens.syntax@gmail.com>
Merge branch 'olof' of github.com:rodstrom/yomibubble into jens
Camera collision works almost flawlessly. Minor tweaking necessary
Successful beta merge with Olof.

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/AIComponents.h
	Game/codebase/Managers/GameObjectManager.cpp
	Game/codebase/Managers/LevelManager.cpp
	Game/codebase/States/PlayState.cpp
Merge with jens and herman. Fixed loading screen materials.

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