diff options
| author | 1029chris <1029chris@gmail.com> | 2016-06-06 14:20:00 -0700 |
|---|---|---|
| committer | 1029chris <1029chris@gmail.com> | 2016-06-06 14:20:00 -0700 |
| commit | 0c3a6ca6190ad47e5fbe1dfaa45c45aa07b4ced9 (patch) | |
| tree | 479397f6f1b1e150ece5720669f68d184c4fcacf /assets.lua | |
| parent | 2804461a5a44997f240ba769e0ac9e2d86080fff (diff) | |
Finished Music player, added new songs
Music player buttons work
Music player has bouncing green bars
Music player shows actual title of song
New songs that can be played
Diffstat (limited to 'assets.lua')
| -rw-r--r-- | assets.lua | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -72,7 +72,11 @@ function loadAssets(id) 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"), - chill = love.audio.newSource("assets/music/How it Begins.ogg") + chill = love.audio.newSource("assets/music/How it Begins.ogg"), + rage = love.audio.newSource("assets/music/Fight or Flight.ogg"), + sophie = love.audio.newSource("assets/music/Close My Mouth.ogg"), + ohyeah = love.audio.newSource("assets/music/Down N Dirty.ogg"), + finale = love.audio.newSource("assets/music/Ich Grolle Nicht.ogg") } end if id == 6 then @@ -84,7 +88,6 @@ 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 = { @@ -105,6 +108,7 @@ function loadAssets(id) back = love.graphics.newImage("assets/button_back.png"), stop = love.graphics.newImage("assets/button_stop.png") } + but.but = but.pause end if id == 9 then chat = { |