Merge remote-tracking branch 'upstream/master'

TaijaQ · Nov 8, 2015 · cce0477 · cce0477
2 parents d9c467b + 234954c
commit cce0477
Showing 1 changed file with 0 additions and 47 deletions.
diff --git a/client/etc/config.yml b/client/etc/config.yml
@@ -113,45 +113,6 @@ signs:
     freeHand:
         grab:
             max: 0.4
-    #twoCirclesDown:
-    #    circle:
-    #        minCircles: 2
-    #        clockwise: true
-    #twoCirclesUp:
-    #    circle:
-    #        minCircles: 2
-    #        clockwise: false
-    swipeDown:
-        swipe:
-            direction: 'down'
-            minDistance: 10000
-    swipeUp:
-        swipe:
-            direction: 'up'
-            minDistance: 10000
-    #stopSign:
-    #    hover:
-    #        left: true
-    #        minDistance:
-    #startSign:
-    #    hover:
-    #        left: false
-    #        minTime: 3
-    # peaceHeld:
-    #     extendedFingers:
-    #         indexFinger: true
-    #         middleFinger: true
-    #         ringFinger: false
-    #         pinky: false
-    #     minTime: 2000000
-    #     feedback:
-    #         audio: 'asset/audio/mallet.ogg'
-    # surpriseHand:
-    #     grab:
-    #         max: 0.4
-    #     feedback:
-    #         audio: 'asset/audio/mallet.ogg'
-
 recipes:
     mouseMove:
         action: 'mouseMove'
@@ -169,11 +130,3 @@ recipes:
         action: 'mouse2Click'
         continuous: true
         chargeDelay: 500
-    mouseScrollUp:
-        signs:
-        - 'swipeUp'
-        action: 'mouseScrollUp'
-    changeProfile:
-        signs:
-        - 'pinchPinky'
-        action: 'alternateProfile'