Merge remote-tracking branch 'origin/developer' into feature/Controller

Added support for second controller # Conflicts: # CrystalPoint.cpp # CrystalPoint.h # CrystalPoint.vcxproj # CrystalPoint.vcxproj.filters
2016-06-21 11:24:55 +02:00
parent 83557c7ba7 7c4805d899
commit 3f8623d0bf
45 changed files with 1284 additions and 777 deletions
@@ -8,6 +8,7 @@ Controller::Controller(int controllerId) {
    this->controllerId = controllerId;
    this->ypr = Vec3f();
    this->joystick = Vec2f();
+    this->setConnected(false);
    this->setConnected(true);
 }