From 7519e842e9a4ac6fca16a23d9ed69a05b113d65f Mon Sep 17 00:00:00 2001 From: Justin Shipsey Date: Thu, 23 Apr 2020 17:16:45 +0000 Subject: [PATCH] 6 new music tracks --- CHANGELOG.md | 1 + assets/voxygen/audio/soundtrack.ron | 44 ++++++++++++++++++- .../audio/soundtrack/between_the_fairies.ogg | 3 ++ .../audio/soundtrack/campfire_stories.ogg | 3 ++ .../audio/soundtrack/down_the_rabbit_hole.ogg | 3 ++ .../audio/soundtrack/just_the_beginning.ogg | 3 ++ assets/voxygen/audio/soundtrack/limits.ogg | 3 ++ .../voxygen/audio/soundtrack/rest_assured.ogg | 3 ++ 8 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 assets/voxygen/audio/soundtrack/between_the_fairies.ogg create mode 100644 assets/voxygen/audio/soundtrack/campfire_stories.ogg create mode 100644 assets/voxygen/audio/soundtrack/down_the_rabbit_hole.ogg create mode 100644 assets/voxygen/audio/soundtrack/just_the_beginning.ogg create mode 100644 assets/voxygen/audio/soundtrack/limits.ogg create mode 100644 assets/voxygen/audio/soundtrack/rest_assured.ogg diff --git a/CHANGELOG.md b/CHANGELOG.md index 08b67cc0e8..9fadccdab1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -47,6 +47,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Made armor and hotbar slots actually function - Added dragging and right-click to use functionality to inventory, armor & hotbar slots - Added capes, lanterns, tabards, rings, helmets & necklaces as equippable armor +- 6 new music tracks ### Changed diff --git a/assets/voxygen/audio/soundtrack.ron b/assets/voxygen/audio/soundtrack.ron index 0ac60d9bde..a082e43cc0 100644 --- a/assets/voxygen/audio/soundtrack.ron +++ b/assets/voxygen/audio/soundtrack.ron @@ -41,6 +41,48 @@ length: 173.0, timing: Some(Night), artist: "Aeronic", - ) + ), + ( + title: "Rest Assured", + path: "voxygen.audio.soundtrack.rest_assured", + length: 185.0, + timing: Some(Day), + artist: "badbbad", + ), + ( + title: "Just The Beginning", + path: "voxygen.audio.soundtrack.just_the_beginning", + length: 188.0, + timing: Some(Day), + artist: "badbbad", + ), + ( + title: "Campfire Stories", + path: "voxygen.audio.soundtrack.campfire_stories", + length: 100.0, + timing: Some(Night), + artist: "badbbad", + ), + ( + title: "Limits", + path: "voxygen.audio.soundtrack.limits", + length: 203.0, + timing: Some(Night), + artist: "badbbad", + ), + ( + title: "Down The Rabbit Hole", + path: "voxygen.audio.soundtrack.down_the_rabbit_hole", + length: 244.0, + timing: Some(Night), + artist: "badbbad", + ), + ( + title: "Between The Fairies", + path: "voxygen.audio.soundtrack.between_the_fairies", + length: 175.0, + timing: Some(Night), + artist: "badbbad", + ), ] ) \ No newline at end of file diff --git a/assets/voxygen/audio/soundtrack/between_the_fairies.ogg b/assets/voxygen/audio/soundtrack/between_the_fairies.ogg new file mode 100644 index 0000000000..014c9e9b13 --- /dev/null +++ b/assets/voxygen/audio/soundtrack/between_the_fairies.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b1ffa266d056e23b980ca5a18970a77376f001c407d0290c95bbfe5e1461dbc3 +size 3935072 diff --git a/assets/voxygen/audio/soundtrack/campfire_stories.ogg b/assets/voxygen/audio/soundtrack/campfire_stories.ogg new file mode 100644 index 0000000000..bc90d1166c --- /dev/null +++ b/assets/voxygen/audio/soundtrack/campfire_stories.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0f98af47d74e6e38e9fd00d19554f3666bf5bee22e71b039ac28d8a3b3e79b5b +size 2201901 diff --git a/assets/voxygen/audio/soundtrack/down_the_rabbit_hole.ogg b/assets/voxygen/audio/soundtrack/down_the_rabbit_hole.ogg new file mode 100644 index 0000000000..b99bc8f4ae --- /dev/null +++ b/assets/voxygen/audio/soundtrack/down_the_rabbit_hole.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6cc60e9717a9e07a0b40788502f42036b8e01f9f4aae66ad1ab5cf78f9ad976b +size 4685453 diff --git a/assets/voxygen/audio/soundtrack/just_the_beginning.ogg b/assets/voxygen/audio/soundtrack/just_the_beginning.ogg new file mode 100644 index 0000000000..cfe059c28c --- /dev/null +++ b/assets/voxygen/audio/soundtrack/just_the_beginning.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c59c8a95fd07283a028c09010ad05d44d3a620a12f202b52c59f22a66411f9e8 +size 4772973 diff --git a/assets/voxygen/audio/soundtrack/limits.ogg b/assets/voxygen/audio/soundtrack/limits.ogg new file mode 100644 index 0000000000..3d00d86ffd --- /dev/null +++ b/assets/voxygen/audio/soundtrack/limits.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:943e4199b3a23623150c8e58c7de432ff0c3b2f4634efef807a8f1e6fddfc865 +size 3641997 diff --git a/assets/voxygen/audio/soundtrack/rest_assured.ogg b/assets/voxygen/audio/soundtrack/rest_assured.ogg new file mode 100644 index 0000000000..b256b58a50 --- /dev/null +++ b/assets/voxygen/audio/soundtrack/rest_assured.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:853a0eeb0d6195a92ee9a33115483ab2d221af9733e91c9588bc80b42c0805a3 +size 2741191