Merged development into master

This commit is contained in:
NelsonLaQuet 2013-09-01 21:34:19 -05:00
commit df51be1d72

View file

@ -44,8 +44,9 @@ loaderDef.done ->
else else
currentSound.play() currentSound.play()
else else
currentSound = soundManager.createSound currentSound = soundManager.createSound
url: '/t' + trackId + '/stream', url: ['/t' + trackId + '/stream.mp3', '/t' + trackId + '/stream.ogg', '/t' + trackId + '/stream.m4a'],
volume: 50 volume: 50
whileloading: -> whileloading: ->