Clean up CREDITS file, move more credits to credits.csv
authorWuzzy <Wuzzy2@mail.ru>
Thu, 13 Dec 2018 22:50:14 +0100
changeset 14438 a88c61d8976a
parent 14437 05ca0057d71f
child 14439 632dfc73cf83
Clean up CREDITS file, move more credits to credits.csv
CREDITS
QTfrontend/res/credits.csv
QTfrontend/ui/widget/about.cpp
share/hedgewars/Data/Maps/Basketball/credits.txt
share/hedgewars/Data/Maps/BasketballField/credits.txt
share/hedgewars/Data/Maps/Bubbleflow/credits.txt
share/hedgewars/Data/Maps/FlightJoust/credits.txt
share/hedgewars/Data/Maps/Hammock/credits.txt
share/hedgewars/Data/Maps/Hedgewars/credits.txt
share/hedgewars/Data/Maps/Ropes/credits.txt
share/hedgewars/Data/Maps/Tree/credits.txt
share/hedgewars/Data/Themes/Bath/credits.txt
share/hedgewars/Data/Themes/Castle/credits.txt
share/hedgewars/Data/Themes/Halloween/credits.txt
share/hedgewars/Data/Themes/Island/credits.txt
share/hedgewars/Data/Themes/Planes/credits.txt
--- a/CREDITS	Thu Dec 13 21:35:26 2018 +0100
+++ b/CREDITS	Thu Dec 13 22:50:14 2018 +0100
@@ -1,8 +1,7 @@
 =============================
 === EXTENDED CREDITS LIST ===
 =============================
-
-For the normal credits, click on the Hedgewars logo in the main menu.
+For the main credits, click on the Hedgewars logo in the main menu.
 
 IF NOT OTHERWISE SPECIFIED, ALL OTHER CONTENT IS PROPERTY OF Andrey Korotaev <unC0Rr@gmail.com>.
 IF NO LICENSE IS SPECIFIED, THE LICENSE IS THE SAME AS MENTIONED IN README.md.
@@ -14,26 +13,6 @@
 ==========
 - see Fonts_LICENSE.txt
 
-=================
-= FRONTEND IMAGES
-=================
-(File name suffixes are omitted)
-
-- Tango Project and Wuzzy -> audio, home (CC0)
-- abustany and Wuzzy -> Videos (CC0)
-- Juliane Krug and Wuzzy -> Palette (CC0)
-- raseone and Wuzzy -> folder (CC0)
-
-==========
-= FORTS
-==========
-- Carlos Vives -> Tank (2010)
-- Dragonfly -> EvilChicken (2010)
-- Randy Broda -> SteelTower (2013)
-- Jon Dum and Wuzzy -> Snail (2017)
-- Maciej Mroziński (a.k.a. alzen) and Wuzzy -> Lonely_Island (2017)
-- Guillaume Englert and Wuzzy -> Olympic (2017)
-
 ==========
 = HATS
 ==========
@@ -53,57 +32,32 @@
 - Terrington_Snyde -> pirate_eyepatch (2013), jester (2013)
 - Wohlstand -> policegirl [based on policecap and sm_daisy] (2014)
 - TheMadCharles -> barrelhider (CC BY 3.0) (2015)
+- Trey Perry <perry.j@gmail.com> -> Other hats
 
 ==========
-= GRAVESTONES
+= GRAVES
 ==========
 - Randy Broda -> dragonball (2012)
 - CheezeMonkey -> pi (2011)
 - rosenholz -> Whisky (2013)
 
-==========
-= MAPS
-==========
-- John Dum <fizzy@gmail.com> -> Bath (2008), Hedgelove (2008), Hedgewars (2008), Hydrant (2008), mushrooms (2008), Plane (2008)
-- Joshua Frese <joshfrese@gmail.com> -> Bamboo (2008), EarthRise (2008), Freeway (2008), BambooPlinko (2008)
-- Stanko Tadić <stanko@mfhinc.net> -> Castle (2008), PirateFlag (2008)
-- dctPL -> Sticks (2010)
-- wolfmarc & Dragonfly -> TrophyRace (2010), ShoppaKing (2010)
+=================
+= FRONTEND IMAGES
+=================
+(File name suffixes are omitted)
 
