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

final tweaks.

Browse Source
This commit is contained in:
Remington Covert
2015-05-28 20:14:33 -07:00
parent 36b6abdd12
commit 0045dbcde7
10 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
desktop/resources/dream-2.mp3 Normal file
View File

Binary file not shown.

BIN
desktop/resources/dream/music.ogg Normal file
View File

Binary file not shown.

BIN
desktop/resources/dream/music.wav Normal file
View File

Binary file not shown.

BIN
desktop/resources/secret-hideout.mp3 Normal file
View File

Binary file not shown.

BIN
desktop/resources/secret-hideout.ogg Normal file
View File

Binary file not shown.

BIN
desktop/resources/secret-hideout.wav Normal file
View File

Binary file not shown.

2
desktop/settings.edn
View File

@@ -1 +1 @@
{:sound-volume 41.0, :music-volume 100.0} {:sound-volume 86.0, :music-volume 59.0}

2
desktop/src-common/advent/screens/rooms/dream.clj
View File

@@ -305,7 +305,7 @@
(defn make [screen] (defn make [screen]
(let [fairy-godfather-anim (utils/make-anim "dream/fairy-godfather.png" [63 77] 0.15 [0 1 2 3 2 1 0 1 4 3 2 1]) (let [fairy-godfather-anim (utils/make-anim "dream/fairy-godfather.png" [63 77] 0.15 [0 1 2 3 2 1 0 1 4 3 2 1])
fairy-godfather-talk-anim (utils/make-anim "dream/fairy-godfather.png" [63 77] 0.15 [5 6 7 8 7 6])] fairy-godfather-talk-anim (utils/make-anim "dream/fairy-godfather.png" [63 77] 0.15 [5 6 7 8 7 6])]
(rooms/make :music :town-1 (rooms/make :music :dream
:interactions {:pit {:box [54 0 219 36] :interactions {:pit {:box [54 0 219 36]
:script (actions/get-script entities :script (actions/get-script entities
(actions/walk-to entities :ego [154 41]) (actions/walk-to entities :ego [154 41])

2
desktop/src-common/advent/screens/rooms/inside_stash.clj
View File

@@ -48,7 +48,7 @@
(defn make [screen] (defn make [screen]
(rooms/make :music {:day :town-2 :night :night} (rooms/make :music {:day :secret-hideout :night :secret-hideout}
:interactions :interactions
{:left-dir {:box [91 60 125 140] {:left-dir {:box [91 60 125 140]
:script (actions/get-script :script (actions/get-script

5
desktop/src-common/advent/screens/scene.clj
View File

@@ -700,6 +700,7 @@ void main()
(when shader (when shader
(.setUniformf shader "multiply_amount" (float (or multiply-amount 1.0))) (.setUniformf shader "multiply_amount" (float (or multiply-amount 1.0)))
(.setUniformf shader "hue_amount" (float (or hue-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))) (.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") :inside-fangald (utils/make-music "inside-fangald.ogg")
:fight (utils/make-music "megaboss.mp3") :fight (utils/make-music "megaboss.mp3")
:pull-sword (utils/make-music "pull-sword.ogg") :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) :state (get-state)
:time-profiles {:object nil :time-profiles {:object nil
:default utils/default-night-merge :default utils/default-night-merge