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

Conflicts: Escape-the-Dawn/GameWorld.cpp Escape-the-Dawn/GameWorld.h
2014-03-13 01:45:27 +01:00
parent 2beaa22758 21b2e3bdc1
commit 5ae8a15bcf
15 changed files with 365 additions and 190 deletions
@@ -15,6 +15,7 @@ struct SoundEmitter : Component
 	float ReferenceDistance;
 	float Pitch;
 	bool Loop;
+	std::string Path;
 };

 }