diff options
| author | Nicolas Bornand <nicolas74@gmail.com> | 2014-05-11 11:09:57 +0200 |
|---|---|---|
| committer | Nicolas Bornand <nicolas74@gmail.com> | 2014-05-11 11:09:57 +0200 |
| commit | 2d0c4c0f9e8b1b7ae1bbcac7357b615710e51f8c (patch) | |
| tree | 793a93fe7f87e1d5f0fa6b6e4d6545eeccdf8283 | |
| parent | 481dc29aa7225d7aa7a00b2690165245a4065252 (diff) | |
| download | playGraph-2d0c4c0f9e8b1b7ae1bbcac7357b615710e51f8c.tar.gz playGraph-2d0c4c0f9e8b1b7ae1bbcac7357b615710e51f8c.tar.bz2 playGraph-2d0c4c0f9e8b1b7ae1bbcac7357b615710e51f8c.zip | |
Merge origin/master
Conflicts:
app/js/services.js
| -rw-r--r-- | app/js/services.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/js/services.js b/app/js/services.js index 79d4c40..f40188d 100644 --- a/app/js/services.js +++ b/app/js/services.js @@ -34,7 +34,7 @@ app.service('pathService', function() { var selection = []; var tuning = .5; angular.forEach(songListCopy, function(song){ - song.rand = /*(tuning + tuning*Math.random())*/song.minDist; + song.rand = (tuning + tuning*Math.random())*song.minDist; }); songListCopy.sort(function(a,b){return a.rand-b.rand;}); //take from the sorted list util we reach the desired duration |