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
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>
Finally fixed the fade in fade out function.

ADDED CLASSES; FadeInFadeOut.cpp/.h

Signed-off-by: andekd <oakvalley.a@gmail.com>
Fade in fade out, not fading everywhere, haven't added those features yet. Just 3 lines of code where I want to have it. Will fix that.

Added some small changes to menustate, added some meshes.

Signed-off-by: andekd <oakvalley.a@gmail.com>
Committ before merge with Olof 28-05-13

Signed-off-by: Farbror Tiny <jens.syntax@gmail.com>
Just added some objects to the main menu. Don't forget to add the new classes FadeInFadeOut.cpp/h

Need two variables in the player_config, Fade_in_timer and Fade_out_timer.

Signed-off-by: andekd <oakvalley.a@gmail.com>
After successful merge with Olof 28-05-2013

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

Merge complete.

Conflicts:
	Game/codebase/Components/ComponentsPrereq.h
	Game/codebase/Game.cpp
	Game/codebase/InputSystem.cpp
	Game/codebase/Managers/GameObjectManager.cpp
	Game/codebase/States/PlayState.cpp

Signed-off-by: andekd <oakvalley.a@gmail.com>
fixed merge bugs.

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