-==========
-= MUSIC
-==========
-- HSR ( http://elhombresinremedio.com ) -> (new) City theme, Rock theme and many other tracks
-- John Dum <fizzy@gmail.com> -> Nature theme
-- Jonatan Nilsson <jonatanfan@gmail.com> -> Pirate theme, EarthRise (former City) theme, Oriental theme, Snow theme)
-- yd - http://opengameart.org/users/yd -> "oriented", used as Olympics SD theme
-- Kevin MacLeod - http://incompetech.com/ -> "hitman", used as basis for preliminary default SD theme
-- Valentin Kraevskiy (alias alfadur) -> Jungle theme, Fruit theme
+- Tango Project and Wuzzy -> audio, home (CC0)
+- abustany and Wuzzy -> Videos (CC0)
+- Juliane Krug and Wuzzy -> Palette (CC0)
+- raseone and Wuzzy -> folder (CC0)
+
+==================
+= OTHER GRAPHICS =
+==================
+- Custom ammo images for Continental supplies: KarBoy2314PL
 
 ==========
-= THEMES
-==========
-- John Dum <fizzy@gmail.com> -> Nature (2008), Snow (2008), City
-- Joshua Frese <joshfrese@gmail.com> -> Bamboo (2008), EarthRise (2008), Freeway (2008), BambooPlinko (2008)
-- Stanko Tadić <stanko@mfhinc.net> -> Hell (2008)
-- Julien Koesten <julienkoesten@aol.com> -> Sheep (2008)
-- KoRn666 - Jungle (2010)
-- Randy Broda -> Fruit (2013), Cake (2014)
-
-==========
-= VOICES
-==========
-- Stephen Alexander <ArmagonNo1@gmail.com>
-- mtg90pl <mtg90pl@gmail.com>: Default_pl, Russian_pl
-
-==========
-= MISSIONS
-==========
-- Arkhnen -> Teamwork 2 (2012)
-- Wuzzy -> Big Armory (2016)
-
-==========
-= SOUNDS
+= SOUND EFFECTS
 ==========
 - Mine impact sound from http://www.freesound.org/people/adcbicycle/sounds/13947/
 - Hammer sound from http://www.freesound.org/people/Syna-Max/sounds/43586/
@@ -141,11 +95,6 @@
 - Shoryuken hit: Based off sound by CGEffex (CC-BY 3.0), tweaked by alfadur
      http://freesound.org/people/CGEffex/sounds/98341/
 
-==================
-= OTHER GRAPHICS =
-==================
-- Custom ammo images for Continental supplies: KarBoy2314PL
-
 ======================
 = LICENSE REFERENCES =
 ======================
--- a/QTfrontend/res/credits.csv	Thu Dec 13 21:35:26 2018 +0100
+++ b/QTfrontend/res/credits.csv	Thu Dec 13 22:50:14 2018 +0100
@@ -69,28 +69,48 @@
 E,,"CopherNeue","ppicondo.cvac@gmail.com"
 E,,"Valentin Kraevskiy",
 E,,"Carlos Vives","mail@carlosvives.es"
-U,"Hats",,
-E,,"Trey Perry","perry.j@gmail.com",
+U,"Themes",,
+E,"Nature, Snow, City","John Dum","fizzy@gmail.com"
+E,"Bamboo, EarthRise, BambooPlinko","Joshua Frese","joshfrese@gmail.com"
+E,"Hell","Stanko Tadić","stanko@mfhinc.net"
+E,"Sheep","Julien Koesten","julienkoesten@aol.com"
+E,"Jungle","KoRn666",
+E,"Fruit, Cake","Randy Broda",
 M,,,
