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

This commit is contained in:
ViktorLjung
2014-05-24 18:35:26 +02:00
14 changed files with 142 additions and 44 deletions
+1 -1
View File
@@ -49,7 +49,7 @@ namespace Systems
std::map<EntityID, double> m_TimeSinceLastShot;
};
class TankSteeringSystem::TankSteeringInputController : InputController
class TankSteeringSystem::TankSteeringInputController : InputController<TankSteeringSystem>
{
public:
TankSteeringInputController(std::shared_ptr<::EventBroker> eventBroker, int playerID)