From a3d09ca6259575f2844c00a634e26d1652879271 Mon Sep 17 00:00:00 2001 From: sphere Date: Mon, 28 Sep 2020 14:48:55 +0200 Subject: [PATCH 1/4] These people deserve to be in the credits proper, also formatting fixes. --- src/f_finale.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/src/f_finale.c b/src/f_finale.c index 3c69dc6316..09ae71dc91 100644 --- a/src/f_finale.c +++ b/src/f_finale.c @@ -531,7 +531,7 @@ static void F_IntroDrawScene(void) { case 0: bgxoffs = 28; - break; + break; case 1: background = W_CachePatchName("INTRO1", PU_PATCH); break; @@ -620,7 +620,7 @@ static void F_IntroDrawScene(void) V_DrawScaledPatch(bgxoffs, 0, 0, background); } else if (intro_scenenum == 0) // STJr presents - { + { if (intro_curtime > 1 && intro_curtime < (INT32)introscenetime[intro_scenenum]) { V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31); @@ -628,13 +628,13 @@ static void F_IntroDrawScene(void) sprintf(stjrintro, "STJRI%03u", intro_curtime-1); else if (intro_curtime >= TICRATE-6 && intro_curtime < 2*TICRATE-20) // Pause on black screen for just a second return; - else if (intro_curtime == 2*TICRATE-19) + else if (intro_curtime == 2*TICRATE-19) { // Fade in the text // The text fade out is automatically handled when switching to a new intro scene strncpy(stjrintro, "STJRI029", 9); S_ChangeMusicInternal("_stjr", false); - + background = W_CachePatchName(stjrintro, PU_PATCH); wipestyleflags = WSF_FADEIN; F_WipeStartScreen(); @@ -643,7 +643,7 @@ static void F_IntroDrawScene(void) F_WipeEndScreen(); F_RunWipe(0,true); } - + if (!WipeInAction) // Draw the patch if not in a wipe { background = W_CachePatchName(stjrintro, PU_PATCH); @@ -863,7 +863,7 @@ void F_IntroDrawer(void) F_WipeEndScreen(); F_RunWipe(99,true); } - + S_ChangeMusicInternal("_intro", false); } else if (intro_scenenum == 10) @@ -1101,6 +1101,7 @@ static const char *credits[] = { "Andrew \"orospakr\" Clunis", "Sally \"TehRealSalt\" Cochenour", "Gregor \"Oogaland\" Dick", + "\"Golden\"", "Julio \"Chaos Zero 64\" Guir", "\"Hannu_Hanhi\"", // For many OpenGL performance improvements! "\"Kalaron\"", // Coded some of Sryder13's collection of OpenGL fixes, especially fog @@ -1121,6 +1122,7 @@ static const char *credits[] = { "", "\1Art", "Victor \"VAdaPEGA\" Ara\x1Fjo", // Araújo -- sorry for our limited font! D: + "\"Arietty\"", "Ryan \"Blaze Hedgehog\" Bloom", "Graeme P. \"SuperPhanto\" Caldwell", // for the new brak render "\"ChrispyPixels\"", @@ -1142,7 +1144,9 @@ static const char *credits[] = { "Alexander \"DrTapeworm\" Moench-Ford", "Andrew \"Senku Niola\" Moran", "\"MotorRoach\"", + "\"Revan\"", "Phillip \"TelosTurntable\" Robinson", + "\"Scizor300\"", "Wessel \"sphere\" Smit", "David \"Instant Sonic\" Spencer Jr.", "\"SSNTails\"", @@ -1158,7 +1162,7 @@ static const char *credits[] = { "Paul \"Boinciel\" Clempson", "Shane \"CobaltBW\" Ellis", "James \"SeventhSentinel\" Hall", - "Cyan Helkaraxe", + "\"Cyan Helkaraxe\"", "Kepa \"Nev3r\" Iceta", "Iestyn \"Monster Iestyn\" Jealous", "Jarel \"Arrow\" Jones", @@ -1226,13 +1230,6 @@ static const char *credits[] = { "Pascal \"CodeImp\" vd Heiden", // Doom Builder developer "Randi Heit ()", // For their MSPaint sprite that we nicked "Simon \"sirjuddington\" Judd", // SLADE developer - // Acknowledged here are the following: - // Minor merge request authors, see guideline above - // - Golden - Expanded thin font - // Creators of small quantities of sprite/texture assets - // - Arietty - New Green Hill-styled textures - // - Scizor300 - the only other contributor to the 2.0 SRB2 Asset Pack - // - Revan/Icefox - the new Nimbus Ruins skybox "SRB2 Community Contributors", "", "\1Produced By", From 2e172de6ebd81973c7035a73b73bcdb804841958 Mon Sep 17 00:00:00 2001 From: sphere Date: Mon, 28 Sep 2020 15:54:10 +0200 Subject: [PATCH 2/4] Merge Programming and Programming Assistance, and some other tweaks. --- src/f_finale.c | 46 ++++++++++++++++++++-------------------------- 1 file changed, 20 insertions(+), 26 deletions(-) diff --git a/src/f_finale.c b/src/f_finale.c index 09ae71dc91..6297dcd0f6 100644 --- a/src/f_finale.c +++ b/src/f_finale.c @@ -1074,51 +1074,45 @@ static const char *credits[] = { "\1Programming", "Alam \"GBC\" Arias", "Logan \"GBA\" Arias", + "Colette \"fickleheart\" Bordelon", + "Andrew \"orospakr\" Clunis", + "Sally \"TehRealSalt\" Cochenour", + "Gregor \"Oogaland\" Dick", "Callum Dickinson", "Scott \"Graue\" Feeney", "Victor \"SteelT\" Fuentes", "Nathan \"Jazz\" Giroux", + "\"Golden\"", "Vivian \"toaster\" Grannell", + "Julio \"Chaos Zero 64\" Guir", + "\"Hannu_Hanhi\"", // For many OpenGL performance improvements! "Kepa \"Nev3r\" Iceta", "Thomas \"Shadow Hog\" Igoe", "\"james\"", "Iestyn \"Monster Iestyn\" Jealous", "\"Jimita\"", - "Ronald \"Furyhunter\" Kinard", // The SDL2 port - "Louis-Antoine \"LJ Sonic\" de Moulins", // de Rochefort doesn't quite fit on the screen sorry lol - "John \"JTE\" Muniz", - "Ehab \"Wolfy\" Saeed", - "Jonas \"MascaraSnake\" Sauer", "\"Kaito Sinclaire\"", - "\"SSNTails\"", - "Lachlan \"Lach\" Wright", - "Marco \"mazmazz\" Zafra", - "", - "\1Programming", - "\1Assistance", - "Colette \"fickleheart\" Bordelon", - "\"chi.miru\"", // helped port slope drawing code from ZDoom - "Andrew \"orospakr\" Clunis", - "Sally \"TehRealSalt\" Cochenour", - "Gregor \"Oogaland\" Dick", - "\"Golden\"", - "Julio \"Chaos Zero 64\" Guir", - "\"Hannu_Hanhi\"", // For many OpenGL performance improvements! "\"Kalaron\"", // Coded some of Sryder13's collection of OpenGL fixes, especially fog + "Ronald \"Furyhunter\" Kinard", // The SDL2 port "\"Lat'\"", // SRB2-CHAT, the chat window from Kart "Matthew \"Shuffle\" Marsalko", "Steven \"StroggOnMeth\" McGranahan", "\"Morph\"", // For SRB2Morphed stuff + "Louis-Antoine \"LJ Sonic\" de Moulins", // de Rochefort doesn't quite fit on the screen sorry lol + "John \"JTE\" Muniz", "Colin \"Sonict\" Pfaff", "Sean \"Sryder13\" Ryder", + "Ehab \"Wolfy\" Saeed", "Tasos \"tatokis\" Sahanidis", // Corrected C FixedMul, making 64-bit builds netplay compatible + "Jonas \"MascaraSnake\" Sauer", "Wessel \"sphere\" Smit", - "Ben \"Cue\" Woodford", + "\"SSNTails\"", + "\"Varren\"", "\"VelocitOni\"", // Wrote the original dashmode script "Ikaro \"Tatsuru\" Vinhas", - // Git contributors with 5+ approved merges of substantive quality, - // or contributors with at least one groundbreaking merge, may be named. - // Everyone else is acknowledged under "Special Thanks > SRB2 Community Contributors". + "Ben \"Cue\" Woodford", + "Lachlan \"Lach\" Wright", + "Marco \"mazmazz\" Zafra", "", "\1Art", "Victor \"VAdaPEGA\" Ara\x1Fjo", // Araújo -- sorry for our limited font! D: @@ -1144,7 +1138,6 @@ static const char *credits[] = { "Alexander \"DrTapeworm\" Moench-Ford", "Andrew \"Senku Niola\" Moran", "\"MotorRoach\"", - "\"Revan\"", "Phillip \"TelosTurntable\" Robinson", "\"Scizor300\"", "Wessel \"sphere\" Smit", @@ -1160,9 +1153,9 @@ static const char *credits[] = { "Malcolm \"RedXVI\" Brown", "Dave \"DemonTomatoDave\" Bulmer", "Paul \"Boinciel\" Clempson", + "\"Cyan Helkaraxe\"", "Shane \"CobaltBW\" Ellis", "James \"SeventhSentinel\" Hall", - "\"Cyan Helkaraxe\"", "Kepa \"Nev3r\" Iceta", "Iestyn \"Monster Iestyn\" Jealous", "Jarel \"Arrow\" Jones", @@ -1189,8 +1182,9 @@ static const char *credits[] = { "James \"SeventhSentinel\" Hall", "Kepa \"Nev3r\" Iceta", "Thomas \"Shadow Hog\" Igoe", - "Alexander \"DrTapeworm\" Moench-Ford", "\"Kaito Sinclaire\"", + "Alexander \"DrTapeworm\" Moench-Ford", + "\"Revan\"", "Anna \"QueenDelta\" Sandlin", "Wessel \"sphere\" Smit", "\"Spazzo\"", From 2ebe731bd490b45737a8dedfb26b3d6e078dd817 Mon Sep 17 00:00:00 2001 From: sphere Date: Tue, 29 Sep 2020 17:23:44 +0200 Subject: [PATCH 3/4] Game design is a team effort. --- src/f_finale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/f_finale.c b/src/f_finale.c index 6297dcd0f6..8bc2067f89 100644 --- a/src/f_finale.c +++ b/src/f_finale.c @@ -1067,7 +1067,7 @@ static const char *credits[] = { "\1Credits", "", "\1Game Design", - "Ben \"Mystic\" Geyer", + "Sonic Team Junior", "\"SSNTails\"", "Johnny \"Sonikku\" Wallbank", "", From 2642df4c98c3238d9f7bfe88f2f38577f04aea47 Mon Sep 17 00:00:00 2001 From: sphere Date: Tue, 29 Sep 2020 18:06:50 +0200 Subject: [PATCH 4/4] Fix Arrietty's name being misspelled. --- src/f_finale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/f_finale.c b/src/f_finale.c index 8bc2067f89..57f8a87121 100644 --- a/src/f_finale.c +++ b/src/f_finale.c @@ -1116,7 +1116,7 @@ static const char *credits[] = { "", "\1Art", "Victor \"VAdaPEGA\" Ara\x1Fjo", // Araújo -- sorry for our limited font! D: - "\"Arietty\"", + "\"Arrietty\"", "Ryan \"Blaze Hedgehog\" Bloom", "Graeme P. \"SuperPhanto\" Caldwell", // for the new brak render "\"ChrispyPixels\"",