Merge branch 'developer' into feature/gameplay

# Conflicts: # CrystalPoint.cpp
2016-06-21 14:06:41 +02:00
parent 35c21260e4 6096e53d94
commit ea22712a45
18 changed files with 98 additions and 20 deletions
@@ -8,7 +8,7 @@
 class Enemy : public Entity
 {
 public:
-	Enemy(const std::string &fileName,const Vec3f &position,Vec3f &rotation,const float &scale);
+	Enemy(const std::string &fileName, const std::string &fileMusic, const Vec3f &position, const Vec3f &rotation, const float &scale);
 	~Enemy();

 	Sound* music;