Merge branch 'Physics' into bugfix

Conflicts: include/Core/Engine.h include/Physics/PhysicsSystem.h src/game/Physics/PhysicsSystem.cpp
2015-10-01 15:15:10 +02:00
parent 0743d882b9 39f4215c2b
commit a1e49d75fb
9 changed files with 6019 additions and 383 deletions
@@ -138,6 +138,7 @@ public:
 		m_World->ComponentFactory.Register<Components::ParticleEmitter>();
 		m_World->Initialize();

+
 		//PointLightTest
 		{
 			auto t_Light = m_World->CreateEntity();