gamepad.patch

diff --git a/Assets/Arcadia b/Assets/Arcadia
index 0dca205..57ab756 160000
--- a/Assets/Arcadia
+++ b/Assets/Arcadia
@@ -1 +1 @@
-Subproject commit 0dca205623d9f914339a9e7830d0e6f0f3ec144e
+Subproject commit 57ab756fce46968941c40b89ba2eb9954758260c-dirty
diff --git a/Assets/Moments b/Assets/Moments
--- a/Assets/Moments
+++ b/Assets/Moments
@@ -1 +1 @@
-Subproject commit 5671ecd82862861acf05c56fed9952fe55a57099
+Subproject commit 5671ecd82862861acf05c56fed9952fe55a57099-dirty
diff --git a/Assets/game/board.clj b/Assets/game/board.clj
index 48890bf..d65f218 100644
--- a/Assets/game/board.clj
+++ b/Assets/game/board.clj
@@ -179,7 +179,8 @@
 
     (when @STANDING 
      (cond 
-      (key? "w")
+      (or (key? "w")
+          (joy-up?))
       (if grounded 
        (if (< forward-speed max-speed)
           (do (force! body 0 0 (* mass dspeed 20))
@@ -187,7 +188,8 @@
               (motor motorforce (:front wheels))))
        (torque! body (* mass dspeed 10) 0 0))
 
-      (key? "s")
+      (or (key? "s")
+          (joy-down?))
       (if grounded 
        (if (> forward-speed (- max-speed))
           (do (force! body 0 0 (* mass dspeed -20))
@@ -199,13 +201,15 @@
        (do (motor 0 (:rear wheels))
            (motor 0 (:front wheels))))
      (cond 
-       (key? "a") 
+       (or (key? "a")
+           (joy-left?))
        (if grounded
            (do (swap! steerage #(max (- max-turn) (- % (∆ 45))))
                (steer (- @steerage) (:rear wheels))
                (steer @steerage (:front wheels)))
            (torque! body 0 (* mass dspeed -24) 0))
-       (key? "d") 
+       (or (key? "d")
+           (joy-right?))
        (if grounded
            (do (swap! steerage #(min max-turn (+ % (∆ 45))))
                (steer (- @steerage) (:rear wheels))
@@ -215,15 +219,22 @@
        (do (swap! steerage #(* % 0.95))
            (steer (- @steerage) (:rear wheels))
            (steer @steerage (:front wheels))))
-     (if (key? "e") (torque! body 0 0 (* mass -6)))
-     (if (key? "q") (torque! body 0 0 (* mass  6)))
-     (if (and (key? "tab") (upsidedown? o)) 
+     (if (or (key? "e")
+             (button? "Fire2"))
+       (torque! body 0 0 (* mass -6)))
+     (if (or (key? "q")
+             (button? "Fire3"))
+       (torque! body 0 0 (* mass  6)))
+     (if (and (key? "tab")
+              (upsidedown? o))
        (torque! body 0 0 (* mass  60)))
-     (when (and (key-down? "space") grounded) 
+     (when (and (or (key-down? "space")
+                    (button? "Fire1"))
+                grounded)
        (torque! body (* mass  -20) 0 0)
        (force! body 0 (* mass 540) 0))
      (if grounded (force! body 0 (* mass dspeed -25) 0))
      (global-force! (->rigidbody (:spine @ragmap)) 0 650 0))
     ::gravity
     (global-force! body 0 (* mass -8) 0))
-   (catch Exception e (log e))))
\ No newline at end of file
+   (catch Exception e (log e))))
diff --git a/Assets/hard b/Assets/hard
--- a/Assets/hard
+++ b/Assets/hard
@@ -1 +1 @@
-Subproject commit 88606bda516665db600aa3a407f32585dd8f611f
+Subproject commit 88606bda516665db600aa3a407f32585dd8f611f-dirty