diff --git a/Credits.txt b/Credits.txt index db841f8fe..713e50cf9 100644 --- a/Credits.txt +++ b/Credits.txt @@ -18,13 +18,14 @@ Charles Spurrill (Ringwaul) Richard Gerum (Randrian) Timo Stabbert (Mimmo) Matthias Rottländer (Matthi) -Felix Riese (Fungiform) -Florian Graier (Nachtfalter) - + +Martin Strohmeier (K-Pone) + + Tobias Zwick (Newton) -Benjamin Herr (Loriel), Benedict Etzel (B_E), Oliver Schneider (ker), Philipp Kern (pkern), Carl-Philip Hänsch (Carli), Manuel Rieke (MrBeast), Alexander Semeniuk (AlteredARMOR), Merten Ehmig (Pluto) Daniel Theuke (ST-DDT), Asmageddon, Faby, Russel, Peewee, Tim Blume (End), Andriel, Gurkenglas, Pyrit, Luchs, grgecko, Dominik Bayerl (Kannibal), Lauri Niskanen (Ape), Clonkine, Checkmaty, Sven-Hendrik Haase, Johannes Nixdorf (mixi), Stan, Koronis, mizipzor, Mark Haßelbusch (Marky), Sebastian Rühl and TomyLobo. +Benjamin Herr (Loriel), Benedict Etzel (B_E), Oliver Schneider (ker), Philipp Kern (pkern), Felix Riese (Fungiform), Florian Graier (Nachtfalter), Carl-Philip Hänsch (Carli), Manuel Rieke (MrBeast), Alexander Semeniuk (AlteredARMOR), Merten Ehmig (Pluto) Daniel Theuke (ST-DDT), Asmageddon, Faby, Russel, Peewee, Tim Blume (End), Andriel, Gurkenglas, Pyrit, Luchs, grgecko, Dominik Bayerl (Kannibal), Lauri Niskanen (Ape), Clonkine, Checkmaty, Sven-Hendrik Haase, Johannes Nixdorf (mixi), Stan, Koronis, mizipzor, Mark Haßelbusch (Marky), Sebastian Rühl and TomyLobo. Also, big thanks to RedWolf Design GmbH and all those who contributed to previous Clonk titles for the passion they put into the game and for agreeing to make Clonk open source. \ No newline at end of file diff --git a/planet/AUTHORS b/planet/AUTHORS index baf37ed4b..7adccfcd8 100644 --- a/planet/AUTHORS +++ b/planet/AUTHORS @@ -19,21 +19,13 @@ Graphics and Models =================== The newest list of authors for our graphics and models used, can be found in our resources repository here: -http://hg.openclonk.org/openclonk-resources/raw-file/tip/authors.txt +https://git.openclonk.org/openclonk-resources.git/blob_plain/HEAD:/authors.txt If a particular graphic is taken from another source, there should be a authors.txt in the same directory -Music + +Music, Sounds and Material Textures ===== -- - - -Sounds -====== -See authors.txt in Sound.ocg - - -Material textures -================= -See authors.txt in Material.ocg +See authors.txt in Music.ocg, Sound.ocg and Material.ocg. For sound and other +content files in game content, there exist separate authors.txt \ No newline at end of file diff --git a/planet/Graphics.ocg/StartupAboutBG.png b/planet/Graphics.ocg/StartupAboutBG.png index 59462af9f..bf2c875f0 100644 Binary files a/planet/Graphics.ocg/StartupAboutBG.png and b/planet/Graphics.ocg/StartupAboutBG.png differ diff --git a/planet/Music.ocg/authors.txt b/planet/Music.ocg/authors.txt new file mode 100644 index 000000000..6140bac6e --- /dev/null +++ b/planet/Music.ocg/authors.txt @@ -0,0 +1,7 @@ +If not stated otherwise, the sound effects are licensed under the +CC Attribution 3.0 license (http://creativecommons.org/licenses/by/3.0/) + +Author Work(s) +=============================================================================== + +K-Pone IslandDreams, Motorway, TheSkylands \ No newline at end of file