Merge branch 'background_scripts'

This commit is contained in:
Bryce Covert
2015-11-22 15:37:45 -08:00
10 changed files with 150 additions and 87 deletions

View File

@@ -97,7 +97,7 @@
(update-in entities [:tweens] dissoc :coin-y)))
(actions/walk-straight-to entities :coin-flip [212 90] :update-baseline? false :speed 3.0)
(screen! dialogue/talking-screen :stop-talk :target-id :ego)
(screen! dialogue/talking-screen :stop-talk)
(actions/do-stop entities :ego)
(actions/walk-straight-to entities :coin-flip [210 105] :update-baseline? false :speed 1.0)