aboutsummaryrefslogtreecommitdiff
path: root/assets.lua
diff options
context:
space:
mode:
author1029chris <1029chris@gmail.com>2016-06-03 11:55:40 -0700
committer1029chris <1029chris@gmail.com>2016-06-03 11:55:40 -0700
commite532283d763d663069d026757d53f385733513c7 (patch)
treed0ae9aca6e3facf614393aa6d933da1af4ea309d /assets.lua
parent93916b2dbc006735c533a285a77f4dbc178a4c71 (diff)
Added music player
Added song for music player to play Added button assets for play/pause/stop/back
Diffstat (limited to 'assets.lua')
-rw-r--r--assets.lua15
1 files changed, 12 insertions, 3 deletions
diff --git a/assets.lua b/assets.lua
index f8d7a41..c8818e6 100644
--- a/assets.lua
+++ b/assets.lua
@@ -71,7 +71,8 @@ function loadAssets(id)
sad1 = love.audio.newSource("assets/music/Startup Ambiance.ogg"),
battle3 = love.audio.newSource("assets/music/Without Silence.ogg"),
fox = love.audio.newSource("assets/music/FOX.ogg"),
- tension1 = love.audio.newSource("assets/music/Storm Chasers.ogg")
+ tension1 = love.audio.newSource("assets/music/Storm Chasers.ogg"),
+ chill = love.audio.newSource("assets/music/How it Begins.ogg")
}
end
if id == 6 then
@@ -83,6 +84,7 @@ function loadAssets(id)
music.battle2:setLooping(true)
music.battleNSA:setLooping(true)
music.battleUndertale:setLooping(true)
+ music.chill:setLooping(false)
end
if id == 7 then
window = {
@@ -94,8 +96,15 @@ function loadAssets(id)
settings = {
comp = love.graphics.newImage("assets/computer.png")
}
- picture = {}
- picture.cat = love.graphics.newImage("assets/cat.jpg")
+ picture = {
+ cat = love.graphics.newImage("assets/cat.jpg")
+ }
+ but = {
+ play = love.graphics.newImage("assets/button_play.png"),
+ pause = love.graphics.newImage("assets/button_pause.png"),
+ back = love.graphics.newImage("assets/button_back.png"),
+ stop = love.graphics.newImage("assets/button_stop.png")
+ }
end
if id == 9 then
chat = {