Skip to content

Commit

Permalink
Display author, title, license in the level editor music browser (Sup…
Browse files Browse the repository at this point in the history
…erTux#2617)

Whenever any of author, title and license fields are defined for music
files, help text showing this music metadata is displayed when hovering
over ".music" files in the level editor music object file browser.

This commit adds both the software implementation and author, title,
and license values added to SuperTux music files in data/music.
The game credits and data/AUTHORS are updated in some cases where there
is new authorship data.

Fixes SuperTux#2617.
  • Loading branch information
James De Ricco committed Nov 26, 2023
1 parent 835386b commit 4dca5ba
Show file tree
Hide file tree
Showing 62 changed files with 279 additions and 38 deletions.
17 changes: 10 additions & 7 deletions data/AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
28 changes: 26 additions & 2 deletions data/credits.stxt
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@
)
(text
(type "normal")
(string "Bart K.")
(string "Bart Kelsey")
)
(text
(type "normal")
Expand All @@ -355,7 +355,7 @@
)
(text
(type "normal")
(string "Chris Leutwyler")
(string "Chris \"Krobonil\" Leutwyler")
)
(text
(type "normal")
Expand All @@ -365,6 +365,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
Expand Down
3 changes: 3 additions & 0 deletions data/music/antarctic/airship_remix-2.music
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
(supertux-music
(file "airship_2.ogg")
(title "Airship 2")
(author "Jason Lavallée")
(license "CC-BY-SA / GPL 2+")
(loop-begin 0)
(loop-at 202)
)
3 changes: 3 additions & 0 deletions data/music/antarctic/airship_remix.music
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
(supertux-music
(file "airship_remix.ogg")
(title "Airship Song Orchestral Mix")
(author "Bart Kelsey")
(license "CC-BY-SA 3.0 / GPL 3.0 / GPL 2.0")
(loop-begin 4)
(loop-at 58)
)
3 changes: 3 additions & 0 deletions data/music/antarctic/arctic_breeze.music
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
(supertux-music
(file "arctic_breeze.ogg")
(title "Antarctic Breeze")
(author "Jason Lavallée")
(license "CC-BY-SA / GPL 2+")
(loop-begin 0)
(loop-at 197)
)
3 changes: 3 additions & 0 deletions data/music/antarctic/arctic_cave.music
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
(supertux-music
(file "arctic_cave.ogg")
(title "Eyes in the Deep")
(author "Jason Lavallée")
(license "CC-BY-SA / GPL 2+")
(loop-begin 0)
(loop-at 267)
)
3 changes: 3 additions & 0 deletions data/music/antarctic/bossattack.music
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
(supertux-music
(file "bossattack.ogg")
(title "Boss Attack")
(author "Marek \"Wansti\" Moeckel")
(license "CC-BY-SA / GPL 2+")
(loop-begin 0.5)
(loop-at -1)
)
3 changes: 3 additions & 0 deletions data/music/antarctic/cave.music
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
(supertux-music
(file "cave.ogg")
(title "The Cave (Milestone 2 Version)")
(author "Marek \"Wansti\" Moeckel")
(license "CC-BY-SA / GPL 2+")
(loop-begin 0)
(loop-at -1)
)
3 changes: 3 additions & 0 deletions data/music/antarctic/chipdisko.music
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
(supertux-music
(file "chipdisko.ogg")
(title "Mortimer's Chipdisko")
(author "Lukas Nystrand (as Mortimer Twang)")
(license "CC-BY-SA / GPL")
(loop-begin 0)
(loop-at 158)
)
3 changes: 3 additions & 0 deletions data/music/antarctic/jewels.music
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
(supertux-music
(file "jewels.ogg")
(author "Alex \"cynicmusic\" Smith edited by 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)
)
3 changes: 3 additions & 0 deletions data/music/antarctic/salcon.music
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
(supertux-music
(file "salcon.ogg")
(author "DJ Gentoo based on work by Asbjorn \"Mystical\" Andersen")
(title "Salsa Con Carne (remix)")
(license "CC-BY-SA / GPL")
(loop-begin 0)
(loop-at 56)
)
2 changes: 2 additions & 0 deletions data/music/antarctic/voc-boss.music
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
(supertux-music
(file "voc-boss.ogg")
(author "Marek \"Wansti\" Moeckel")
(license "CC-BY-SA / GPL 2+")
(loop-begin 0)
(loop-at -1)
)
2 changes: 2 additions & 0 deletions data/music/antarctic/voc-dark.music
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
(supertux-music
(file "voc-dark.ogg")
(author "Marek \"Wansti\" Moeckel")
(license "CC-BY-SA / GPL 2+")
(loop-begin 0)
(loop-at -1)
)
2 changes: 2 additions & 0 deletions data/music/antarctic/voc-daytime.music
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
(supertux-music
(file "voc-daytime.ogg")
(author "Marek \"Wansti\" Moeckel")
(license "CC-BY-SA / GPL 2+")
(loop-begin 0)
(loop-at -1)
)
2 changes: 2 additions & 0 deletions data/music/antarctic/voc-daytime2.music
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
(supertux-music
(file "voc-daytime2.ogg")
(author "Marek \"Wansti\" Moeckel")
(license "CC-BY-SA / GPL 2+")
(loop-begin 0)
(loop-at -1)
)
2 changes: 2 additions & 0 deletions data/music/antarctic/voc-night.music
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
(supertux-music
(file "voc-night.ogg")
(author "Marek \"Wansti\" Moeckel")
(license "CC-BY-SA / GPL 2+")
(loop-begin 4.648)
(loop-at 73.231)
)
3 changes: 3 additions & 0 deletions data/music/castle/darkforestkeep.music
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
(supertux-music
(file "darkforestkeep.ogg")
(author "Marek \"Wansti\" Moeckel")
(license "CC-BY-SA / GPL 2+")
(title "Dark Forest Keep")
(loop-begin 0)
(loop-at 199)
)
3 changes: 3 additions & 0 deletions data/music/castle/fortress.music
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
(supertux-music
(file "fortress.ogg")
(author "Marek \"Wansti\" Moeckel")
(license "CC-BY-SA / GPL 2+")
(title "The Fortress (Milestone 2 Version)")
(loop-begin 11.37)
(loop-at -1)
)
3 changes: 3 additions & 0 deletions data/music/forest/beneath_the_rabbit_hole.music
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
(supertux-music
(file "beneath_the_rabbit_hole.ogg")
(author "Jason Lavallée")
(license "CC-BY-SA / GPL 2+")
(title "Beneath the Rabbit Holes")
(loop-begin 0)
(loop-at 178)
)
2 changes: 2 additions & 0 deletions data/music/forest/bright_thunders.music
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
(supertux-music
(file "bright_thunders.ogg")
(author "Chris \"Krobonil\" Leutwyler")
(license "CC-BY-SA")
(loop-begin 0)
(loop-at -1)
)
2 changes: 2 additions & 0 deletions data/music/forest/call_of_the_winding_path.music
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
(supertux-music
(file "call_of_the_winding_path.ogg")
(author "Jason Lavallée")
(license "CC-BY-SA / GPL 2+")
(loop-begin 0)
(loop-at 394)
)
2 changes: 2 additions & 0 deletions data/music/forest/clavelian_march.music
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
(supertux-music
(file "clavelian_march.ogg")
(author "Treskalle")
(title "Clavelian March")
(loop-begin 0.5)
(loop-at -1)
)
2 changes: 2 additions & 0 deletions data/music/forest/forest-cave.music
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
(supertux-music
(file "forest-cave.ogg")
(author "Jason Lavallée")
(license "CC-BY-SA / GPL 2+")
(loop-begin 0)
(loop-at 149)
)
2 changes: 2 additions & 0 deletions data/music/forest/forest-sprint.music
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
(supertux-music
(file "forest-sprint.ogg")
(author "Jason Lavallée")
(license "CC-BY-SA / GPL 2+")
(loop-begin 0)
(loop-at 207)
)
3 changes: 3 additions & 0 deletions data/music/forest/forest.music
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
(supertux-music
(file "forest.ogg")
(author "Marek \"Wansti\" Moeckel")
(license "CC-BY-SA / GPL 2+")
(title "Forest Dance")
(loop-begin 54.818)
(loop-at 95.955)
)
3 changes: 3 additions & 0 deletions data/music/forest/forest2.music
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
(supertux-music
(file "forest2.ogg")
(author "Marek \"Wansti\" Moeckel")
(license "CC-BY-SA / GPL 2+")
(title "Rabbit Holes")
(loop-begin 0)
(loop-at 143)
)
3 changes: 3 additions & 0 deletions data/music/forest/forest3.music
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
(supertux-music
(file "forest3.ogg")
(author "Marek \"Wansti\" Moeckel")
(license "CC-BY-SA / GPL 2+")
(title "Riding The Wind")
(loop-begin 0)
(loop-at 99)
)
3 changes: 3 additions & 0 deletions data/music/forest/forest_theme.music
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
(supertux-music
(file "forest_theme.ogg")
(author "Marek \"Wansti\" Moeckel and Tobias \"ToBeFree\" Frei")
(license "CC-BY-SA / GPL 2+")
(title "Forest Prophecy reEducated")
(loop-begin 0)
(loop-at -1)
)
3 changes: 3 additions & 0 deletions data/music/forest/ghostforest.music
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
(supertux-music
(file "ghostforest.ogg")
(author "Marek \"Wansti\" Moeckel")
(license "CC-BY-SA / GPL 2+")
(title "Ghost Forest")
(loop-begin 0)
(loop-at -1)
)
3 changes: 3 additions & 0 deletions data/music/forest/ghostforest2.music
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
(supertux-music
(file "ghostforest2.ogg")
(author "Marek \"Wansti\" Moeckel")
(license "CC-BY-SA / GPL 2+")
(title "Ghost Forest 2")
(loop-begin 0)
(loop-at 91)
)
2 changes: 2 additions & 0 deletions data/music/forest/ghostforest_map.music
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
(supertux-music
(file "ghostforest_map.ogg")
(author "Jason Lavallée")
(license "CC-BY-SA / GPL 2+")
(loop-begin 0)
(loop-at 236)
)
3 changes: 3 additions & 0 deletions data/music/forest/greatgigantic.music
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
(supertux-music
(file "greatgigantic.ogg")
(author "Marek \"Wansti\" Moeckel based on \"Giana Sisters Title Theme\" by Chris Huelsbeck")
(license "GPL")
(title "The Great Gigantic Secret (with kind permission from Chris Huelsbeck)")
(loop-begin 0)
(loop-at -1)
)
3 changes: 3 additions & 0 deletions data/music/forest/march_of_the_malevolent.music
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
(supertux-music
(file "march_of_the_malevolent.ogg")
(author "Servalot, Marek \"Wansti\" Moeckel (original forest/'ghost' forest theme)")
(license "CC-BY-SA 4.0")
(title "March of the Malevolent")
(loop-begin 0)
(loop-at 109.09)
)
2 changes: 2 additions & 0 deletions data/music/forest/new_forest_map.music
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
(supertux-music
(file "new_forest_map.ogg")
(author "Jason Lavallée")
(license "CC-BY-SA / GPL 2+")
(loop-begin 0)
(loop-at 105)
)
3 changes: 3 additions & 0 deletions data/music/forest/shallow-green.music
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
(supertux-music
(file "shallow-green.ogg")
(author "Jason Lavallée")
(license "CC-BY-SA / GPL 2+")
(title "Forest Stroll")
(loop-begin 0)
(loop-at 255)
)
2 changes: 2 additions & 0 deletions data/music/forest/treeboss.music
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
(supertux-music
(file "treeboss.ogg")
(author "Marek \"Wansti\" Moeckel")
(license "CC-BY-SA / GPL 2+")
(loop-begin 32.15)
(loop-at -1)
)
Loading

0 comments on commit 4dca5ba

Please sign in to comment.