final tweaks.

This commit is contained in:
2015-05-28 20:14:33 -07:00
parent 36b6abdd12
commit 0045dbcde7
10 changed files with 7 additions and 4 deletions

View File

@@ -700,6 +700,7 @@ void main()
(when shader
(.setUniformf shader "multiply_amount" (float (or multiply-amount 1.0)))
(.setUniformf shader "hue_amount" (float (or hue-amount 1.0))))
(.setColor batch (color (:r e 1.0) (:g e 1.0) (:b e 1.0) (:opacity e 1.0)))
@@ -781,7 +782,9 @@ void main()
:inside-fangald (utils/make-music "inside-fangald.ogg")
:fight (utils/make-music "megaboss.mp3")
:pull-sword (utils/make-music "pull-sword.ogg")
:night (utils/make-music "night.ogg")}
:night (utils/make-music "night.ogg")
:dream (utils/make-music "dream/music.ogg")
:secret-hideout (utils/make-music "secret-hideout.ogg")}
:state (get-state)
:time-profiles {:object nil
:default utils/default-night-merge