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

Conflicts: src/game/Physics/PhysicsSystem.cpp
2015-10-13 17:44:05 +02:00
parent 5040ff4649 4857e387ad
commit 5955a888d2
36 changed files with 71 additions and 9 deletions
@@ -100,6 +100,8 @@ namespace dd
            std::unordered_map<b2Body*, EntityID> m_BodiesToEntities;


+			int t_counter = 0;
+

            void CreateBody(EntityID entity);
            void SyncEntitiesWithBodies();
@@ -130,7 +132,7 @@ namespace dd
            std::vector<EntityID> ParticleEmitter;
            std::vector<EntityID> ParticleTemplate;
        };
-            EmitterHandler m_ParticleEmitters;
+        EmitterHandler m_ParticleEmitters;

            std::list<Impulse> m_Impulses;