+U,"Maps",,
+E,"Bath, Hedgelove, Hedgewars, Hydrant, Mushrooms, Plane","John Dum","fizzy@gmail.com"
+E,"Bamboo, EarthRise, Freeway","Joshua Frese","joshfrese@gmail.com"
+E,"Castle, PirateFlag","Stanko Tadić","stanko@mfhinc.net"
+E,"Sticks","dctPL",
+E,"TrophyRace, ShoppaKing","wolfmarc & Dragonfly",
+M,,,
+U,"Forts",,
+E,"Tank","Carlos Vives",
+E,"EvilChicken","Dragonfly",
+E,"SteelTower","Randy Broda",
+E,"Snail","Jon Dum",
+E,"Snail","Wuzzy",
+E,"Lonely_Island","Maciej Mrozinski (alias alzen)",
+E,"Olympic","Guillaume Englert",
+E,"Olympic","Wuzzy",
+M,,,
+U,"Hats, graves, other",,
+E,"See CREDITS text file",,
 S,"Sounds",,
 E,"Hedgehogs voice","Stephen Alexander","ArmagonNo1@gmail.com"
+E,"Default_pl, Russian_pl voices","mtg90pl","mtg90pl@gmail.com"
 E,,"John Dum","fizzy@gmail.com"
 E,,"Jonatan Nilsson","jonatanfan@gmail.com"
-E,,"Daniel Martin","elhombresinremedio@gmail.com"
-M,,,
+E,,"Daniel Martin (alias HSR)","elhombresinremedio@gmail.com"
+E,"Various authors from www.freesound.org (see CREDITS text file)",
 S,"Music",,
-E,"City","HSR <http://elhombresinremedio.com>",
+E,"City, Rock, others","Daniel Martin (alias HSR)","elhombresinremedio@gmail.com"
 E,"Compost","HG"
-E,"EarthRise","Jonatan Nilsson",
-E,"Fruit","Valentin Kraevskiy",
-E,"Jungle","Valentin Kraevskiy",
+E,"EarthRise, oriental, Pirate, snow","Jonatan Nilsson",
+E,"Fruit, Jungle","Valentin Kraevskiy",
 E,"Nature","John Dum",
-E,"Pirate","Jonatan Nilsson",
-E,"Rock","HSR <http://elhombresinremedio.com>",
-E,"olympics_sd","yd <http://opengameart.org/users/yd>",
-E,"oriental","Jonatan Nilsson",
+E,"olympics_sd","yd &lt;http://opengameart.org/users/yd&gt;",
 E,"sdmusic (Hitman [sheepluva edit])","Kevin MacLeod",
-E,"snow","Jonatan Nilsson",
 M,,,
 S,"Translations",,
 E,"Brazilian Portuguese","Romulo Fernandes Machado","abra185@gmail.com"
