Display music metadata in the level editor

data/AUTHORS

@@ -27,18 +27,19 @@ License should be included with them.
 == Music ==
 
 All files in data/music created by wansti and licensed under GPLv2+CC-by-sa, unless stated otherwise.
-* airship_remix.ogg - from remaxim at OpenGameArt.org, permission to release under CC-BY-SA and GPL version 2 or later
+* airship_remix.ogg - by Bart Kelsey submitted by remaxim at OpenGameArt.org, permission to release under CC-BY-SA and GPL version 2 or later
 * airship_2.ogg - Jason Lavallée, dual-licensed: GPL version 2 or later and CC-BY-SA
 * arctic_cave.ogg - Jason Lavallée, dual-licensed: GPL version 2 or later and CC-BY-SA
-* battle_theme.ogg - from remaxim at OpenGameArt.org, permission to release under CC-BY-SA and GPL version 2 or later
+* battle_theme.ogg - from remaxim at OpenGameArt.org, permission to release under CC-BY-SA 3.0 and GPL version 2 or later
 * beneath_the_rabbit_hole.ogg - Jason Lavallée, dual-licensed: GPL version 2 or later and CC-BY-SA
 * bonuscave.ogg
 * bossattack.ogg
-* bright_thunders.ogg - by Krobonil, licensed under CC-BY-SA
+* bright_thunders.ogg - by Chris "Krobonil" Leutwyler, licensed under CC-BY-SA
 * cave.ogg
+* cave_old.ogg
 * call_of_the_winding_path.ogg - Jason Lavallée, dual-licensed: GPL version 2 or later and CC-BY-SA
 * chipdisko.ogg - Mortimer's Chipdisko by Lukas Nystrand as Mortimer Twang - explicit permission granted to release unter GPL and CC-by-sa.
-* clavelian_march.ogg
+* clavelian_march.ogg by Treskalle
 * credits.ogg
 * darkforestkeep.ogg
 * forest-cave.ogg - Jason Lavallée, dual-licensed: GPL version 2 or later and CC-BY-SA
@@ -49,20 +50,22 @@ All files in data/music created by wansti and licensed under GPLv2+CC-by-sa, unl
 * forest_theme.ogg - Forest Prophecy reEducated, by Wansti and Tobias "ToBeFree" Frei (GPLv2+CC-by-sa)
 * forest-sprint.ogg - Jason Lavallée, dual-licensed: GPL version 2 or later and CC-BY-SA
 * fortress.ogg
+* fortress_old.ogg
 * ghostforest_map.ogg - Jason Lavallée, dual-licensed: GPL version 2 or later and CC-BY-SA
 * ghostforest.ogg
 * ghostforest2.ogg
-* greatgigantic.ogg - Based on a work by Chris Huelsbeck - We have his permission to release this under GPL.
+* greatgigantic.ogg - by Wansti based on a work by Chris Huelsbeck - We have his permission to release this under GPL.
 * shallow-green.ogg - Jason Lavallée, dual-licensed: GPL version 2 or later and CC-BY-SA
 * halloween_1.ogg - By Forty-Two - licensed under CC-BY-SA 4.0
 * ice_music.ogg - By ZhayTee
 * intro.ogg
 * invincible.ogg
 * arctic_breeze.ogg - Jason Lavallée, dual-licensed: GPL version 2 or later and CC-BY-SA
-* jewels.ogg - By cynicmusic/congusbongus - <http://opengameart.org/content/crystal-cave-mysterious-ambience-seamless-loop> - CC-BY 3.0/CC-BY-SA 3.0/GPL 3.0
+* jewels.ogg - By Alex \"cynicmusic\" Smith edited by congusbongus - <http://opengameart.org/content/crystal-cave-mysterious-ambience-seamless-loop> - CC-BY 3.0/CC-BY-SA 3.0/GPL 3.0
 * leveldone.ogg
+* march_of_the_malevolent.ogg - Servalot, Wansti (original forest/'ghost' forest theme), licensed CC-BY-SA 4.0
 * new_forest_map.ogg - Jason Lavallée, dual-licensed: GPL version 2 or later and CC-BY-SA
-* salcon.ogg - Salsa Con Carne by Mystical - Replaced due to licensing issues (some non-free samples are used)
+* salcon.ogg - Salsa Con Carne by DJ Gentoo based on work by Asbjorn \"Mystical\" Andersen - Replaced due to licensing issues (some non-free samples are used)
     by a work-in-progress remix in trunk and the 0.3.x branch (r4585), for which we have permission to release under GPL and CC-by-sa. - wansti
 * saharan_penguin.ogg - by Enol "Meji" Monte, licensed CC BY-SA
 * theme.ogg
