added companion gameobject

Signed-off-by: Anders <oakvalley.a@gmail.com>
Merge branch 'master' of https://github.com/rodstrom/yomibubble into anders

Did some changes to AiComponents, moved some of the logic to the actual component.

Conflicts:
	Game/codebase/Artifex/Loader/DBManager.cpp
	Game/codebase/Managers/GameObjectManager.cpp
	Game/codebase/States/PlayState.cpp

Signed-off-by: Anders <oakvalley.a@gmail.com>
Merge branch 'olof' of https://github.com/rodstrom/yomibubble into anders

Cmitting so I can merge with Olof.
No changes.

Conflicts:
	Game/codebase/Artifex/Loader/DBManager.cpp
	Game/codebase/Managers/GameObjectManager.cpp
	Game/codebase/States/PlayState.cpp

Signed-off-by: Anders <oakvalley.a@gmail.com>
Merge branch 'olof' of https://github.com/rodstrom/yomibubble into anders
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>
Made some minor changes to the AI component, and the companion AI.

Signed-off-by: Anders <oakvalley.a@gmail.com>
Merge branch 'jens' of https://github.com/rodstrom/yomibubble into anders
Some small changes to the AI.

Conflicts:
	Game/codebase/Components/ComponentsPrereq.h
	Game/codebase/PhysicsPrereq.h
	Game/codebase/States/PlayState.cpp

Signed-off-by: Anders <oakvalley.a@gmail.com>
Merge branch 'olof' of https://github.com/rodstrom/yomibubble into anders

Conflicts:
	Game/codebase/Artifex/Loader/DBManager.cpp
	Game/codebase/Components/CameraComponents.cpp
	Game/codebase/Components/CameraComponents.h
	Game/codebase/Components/ComponentsPrereq.h
	Game/codebase/Components/GameObjectPrereq.h
	Game/codebase/Components/PhysicsComponents.cpp
	Game/codebase/Components/PlayerInputComponent.cpp
	Game/codebase/Components/PlayerInputComponent.h
	Game/codebase/Components/VisualComponents.cpp
	Game/codebase/Components/VisualComponents.h
	Game/codebase/Managers/AnimationManager.cpp
	Game/codebase/Managers/AnimationManager.h
	Game/codebase/Managers/CollisionManager.cpp
	Game/codebase/Managers/GameObjectManager.cpp
	Game/codebase/Managers/GameObjectManager.h
	Game/codebase/Managers/LevelManager.cpp
	Game/codebase/Managers/LevelManager.h
	Game/codebase/States/LoadingState.cpp
	Game/codebase/States/LoadingState.h
	Game/codebase/States/PlayState.cpp

Signed-off-by: Anders <oakvalley.a@gmail.com>
Deleted codebase

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

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

Signed-off-by: andekd <oakvalley.a@gmail.com>
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>
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>
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>