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

2016-02-03 15:07:19 +01:00
parent 9d3171540d 2cbeef4c69
commit 13161b4f57
11 changed files with 47 additions and 47 deletions
@@ -23,7 +23,7 @@ class InterpolationSystem : public PureSystem
        glm::vec3 Position;
        glm::vec3 Scale;
        glm::quat Orientation;
-        double interpolationTime;
+        float interpolationTime;
    };
 public:
    InterpolationSystem(World* world, EventBroker* eventBroker);