@@ -81,7 +84,7 @@ All files in data/music created by wansti and licensed under GPLv2+CC-by-sa, unl
 * cavetheme_alt.ogg - By SnugglyBun, cover of the original cave theme by Wansti. licensed under CC-BY-SA 4.0
 * crystalmine_intro.ogg - By SnugglyBun, licensed under CC-BY-SA 4.0
 * crystalmine_main.ogg - By SnugglyBun, licensed under CC-BY-SA 4.0
-* crystalmine_underwater.ogg - By SnugglyBun, licensed under CC-BY-SA 4.0
+* underwater.ogg - By SnugglyBun, licensed under CC-BY-SA 4.0
 * glacier.ogg - By SnugglyBun, licensed under CC-BY-SA 4.0
 * snowfort.ogg - By SnugglyBun, licensed under CC-BY-SA 4.0
 * icecastle.ogg - By SnugglyBun, based on the original fortress theme by Wansti. licensed under CC-BY-SA 4.0

data/credits.stxt

@@ -338,7 +338,7 @@
     )
     (text
       (type "normal")
-      (string "Bart K.")
+      (string "Bart Kelsey")
     )
     (text
       (type "normal")
@@ -350,7 +350,7 @@
     )
     (text
       (type "normal")
-      (string "Chris Leutwyler")
+      (string "Chris \"Krobonil\" Leutwyler")
     )
     (text
       (type "normal")
@@ -360,6 +360,30 @@
       (type "normal")
       (string "Tobias \"ToBeFree\" Frei")
     )
+    (text
+      (type "normal")
+      (string "Alex \"cynicmusic\" Smith")
+    )
+    (text
+      (type "normal")
+      (string "congusbongus")
+    )
+    (text
+      (type "normal")
+      (string "Enol \"Meji\" Monte")
+    )
+    (text
+      (type "normal")
+      (string "Flan")
+    )
+    (text
+      (type "normal")
+      (string "Alasdair \"Servalot\"")
+    )
+    (text
+      (type "normal")
+      (string "ZhayTee")
+    )
     (blank)
     (blank)
     (text
@@ -470,6 +494,10 @@
       (name "chrism")
       (info (_ "Various contributions"))
     )
