Merge remote-tracking branch 'origin/particles' into havok

Conflicts: src/Components/Vehicle.h
2014-05-13 01:57:28 +02:00
parent b9231e4d46 df13663ca8
commit 74d3269e35
35 changed files with 571 additions and 39 deletions
@@ -43,6 +43,7 @@ public:
 	{
 		Components::Wheel* WheelComponent;
 		Components::Transform* TransformComponent;
+
 	};
 	
 	std::vector<WheelData> m_Wheels;