testing branches

Signed-off-by: Anders Ekdahl <oakvalley.a@gmail.com>
Merge branch 'anders' of https://github.com/rodstrom/tikububble
GUI

Signed-off-by: olowal <olov.wallentin@gmail.com>
Cleaning

Signed-off-by: olowal <olov.wallentin@gmail.com>
Fixed overlay GUI, added the ability to add the textures. Win.

Signed-off-by: anders <oakvalley.a@gmail.com>
Base for managing components using GameObjectManager and a factory interface using IComponentFactory

new classes:
GameObjectFactory.h/cpp
GameObjectManager.h/cpp
GameObjectPrereq.h
Removed redundant files, now include vld memory leak debugger.

Signed-off-by: Olof Wallentin <olov.wallentin@gmail.com>
Slight revamp of required components, cleaned up message list. Added character controller and follow camera.

Signed-off-by: Olof Wallentin <olov.wallentin@gmail.com>
Merge pull request #1 from rodstrom/olof

Olof - Component System
GuiManager

Signed-off-by: Anders <oakvalley.a@gmail.com>
Removed Ogre.log

Signed-off-by: Olof Wallentin <olov.wallentin@gmail.com>
Removed project specific files from master.

Signed-off-by: Olof Wallentin <olov.wallentin@gmail.com>
Merge branch 'master' of github.com:rodstrom/yomibubble

Conflicts:
	Game/codebase/BubbleAdventure.v11.suo
	Game/codebase/Nostromo.vcxproj
	Game/codebase/Nostromo.vcxproj.filters
Deleted vcxproj from the merge.

Signed-off-by: Anders <oakvalley.a@gmail.com>
Removed redundant project files.

Merge branch 'master' of github.com:rodstrom/yomibubble into olof

Conflicts:
	Game/run/bin/debug/Ogre.log

Signed-off-by: Olof Wallentin <olov.wallentin@gmail.com>
Merge branch 'master' of https://github.com/rodstrom/yomibubble into anders

Conflicts:
	Game/codebase/BubbleAdventure.v11.suo
	Game/codebase/Components/PlayerController.cpp
	Game/codebase/Managers/InputManager.h
	Game/codebase/Nostromo.vcxproj
	Game/codebase/Nostromo.vcxproj.filters
	Game/codebase/States/PlayState.cpp
	Game/codebase/States/PlayState.h
	Game/run/bin/debug/Ogre.log
audio stuff, cant find my soundmanager files though

Signed-off-by: Farbror Tiny <jens.syntax@gmail.com>
Camera, CharacterController etc

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

Signed-off-by: Olof Wallentin <olov.wallentin@gmail.com>
GUI component, collision on overlays.

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