Merge remote-tracking branch 'origin/master' into WeaponSystem

# Conflicts: # src/Game/Systems/SoundSystem.cpp
2016-02-10 19:21:30 +01:00
parent 2c0f66d9c7 ed06eacf6f
commit 0825b10c75
7 changed files with 55 additions and 20 deletions
@@ -135,7 +135,7 @@ Model::Model(std::string fileName)
        maxi = glm::max(maxi, v.Position);
    }

-    m_Box = AABB(maxi, mini);
+    m_Box = AABB(mini, maxi);
 }

 Model::~Model()