--- a/QTfrontend/ui/widget/about.cpp	Thu Dec 13 21:35:26 2018 +0100
+++ b/QTfrontend/ui/widget/about.cpp	Thu Dec 13 22:50:14 2018 +0100
@@ -172,11 +172,16 @@
             {
                 // credits list entry
                 QString mailLink = QString("<a href=\"mailto:%1\">%1</a>").arg(mail);
-                if(task.isEmpty() && mail.isEmpty())
+                if(task.isEmpty() && mail.isEmpty() && !name.isEmpty())
                 {
                     // Name only
                     out = out + "<li>" + name + "</li>\n";
                 }
+                else if(name.isEmpty() && mail.isEmpty() && !task.isEmpty())
+                {
+                    // Task only
+                    out = out + "<li>" + HWApplication::translate("credits", task.toLatin1().constData()) + "</li>\n";
+                }
                 else if(task.isEmpty())
                 {
                     // Name and e-mail
--- a/share/hedgewars/Data/Maps/Basketball/credits.txt	Thu Dec 13 21:35:26 2018 +0100
+++ b/share/hedgewars/Data/Maps/Basketball/credits.txt	Thu Dec 13 22:50:14 2018 +0100
@@ -1,1 +1,1 @@
-Finn Brice
+John Dum
--- a/share/hedgewars/Data/Maps/BasketballField/credits.txt	Thu Dec 13 21:35:26 2018 +0100
+++ b/share/hedgewars/Data/Maps/BasketballField/credits.txt	Thu Dec 13 22:50:14 2018 +0100
@@ -1,1 +1,1 @@
-Finn Brice
+John Dum
--- a/share/hedgewars/Data/Maps/Bubbleflow/credits.txt	Thu Dec 13 21:35:26 2018 +0100
+++ b/share/hedgewars/Data/Maps/Bubbleflow/credits.txt	Thu Dec 13 22:50:14 2018 +0100
@@ -1,1 +1,1 @@
-Finn Brice
+John Dum
--- a/share/hedgewars/Data/Maps/FlightJoust/credits.txt	Thu Dec 13 21:35:26 2018 +0100
+++ b/share/hedgewars/Data/Maps/FlightJoust/credits.txt	Thu Dec 13 22:50:14 2018 +0100
@@ -1,1 +1,1 @@
-Finn Brice
+John Dum
--- a/share/hedgewars/Data/Maps/Hammock/credits.txt	Thu Dec 13 21:35:26 2018 +0100
+++ b/share/hedgewars/Data/Maps/Hammock/credits.txt	Thu Dec 13 22:50:14 2018 +0100
@@ -1,1 +1,1 @@
-Finn Brice
+John Dum
--- a/share/hedgewars/Data/Maps/Hedgewars/credits.txt	Thu Dec 13 21:35:26 2018 +0100
+++ b/share/hedgewars/Data/Maps/Hedgewars/credits.txt	Thu Dec 13 22:50:14 2018 +0100
@@ -1,1 +1,1 @@
-Finn Brice
+John Dum
--- a/share/hedgewars/Data/Maps/Ropes/credits.txt	Thu Dec 13 21:35:26 2018 +0100
+++ b/share/hedgewars/Data/Maps/Ropes/credits.txt	Thu Dec 13 22:50:14 2018 +0100
@@ -1,1 +1,1 @@
-Finn Brice
+John Dum
--- a/share/hedgewars/Data/Maps/Tree/credits.txt	Thu Dec 13 21:35:26 2018 +0100
+++ b/share/hedgewars/Data/Maps/Tree/credits.txt	Thu Dec 13 22:50:14 2018 +0100
@@ -1,1 +1,1 @@
-Finn Brice
+John Dum
--- a/share/hedgewars/Data/Themes/Bath/credits.txt	Thu Dec 13 21:35:26 2018 +0100
+++ b/share/hedgewars/Data/Themes/Bath/credits.txt	Thu Dec 13 22:50:14 2018 +0100
@@ -1,1 +1,1 @@
-Finn Brice
+John Dum
--- a/share/hedgewars/Data/Themes/Castle/credits.txt	Thu Dec 13 21:35:26 2018 +0100
+++ b/share/hedgewars/Data/Themes/Castle/credits.txt	Thu Dec 13 22:50:14 2018 +0100
@@ -1,1 +1,1 @@
-Finn Brice
+John Dum
--- a/share/hedgewars/Data/Themes/Halloween/credits.txt	Thu Dec 13 21:35:26 2018 +0100
+++ b/share/hedgewars/Data/Themes/Halloween/credits.txt	Thu Dec 13 22:50:14 2018 +0100
@@ -1,1 +1,1 @@
-Finn Brice
+John Dum
--- a/share/hedgewars/Data/Themes/Island/credits.txt	Thu Dec 13 21:35:26 2018 +0100
+++ b/share/hedgewars/Data/Themes/Island/credits.txt	Thu Dec 13 22:50:14 2018 +0100
@@ -1,1 +1,1 @@
-Finn Brice
+John Dum
--- a/share/hedgewars/Data/Themes/Planes/credits.txt	Thu Dec 13 21:35:26 2018 +0100
+++ b/share/hedgewars/Data/Themes/Planes/credits.txt	Thu Dec 13 22:50:14 2018 +0100
@@ -1,1 +1,1 @@
-Finn Brice
+John Dum