+    (person
+      (name "James De Ricco")
+      (info (_ "Code contributions"))
+    )
     (person
       (name "Daniela Ferraz")
       (info (_ "Various contributions"))

data/music/antarctic/airship_remix-2.music

@@ -1,5 +1,8 @@
 (supertux-music
   (file "airship_2.ogg")
+  (title "Airship 2")
+  (authors "Jason Lavallée")
+  (license "CC-BY-SA / GPL 2+")
   (loop-begin 0)
   (loop-at    202)
 )

data/music/antarctic/airship_remix.music

@@ -1,5 +1,8 @@
 (supertux-music
   (file "airship_remix.ogg")
+  (title "Airship Song Orchestral Mix")
+  (authors "Bart Kelsey")
+  (license "CC-BY-SA 3.0 / GPL 3.0 / GPL 2.0")
   (loop-begin 4)
   (loop-at    58)
 )

data/music/antarctic/arctic_breeze.music

@@ -1,5 +1,8 @@
 (supertux-music
   (file "arctic_breeze.ogg")
+  (title "Antarctic Breeze")
+  (authors "Jason Lavallée")
+  (license "CC-BY-SA / GPL 2+")
   (loop-begin 0)
   (loop-at    197)
 )

data/music/antarctic/arctic_cave.music

@@ -1,5 +1,8 @@
 (supertux-music
   (file "arctic_cave.ogg")
+  (title "Eyes in the Deep")
+  (authors "Jason Lavallée")
+  (license "CC-BY-SA / GPL 2+")
   (loop-begin 0)
   (loop-at    267)
 )

data/music/antarctic/bossattack.music

@@ -1,5 +1,8 @@
 (supertux-music
   (file "bossattack.ogg")
+  (title "Boss Attack")
+  (authors "Marek \"Wansti\" Moeckel")
+  (license "CC-BY-SA / GPL 2+")
   (loop-begin 0.5)
   (loop-at    -1)
 )

data/music/antarctic/cave.music

@@ -1,5 +1,8 @@
 (supertux-music
   (file "cave.ogg")
+  (title "The Cave (Milestone 2 Version)")
+  (authors "Marek \"Wansti\" Moeckel")
+  (license "CC-BY-SA / GPL 2+")
   (loop-begin 0)
   (loop-at    -1)
 )

data/music/antarctic/cavetheme.music

@@ -1,5 +1,7 @@
 (supertux-music
   (file "cavetheme.ogg")
+  (authors "SnugglyBun" "Marek \"Wansti\" Moeckel")
+  (license "CC-BY-SA 4.0")
   (loop-begin 0)
   (loop-at -1)
 )

data/music/antarctic/cavetheme_alt.music

@@ -1,5 +1,7 @@
 (supertux-music
   (file "cavetheme_alt.ogg")
+  (authors "SnugglyBun" "Marek \"Wansti\" Moeckel")
+  (license "CC-BY-SA 4.0")
   (loop-begin 0)
   (loop-at -1)
 )

data/music/antarctic/chipdisko.music

@@ -1,5 +1,8 @@
 (supertux-music
   (file "chipdisko.ogg")
+  (title "Mortimer's Chipdisko")
+  (authors "Lukas Nystrand (as Mortimer Twang)")
+  (license "CC-BY-SA / GPL")
   (loop-begin 0)
   (loop-at    158)
 )

data/music/antarctic/crystalmine_intro.music

@@ -1,5 +1,7 @@
 (supertux-music
   (file "crystalmine_intro.ogg")
+  (authors "SnugglyBun")
+  (license "CC-BY-SA 4.0")
   (loop-begin 0)
   (loop-at -1)
 )

data/music/antarctic/crystalmine_main.music

@@ -1,5 +1,7 @@
 (supertux-music
   (file "crystalmine_main.ogg")
+  (authors "SnugglyBun")
+  (license "CC-BY-SA 4.0")
   (loop-begin 7.499)
   (loop-at 146.250)
 )

data/music/antarctic/glacier.music

@@ -1,5 +1,7 @@
 (supertux-music
   (file "glacier.ogg")
+  (authors "SnugglyBun")
+  (license "CC-BY-SA 4.0")
   (loop-begin 12.311)
   (loop-at 86.154)
 )

data/music/antarctic/jewels.music

@@ -1,5 +1,8 @@
 (supertux-music
   (file "jewels.ogg")
+  (authors "Alex \"cynicmusic\" Smith" "congusbongus")
+  (title "Crystal Cave + Mysterious Ambience (seamless loop)")
+  (license "CC-BY 3.0 / CC-BY-SA 3.0 / GPL 3.0")
   (loop-begin 0)
   (loop-at -1)
 )

data/music/antarctic/midday.music

@@ -1,5 +1,7 @@
 (supertux-music
   (file "midday.ogg")
+  (authors "SnugglyBun")
+  (license "CC-BY-SA 4.0")
   (loop-begin 0)
   (loop-at -1)
 )

data/music/antarctic/midday_alt.music

@@ -1,5 +1,7 @@
 (supertux-music
   (file "midday_alt.ogg")
+  (authors "SnugglyBun")
+  (license "CC-BY-SA 4.0")
   (loop-begin 0)
   (loop-at -1)
 )

data/music/antarctic/night.music

@@ -1,5 +1,7 @@
 (supertux-music
   (file "night.ogg")
+  (authors "SnugglyBun")
+  (license "CC-BY-SA 4.0")
   (loop-begin 2.912)
   (loop-at 72.727)
 )

data/music/antarctic/salcon.music

@@ -1,5 +1,8 @@
 (supertux-music
   (file "salcon.ogg")
+  (authors "DJ Gentoo" "Asbjorn \"Mystical\" Andersen")
+  (title "Salsa Con Carne (remix)")
+  (license "CC-BY-SA / GPL")
   (loop-begin 0)
   (loop-at    56)
-)
+)

data/music/antarctic/skylevel.music

@@ -1,5 +1,7 @@
 (supertux-music
   (file "skylevel.ogg")
+  (authors "SnugglyBun")
+  (license "CC-BY-SA 4.0")
   (loop-begin 11.639)
   (loop-at 81.445)
 )

data/music/antarctic/snowfort.music

@@ -1,5 +1,7 @@
 (supertux-music
   (file "snowfort.ogg")
+  (authors "SnugglyBun")
+  (license "CC-BY-SA 4.0")
   (loop-begin 7.683)
   (loop-at 88.320)
 )

data/music/antarctic/sunset.music

