notid/gitea-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed a couple glitches.

Browse Source
This commit is contained in:
Bryce Covert
2016-05-02 09:13:07 -07:00
parent 219c0094e5
commit 54c2871407
7 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
desktop/asset-work/wizard/talk-angry.pxa/0.pxi
View File

Binary file not shown.

BIN
desktop/asset-work/wizard/talk-angry.pxa/1.pxi
View File

Binary file not shown.

BIN
desktop/asset-work/wizard/talk-angry.pxa/2.pxi
View File

Binary file not shown.

BIN
desktop/asset-work/wizard/talk-angry.pxa/3.pxi
View File

Binary file not shown.

2
desktop/last-release
View File

@@ -1 +1 @@
58 59

1
desktop/src-common/advent/screens/rooms/outside_house.clj
View File

@@ -190,6 +190,7 @@
:wizard "Do you promise?") :wizard "Do you promise?")
(actions/play-animation entities :ego :frog-nod :stop? false) (actions/play-animation entities :ego :frog-nod :stop? false)
(actions/talk entities :wizard "Frustatium DISPOSIUM!!!" :anim :talk-angry :stop? false) (actions/talk entities :wizard "Frustatium DISPOSIUM!!!" :anim :talk-angry :stop? false)
(actions/play-sound entities "ending-castle/georgia-appear.ogg" 0.5 false)
(particle-effect! (get-in @entities [:room :entities :magic-frog-particle]) :reset) (particle-effect! (get-in @entities [:room :entities :magic-frog-particle]) :reset)
(particle-effect! (get-in @entities [:room :entities :magic-frog-particle]) :start) (particle-effect! (get-in @entities [:room :entities :magic-frog-particle]) :start)
(Thread/sleep 1500) (Thread/sleep 1500)

6
desktop/src-common/advent/screens/splash.clj
View File

@@ -25,15 +25,15 @@
(defn fade-in [screen e thing then] (defn fade-in [screen e thing then]
(assoc-in e [:tweens :fade-in] (assoc-in e [:tweens :fade-in]
(tween/tween :fade-in screen [thing :opacity] 0.0 1.0 1.0 (tween/tween :fade-in screen [thing :opacity] 0.0 1.0 0.5
:finish then :finish then
:ease tween/ease-in-quadratic))) :ease tween/ease-in-quadratic)))
(defn fade-out [screen e thing then] (defn fade-out [screen e thing then]
(assoc-in e [:tweens :fade-out] (assoc-in e [:tweens :fade-out]
(tween/tween :fade-out screen [thing :opacity] 1.0 0.0 1.0 (tween/tween :fade-out screen [thing :opacity] 1.0 0.0 0.5
:finish then :finish then
:ease tween/ease-in-quadratic))) :ease tween/ease-out-quadratic)))
(defn get-texture [path] (defn get-texture [path]
(let [atlas-name (str/replace path #".png" "") (let [atlas-name (str/replace path #".png" "")