Merge branch 'init_map_music' into 'master'HEADmaster

Initial major map music push for rEvolt. Some new tracks were added.

See merge request evol/evol-music!3

40 files changed, 47 insertions, 9 deletions

diff --git a/music/LICENSE b/music/LICENSE
index 2c49ca9..7fd7682 100644
--- a/music/LICENSE
+++ b/music/LICENSE
@@ -9,16 +9,54 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/CONTRIBUTORS
 http://wiki.evolonline.org/license
 https://www.gitorious.org/evol/evol-music/blobs/master/LICENSE
 
----------------------------------------------------------------------------------------------------------------------------------
+----------------------------------------------------------------------------------------------------------------------------------------------------------
 
 # Folder
-    authors' nick - music name                               (License)        (Contributors' Nick)
+    Filename.ogg - Nick                    (Original title)                (License)              (Contributor)     [Editor/Year]    (Year)   (Atribution)
 
 # music
-    bartk - in the forest of the birches.ogg                 (CC BY 4.0)        (Socapex)
-    bartk - the adventure begins.ogg                         (CC BY 4.0)        (Socapex)
-    ezili - ocean sounds.ogg                                 (CC BY 4.0)        (Socapex)
-    eric matyas - ghoulish fun.ogg                           (CC BY 4.0)        (Riqqi)
-    eric matyas - surreal place.ogg                          (CC BY 4.0)        (Riqqi)
-    magick - real.ogg                                        (GPLv2)            (-)
-    dariunas - the forest.ogg                                (GPLv2)            (-)
+    academy.ogg - Saturn                   (Peace3)                        (GPLv2)                (Ledmitz)         [-]              (-)      (-)
+    artis.ogg - bartk                      (the adventure begins)          (CC BY 4.0)            (Socapex)         [-]              (2013)   (-)
+    bandit.ogg - Elite                     (candr2)                        (GPLv2, CC BY SA 3.0)  (-)               [Ledmitz/2019]   (2012)   (-)
+    barbarians.ogg - Chicka-Maria          (barbarians)                    (GPLv2, CC BY SA 3.0)  (-)               [Ledmitz/2020]   (2012)   (-)
+    botcheck.ogg - Ledmitz                 (botcheck)                      (CC BY SA 3.0)         (-)               [-]              (2020)   (-)
+    candor.ogg - Chicka-Maria              (in my heart2)                  (GPLv2, CC BY SA 3.0)  (Ledmitz)         [-]              (2012)   (-)
+    cavesong.ogg - finalman and yakslem    (cavesong)                      (GPLv2)                (-)               [Ledmitz/2020]   (-)      (-)
+    chilling.ogg - Yubaba                  (Chilling_Environment)          (GPLv2, CC BY SA 3.0)  (Ledmitz)         [-]              (2011)   (-)
+    cloudcall.ogg - ?                      (Clouds_Calling)                (GPLv2)                (Ledmitz)         [Ledmitz/2019]   (-)      (-)
+    crypt.ogg - Ledmitz                    (OverwhelmedUnderground)        (CC BY SA 3.0)         (-)               [-]              (2011)   (-)
+    despair.ogg - Chicka-Maria             (despair)                       (GPLv2, CC BY SA 3.0)  (-)               [Ledmitz/2020]   (2012)   (-)
+    dimond.ogg - Magick                    (dimonds-cove)                  (GPLv2, CC BY SA 3.0)  (-)               [Ledmitz/2020]   (2008)   (-)
+    explorer.ogg - Chicka-Maria            (explorers-melody)              (GPLv2, CC BY SA 3.0)  (-)               [-]              (-)      (-)
+    faith.ogg - ?                          (faith)                         (GPLv2)                (-)               [-]              (-)      (-)
+    fire.ogg - ?                           (fireplace)                     (CC0)                  (Ledmitz)         [Ledmitz/2020]   (-)      (-)
+    forest.ogg - dariunas                  (the forest)                    (GPLv2)                (-)               [-]              (2008)   (-)
+    ghoulish.ogg - Eric Matyas             (ghoulish fun)                  (CC BY 4.0)            (Riqqi)           [Ledmitz/2020]   (2015)   (-)
+    graveyard.ogg - feline monstrosity     (graveyard)                     (GPLv2)                (-)               [-]              (2009)   (-)
+    hurns.ogg - Ledmitz                    (Hurnscald)                     (CC BY SA 3.0)         (-)               [-]              (2020)   (-)
+    johanne.ogg - bartk                    (in the forest of the birches)  (CC BY 4.0)            (Socapex)         [-]              (2013)   (-)
+    marine.ogg - Chicka-Maria              (sail-away)                     (GPLv2, CC BY SA 3.0)  (-)               [-]              (2014)   (-)
+    mystique.ogg - Chicka-Maria            (mystique-forest)               (GPLv2, CC BY SA 3.0)  (-)               [-]              (2013)   (-)
+    nightcall.ogg - Chicka-Maria           (night-is-calling)              (GPLv2, CC BY SA 3.0)  (-)               [Ledmitz/2020]   (-)      (-)
+    nivalis.ogg - Magick                   (snow-village)                  (GPLv2, CC BY SA 3.0)  (-)               [-]              (2008)   (-)
+    ocean.ogg - ?                          (gentle-ocean-waves...)         (CC0)                  (Ledmitz)         [Ledmitz/2020]   (-)      (-)
+    peace.ogg - Doulos                     (Irene)                         (GPLv2)                (-)               [-]              (2004)   (-)
+    real.ogg - Magick                      (magick-real)                   (GPLv2, CC BY SA 3.0)  (-)               [-]              (2003)   (-)
+    reid.ogg - Chicka-Maria                (inquisitive-inn)               (GPLv2, CC BY SA 3.0)  (-)               [-]              (-)      (-)
+    sewer.ogg - Ledmitz                    (SewerAmbience)                 (CC BY SA 3.0)         (Ledmitz)         [-]              (2018)   (-)
+    store.ogg - Ledmitz                    (StoreAmbience)                 (CC BY SA 3.0)         (Ledmitz)         [-]              (2020)   (-)
+    surreal.ogg - Eric Matyas              (surreal place)                 (CC BY 4.0)            (Riqqi)           [-]              (2015)   (-)
+    swamp.ogg - Ledmitz                    (DrearyDay)                     (CC BY SA 3.0)         (-)               [-]              (2011)   (-)
+    thunderstorm.ogg - ?                   (thundersorm)                   (CC0)                  (Jesusalva)       [-]              (-)      (-)
+    waterlude.ogg - Kevin MacLeod          (water_prelude)                 (CC BY 3.0)            (Jesusalva)       [-]              (-)      (-)
+    xmas.ogg - Chicka-Maria                (white-christmas)               (GPLv2, CC BY SA 3.0)  (-)               [-]              (-)      (-)
+
+----------------------------------------------------------------------------------------------------------------------------------------------------------
+
+***AKA***
+Magick / Aasif Chaudry
+Chicka-Maria / Yubaba / Jose. S & Dakota. D
+dariunas / dariuna
+Ledmitz / S. Lowe
+Saturn / Nikola Whallon
+
diff --git a/music/academy.ogg b/music/academy.ogg
new file mode 100644
index 0000000..a5850ec
--- /dev/null
+++ b/music/academy.ogg
diff --git a/music/artis.ogg b/music/artis.ogg
new file mode 100644
index 0000000..704532d
--- /dev/null
+++ b/music/artis.ogg
diff --git a/music/bandit.ogg b/music/bandit.ogg
new file mode 100644
index 0000000..8c56569
--- /dev/null
+++ b/music/bandit.ogg
diff --git a/music/barbarians.ogg b/music/barbarians.ogg
new file mode 100644
index 0000000..3aaa0f3
--- /dev/null
+++ b/music/barbarians.ogg
diff --git a/music/bartk - in the forest of the birches.ogg b/music/bartk - in the forest of the birches.ogg
deleted file mode 100644
index 1e5eec4..0000000
--- a/music/bartk - in the forest of the birches.ogg
+++ /dev/null
diff --git a/music/bartk - the adventure begins.ogg b/music/bartk - the adventure begins.ogg
deleted file mode 100644
index 70bd311..0000000
--- a/music/bartk - the adventure begins.ogg
+++ /dev/null
diff --git a/music/botcheck.ogg b/music/botcheck.ogg
new file mode 100644
index 0000000..a2df6ce
--- /dev/null
+++ b/music/botcheck.ogg
diff --git a/music/candor.ogg b/music/candor.ogg
new file mode 100644
index 0000000..92377f2
--- /dev/null
+++ b/music/candor.ogg
diff --git a/music/cavesong.ogg b/music/cavesong.ogg
new file mode 100644
index 0000000..fd8bd3c
--- /dev/null
+++ b/music/cavesong.ogg
diff --git a/music/chilling.ogg b/music/chilling.ogg
new file mode 100644
index 0000000..aa23bdb
--- /dev/null
+++ b/music/chilling.ogg
diff --git a/music/cloudcall.ogg b/music/cloudcall.ogg
new file mode 100644
index 0000000..9bb9b85
--- /dev/null
+++ b/music/cloudcall.ogg
diff --git a/music/crypt.ogg b/music/crypt.ogg
new file mode 100644
index 0000000..78e80fc
--- /dev/null
+++ b/music/crypt.ogg
diff --git a/music/despair.ogg b/music/despair.ogg
new file mode 100644
index 0000000..7e06484
--- /dev/null
+++ b/music/despair.ogg
diff --git a/music/dimond.ogg b/music/dimond.ogg
new file mode 100644
index 0000000..08b43b9
--- /dev/null
+++ b/music/dimond.ogg
diff --git a/music/eric matyas - ghoulish fun.ogg b/music/eric matyas - ghoulish fun.ogg
deleted file mode 100644
index 448aa10..0000000
--- a/music/eric matyas - ghoulish fun.ogg
+++ /dev/null
diff --git a/music/explorer.ogg b/music/explorer.ogg
new file mode 100644
index 0000000..d9e6781
--- /dev/null
+++ b/music/explorer.ogg
diff --git a/music/ezili - ocean sounds.ogg b/music/ezili - ocean sounds.ogg
deleted file mode 100644
index ff37039..0000000
--- a/music/ezili - ocean sounds.ogg
+++ /dev/null
diff --git a/music/faith.ogg b/music/faith.ogg
new file mode 100644
index 0000000..4aabaf5
--- /dev/null
+++ b/music/faith.ogg
diff --git a/music/fire.ogg b/music/fire.ogg
new file mode 100644
index 0000000..f16a02b
--- /dev/null
+++ b/music/fire.ogg
diff --git a/music/dariunas - the forest.ogg b/music/forest.ogg
index b8adf02..b8adf02 100644
--- a/music/dariunas - the forest.ogg
+++ b/music/forest.ogg
diff --git a/music/ghoulish.ogg b/music/ghoulish.ogg
new file mode 100644
index 0000000..95668eb
--- /dev/null
+++ b/music/ghoulish.ogg
diff --git a/music/graveyard.ogg b/music/graveyard.ogg
new file mode 100644
index 0000000..6af0b41
--- /dev/null
+++ b/music/graveyard.ogg
diff --git a/music/hurns.ogg b/music/hurns.ogg
new file mode 100644
index 0000000..9a79c9a
--- /dev/null
+++ b/music/hurns.ogg
diff --git a/music/johanne.ogg b/music/johanne.ogg
new file mode 100644
index 0000000..681e303
--- /dev/null
+++ b/music/johanne.ogg
diff --git a/music/marine.ogg b/music/marine.ogg
new file mode 100644
index 0000000..13e82ac
--- /dev/null
+++ b/music/marine.ogg
diff --git a/music/mystique.ogg b/music/mystique.ogg
new file mode 100644
index 0000000..14b57d4
--- /dev/null
+++ b/music/mystique.ogg
diff --git a/music/nightcall.ogg b/music/nightcall.ogg
new file mode 100644
index 0000000..f3efc90
--- /dev/null
+++ b/music/nightcall.ogg
diff --git a/music/nivalis.ogg b/music/nivalis.ogg
new file mode 100644
index 0000000..b0caae7
--- /dev/null
+++ b/music/nivalis.ogg
diff --git a/music/ocean.ogg b/music/ocean.ogg
new file mode 100644
index 0000000..16e3dc5
--- /dev/null
+++ b/music/ocean.ogg
diff --git a/music/peace.ogg b/music/peace.ogg
new file mode 100644
index 0000000..0cb06c8
--- /dev/null
+++ b/music/peace.ogg
diff --git a/music/magick - real.ogg b/music/real.ogg
index 0b43709..0b43709 100644
--- a/music/magick - real.ogg
+++ b/music/real.ogg
diff --git a/music/reid.ogg b/music/reid.ogg
new file mode 100644
index 0000000..79e99bd
--- /dev/null
+++ b/music/reid.ogg
diff --git a/music/sewer.ogg b/music/sewer.ogg
new file mode 100644
index 0000000..86b1319
--- /dev/null
+++ b/music/sewer.ogg
diff --git a/music/store.ogg b/music/store.ogg
new file mode 100644
index 0000000..2405ff7
--- /dev/null
+++ b/music/store.ogg
diff --git a/music/eric matyas - surreal place.ogg b/music/surreal.ogg
index 08c4dbb..08c4dbb 100644
--- a/music/eric matyas - surreal place.ogg
+++ b/music/surreal.ogg
diff --git a/music/swamp.ogg b/music/swamp.ogg
new file mode 100644
index 0000000..270fdce
--- /dev/null
+++ b/music/swamp.ogg
diff --git a/music/thunderstorm.ogg b/music/thunderstorm.ogg
new file mode 100644
index 0000000..21c6bc2
--- /dev/null
+++ b/music/thunderstorm.ogg
diff --git a/music/waterlude.ogg b/music/waterlude.ogg
new file mode 100644
index 0000000..5f738e1
--- /dev/null
+++ b/music/waterlude.ogg
diff --git a/music/xmas.ogg b/music/xmas.ogg
new file mode 100644
index 0000000..956f328
--- /dev/null
+++ b/music/xmas.ogg