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

Conflicts: src/GameWorld.cpp src/Systems/FreeSteeringSystem.cpp src/Systems/PhysicsSystem.cpp vs11/Returngeance/Returngeance.vcxproj.filters
2014-05-06 18:05:31 +02:00
parent a232559bb1 6ba50c2d1e
commit 0e2a373053
24 changed files with 1205 additions and 128 deletions
@@ -30,6 +30,8 @@
 #include "Components/Physics.h"
 #include "Components/Sphere.h"
 #include "Components/Box.h"
+#include "Components/Vehicle.h"
+#include "Components/Wheel.h"

 class GameWorld : public World
 {