Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch.

This commit is contained in:
PlatinumSkink
2015-09-29 11:21:35 +02:00
10 changed files with 36 additions and 30 deletions
-1
View File
@@ -34,7 +34,6 @@
#include "Game/PadSystem.h"
#include <fstream>
#include <iostream>
#include <intrin.h>
namespace dd
{
+2 -2
View File
@@ -57,8 +57,8 @@ public:
private:
b2Vec2 m_Gravity;
b2World* m_PhysicsWorld;
float m_TimeStep;
float m_Accumulator;
double m_TimeStep;
double m_Accumulator;
int m_VelocityIterations, m_PositionIterations;