@@ -1,5 +1,7 @@
 (supertux-music
   (file "sunset.ogg")
+  (authors "SnugglyBun")
+  (license "CC-BY-SA 4.0")
   (loop-begin 34.912)
   (loop-at 104.727)
 )

data/music/antarctic/underwater.music

@@ -1,5 +1,7 @@
 (supertux-music
   (file "underwater.ogg")
+  (authors "SnugglyBun")
+  (license "CC-BY-SA 4.0")
   (loop-begin 19.198)
   (loop-at 115.200)
 )

data/music/antarctic/voc-boss.music

@@ -1,5 +1,7 @@
 (supertux-music
   (file "voc-boss.ogg")
+  (authors "Marek \"Wansti\" Moeckel")
+  (license "CC-BY-SA / GPL 2+")
   (loop-begin 0)
   (loop-at    -1)
 )

data/music/antarctic/voc-dark.music

@@ -1,5 +1,7 @@
 (supertux-music
   (file "voc-dark.ogg")
+  (authors "Marek \"Wansti\" Moeckel")
+  (license "CC-BY-SA / GPL 2+")
   (loop-begin 0)
   (loop-at    -1)
 )

data/music/antarctic/voc-daytime.music

@@ -1,5 +1,7 @@
 (supertux-music
   (file "voc-daytime.ogg")
+  (authors "Marek \"Wansti\" Moeckel")
+  (license "CC-BY-SA / GPL 2+")
   (loop-begin 0)
   (loop-at    -1)
 )

data/music/antarctic/voc-daytime2.music

@@ -1,5 +1,7 @@
 (supertux-music
   (file "voc-daytime2.ogg")
+  (authors "Marek \"Wansti\" Moeckel")
+  (license "CC-BY-SA / GPL 2+")
   (loop-begin 0)
   (loop-at    -1)
 )

data/music/antarctic/voc-night.music

@@ -1,5 +1,7 @@
 (supertux-music
   (file "voc-night.ogg")
+  (authors "Marek \"Wansti\" Moeckel")
+  (license "CC-BY-SA / GPL 2+")
   (loop-begin 4.648)
   (loop-at    73.231)
 )

data/music/antarctic/worldmap_ice.music

@@ -1,5 +1,7 @@
 (supertux-music
   (file "worldmap_ice.ogg")
+  (authors "SnugglyBun")
+  (license "CC-BY-SA 4.0")
   (loop-begin 0)
   (loop-at -1)
 )

data/music/antarctic/yetiboss.music

@@ -1,5 +1,7 @@
 (supertux-music
   (file "yetiboss.ogg")
+  (authors "SnugglyBun" "Marek \"Wansti\" Moeckel")
+  (license "CC-BY-SA 4.0")
   (loop-begin 1.446)
   (loop-at 82.410)
 )

data/music/castle/darkforestkeep.music

@@ -1,5 +1,8 @@
 (supertux-music
   (file "darkforestkeep.ogg")
+  (authors "Marek \"Wansti\" Moeckel")
+  (license "CC-BY-SA / GPL 2+")
+  (title "Dark Forest Keep")
   (loop-begin 0)
   (loop-at    199)
 )

data/music/castle/fortress.music

@@ -1,5 +1,8 @@
 (supertux-music
   (file "fortress.ogg")
+  (authors "Marek \"Wansti\" Moeckel")
+  (license "CC-BY-SA / GPL 2+")
+  (title "The Fortress (Milestone 2 Version)")
   (loop-begin 11.37)
   (loop-at -1)
 )

data/music/castle/icecastle.music

@@ -1,5 +1,7 @@
 (supertux-music
   (file "icecastle.ogg")
+  (authors "SnugglyBun" "Marek \"Wansti\" Moeckel")
+  (license "CC-BY-SA 4.0")
   (loop-begin 9.235)
   (loop-at 80.000)
 )

data/music/forest/beneath_the_rabbit_hole.music

@@ -1,5 +1,8 @@
 (supertux-music
   (file "beneath_the_rabbit_hole.ogg")
+  (authors "Jason Lavallée")
+  (license "CC-BY-SA / GPL 2+")
+  (title "Beneath the Rabbit Holes")
   (loop-begin 0)
   (loop-at    178)
 )

data/music/forest/bright_thunders.music

@@ -1,5 +1,7 @@
 (supertux-music
   (file "bright_thunders.ogg")
+  (authors "Chris \"Krobonil\" Leutwyler")
+  (license "CC-BY-SA")
   (loop-begin 0)
   (loop-at -1)
 )