Browse Source

reorder list + show name if avail. (same as H3)

Laserlicht 4 months ago
parent
commit
e58e287be5
2 changed files with 41 additions and 39 deletions
  1. 40 38
      AUTHORS.h
  2. 1 1
      client/mainmenu/CreditsScreen.cpp

+ 40 - 38
AUTHORS.h

@@ -11,44 +11,46 @@
 
 //VCMI PROJECT CODE CONTRIBUTORS:
 const std::vector<std::vector<std::string>> contributors = {
-//   Task          Name                    Aka                      E-Mail
-   { "Idea",       "Michał Urbańczyk",     "Tow",                   "[email protected]"             },
-   { "Idea",       "Mateusz B.",           "Tow dragon",            "[email protected]"            },
+	//Task          Name                   Aka                    E-Mail
+	{ "Idea"      , "Mateusz B."         , "Tow dragon"         , "[email protected]"            },
+	{ "Idea"      , "Michał Urbańczyk"   , "Tow"                , "[email protected]"             },
 
-   { "Developing", "Andrea Palmate",       "afxgroup",              "[email protected]"         },
-   { "Developing", "Alexander Shishkin",   "alexvins",              ""                             },
-   { "Developing", "Rafal R.",             "ambtrip",               "[email protected]"                },
-   { "Developing", "Andrii Danylchenko",   "",                      ""                             },
-   { "Developing", "Benjamin Gentner",     "beegee",                ""                             },
-   { "Developing", "Piotr Wójcik",         "Chocimier",             "[email protected]"            },
-   { "Developing", "Dmitry Orlov",         "",                      "[email protected]" },
-   { "Developing", "",                     "Dydzio",                "[email protected]"           },
-   { "Developing", "Andrzej Żak",          "godric3",               ""                             },
-   { "Developing", "Henning Koehler",      "henningkoehlernz",      "[email protected]" },
-   { "Developing", "Ivan Savenko",         "",                      "[email protected]"         },
-   { "Developing", "",                     "kambala-decapitator",   "[email protected]"          },
-   { "Developing", "Fenghuang Rumeng",     "kdmcser",               "[email protected]"            },
-   { "Developing", "",                     "krs0",                  ""                             },
-   { "Developing", "",                     "Laserlicht",            ""                             },
-   { "Developing", "Alexey",               "Macron1Robot",          ""                             },
-   { "Developing", "Michał Kalinowski",    "",                      "[email protected]"            },
-   { "Developing", "Vadim Glazunov",       "neweagle",              "[email protected]"           },
-   { "Developing", "Andrey Cherkas",       "nordsoft",              "[email protected]"           },
-   { "Developing", "Rickard Westerlund",   "Onion Knight",          "[email protected]"         },
-   { "Developing", "Yifeng Sun",           "phoebus118",            "[email protected]"       },
-   { "Developing", "",                     "rilian-la-te",          ""                             },
-   { "Developing", "",                     "SoundSSGood",           ""                             },
-   { "Developing", "Stefan Pavlov",        "Ste",                   "[email protected]"            },
-   { "Developing", "Arseniy Shestakov",    "SXX",                   "[email protected]"      },
-   { "Developing", "Lukasz Wychrystenko",  "tezeriusz",             "[email protected]"         },
-   { "Developing", "Trevor Standley",      "tstandley",             ""                             },
-   { "Developing", "Vadim Markovtsev",     "",                      "[email protected]"           },
-   { "Developing", "Frank Zago",           "ubuntux",               ""                             },
-   { "Developing", "",                     "vmarkovtsev",           ""                             },
-   { "Developing", "Tom Zielinski",        "Warmonger",             "[email protected]"              },
-   { "Developing", "Xiaomin Ding",         "",                      "[email protected]"        },
+	{ "Developing", "Alexander Shishkin" , "alexvins"           , ""                             },
+	{ "Developing", "Alexey"             , "Macron1Robot"       , ""                             },
+	{ "Developing", "Andrea Palmate"     , "afxgroup"           , "[email protected]"         },
+	{ "Developing", "Andrey Cherkas"     , "nordsoft"           , "[email protected]"           },
+	{ "Developing", "Andrii Danylchenko" , ""                   , ""                             },
+	{ "Developing", "Andrzej Żak"        , "godric3"            , ""                             },
+	{ "Developing", "Arseniy Shestakov"  , "SXX"                , "[email protected]"      },
+	{ "Developing", "Benjamin Gentner"   , "beegee"             , ""                             },
+	{ "Developing", "Dmitry Orlov"       , ""                   , "[email protected]" },
+	{ "Developing", ""                   , "Dydzio"             , "[email protected]"           },
+	{ "Developing", "Fenghuang Rumeng"   , "kdmcser"            , "[email protected]"            },
+	{ "Developing", "Frank Zago"         , "ubuntux"            , ""                             },
+	{ "Developing", "Henning Koehler"    , "henningkoehlernz"   , "[email protected]" },
+	{ "Developing", "Ivan Savenko"       , ""                   , "[email protected]"         },
+	{ "Developing", ""                   , "Laserlicht"         , ""                             },
+	{ "Developing", "Lukasz Wychrystenko", "tezeriusz"          , "[email protected]"         },
+	{ "Developing", "Michał Kalinowski"  , ""                   , "[email protected]"            },
+	{ "Developing", "Piotr Wójcik"       , "Chocimier"          , "[email protected]"            },
+	{ "Developing", "Rafal R."           , "ambtrip"            , "[email protected]"                },
+	{ "Developing", "Rickard Westerlund" , "Onion Knight"       , "[email protected]"         },
+	{ "Developing", ""                   , "SoundSSGood"        , ""                             },
+	{ "Developing", "Stefan Pavlov"      , "Ste"                , "[email protected]"            },
+	{ "Developing", "Tom Zielinski"      , "Warmonger"          , "[email protected]"              },
+	{ "Developing", "Trevor Standley"    , "tstandley"          , ""                             },
+	{ "Developing", "Vadim Glazunov"     , "neweagle"           , "[email protected]"           },
+	{ "Developing", "Vadim Markovtsev"   , ""                   , "[email protected]"           },
+	{ "Developing", "Xiaomin Ding"       , ""                   , "[email protected]"        },
+	{ "Developing", "Yifeng Sun"         , "phoebus118"         , "[email protected]"       },
+	{ "Developing", ""                   , "kambala-decapitator", "[email protected]"          },
+	{ "Developing", ""                   , "krs0"               , ""                             },
+	{ "Developing", ""                   , "rilian-la-te"       , ""                             },
+	{ "Developing", ""                   , "vmarkovtsev"        , ""                             },
 
-   { "Testing",    "Ben Yan",              "by003",                 "[email protected],"        },
-   { "Testing",    "",                     "Misiokles",             ""                             },
-   { "Testing",    "",                     "Povelitel",             ""                             },
+	{ "Testing"   , "Ben Yan"            , "by003"              , "[email protected]"         },
+	{ "Testing"   , ""                   , "Misiokles"          , ""                             },
+	{ "Testing"   , ""                   , "Povelitel"          , ""                             },
+
+	// List is ordered by "Name" (if empty than "Aka" will used as sorting key)
 };

+ 1 - 1
client/mainmenu/CreditsScreen.cpp

@@ -39,7 +39,7 @@ CreditsScreen::CreditsScreen(Rect rect)
 	{
 		if(element[0] != contributorsTask)
 			contributorsText += "\r\n\r\n{" + LIBRARY->generaltexth->translate("vcmi.credits." + boost::to_lower_copy(element[0])) + ":}\r\n";
-		contributorsText += (element[2] != "" ? element[2] : element[1]) + "\r\n";
+		contributorsText += (element[1] != "" ? element[1] : element[2]) + "\r\n";
 		contributorsTask = element[0];
 	}