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
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>
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>
Updated audio system. 2D SFX and Music works, but not 3D. Added some audio files.

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

Conflicts:
	Game/codebase/BtOgrePG.h
	Game/codebase/Components/Components.cpp
	Game/codebase/Components/Components.h
	Game/codebase/Components/ComponentsPrereq.h
	Game/codebase/Components/GameObject.cpp
	Game/codebase/Components/GameObject.h
	Game/codebase/Components/GameObjectPrereq.h
	Game/codebase/Components/PlayerInputComponent.cpp
	Game/codebase/Components/PlayerInputComponent.h
	Game/codebase/Core.h
	Game/codebase/InputSystem.cpp
	Game/codebase/Managers/GameObjectManager.cpp
	Game/codebase/Managers/GameObjectManager.h
	Game/codebase/PhysicsEngine.h
	Game/codebase/States/PlayState.cpp
	Game/codebase/States/PlayState.h
Merge branch 'master' of https://github.com/rodstrom/yomibubble into anders

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

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