Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn

2014-03-14 01:54:28 +01:00
parent 03e7117d4c 7fdb035294
commit 9f2334bcb6
31 changed files with 880 additions and 10 deletions
@@ -11,6 +11,7 @@ void GameWorld::Initialize()
 	std::shared_ptr<Components::Camera> camera;
 	std::shared_ptr<Components::Bounds> bounds;
 	std::shared_ptr<Components::Collision> collision;
+	std::shared_ptr<Components::SoundEmitter> soundEmitter;
 	EntityID ent;

 	// Fucking lights