From 94858aedfeb0566c0f2d25278b9ff0f07391b8a8 Mon Sep 17 00:00:00 2001 From: mazmazz Date: Sat, 22 Dec 2018 21:48:24 -0500 Subject: [PATCH 1/4] Extend HU_FONTSTART to STCFN022 (from 2.2) --- src/hu_stuff.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hu_stuff.h b/src/hu_stuff.h index 23e421076..e5416cbbb 100644 --- a/src/hu_stuff.h +++ b/src/hu_stuff.h @@ -21,7 +21,7 @@ //------------------------------------ // heads up font //------------------------------------ -#define HU_FONTSTART '\x1F' // the first font character +#define HU_FONTSTART '\x16' // the first font character #define HU_FONTEND '~' #define HU_FONTSIZE (HU_FONTEND - HU_FONTSTART + 1) From 33434395f7ef346f2a308b826de8b8311c17a7c2 Mon Sep 17 00:00:00 2001 From: mazmazz Date: Sat, 22 Dec 2018 23:41:43 -0500 Subject: [PATCH 2/4] Add SRB2 Community Contributors to Special Thanks --- src/f_finale.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/f_finale.c b/src/f_finale.c index fa6d6dbad..d8f5ad061 100644 --- a/src/f_finale.c +++ b/src/f_finale.c @@ -1007,8 +1007,7 @@ static const char *credits[] = { "\"Steel Titanium\"", "Ben \"Cue\" Woodford", // Git contributors with 5+ approved merges, at least a few of substantive quality, may be named - // Everyone else is acknowledged here - "STJr Git Contributors", + // Everyone else is acknowledged under "Special Thanks > SRB2 Community Contributors" "", "\1Sprite Artists", "Odi \"Iceman404\" Atunzu", @@ -1089,7 +1088,10 @@ 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: + // Merge Request authors with < 5 approved quality merges + // Golden - Extended thin font + "SRB2 Community Contributors", "", "\1Produced By", "Sonic Team Junior", From 7fb73cf2da010db9385b878d795f5fcfbd731bca Mon Sep 17 00:00:00 2001 From: mazmazz Date: Sun, 23 Dec 2018 02:52:14 -0500 Subject: [PATCH 3/4] New patch.dta hash for 2.1.22 --- src/config.h.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/config.h.in b/src/config.h.in index 7452ec80c..1e6a7f514 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -27,14 +27,15 @@ #else /* Manually defined asset hashes for non-CMake builds - * Last updated 2015 / 05 / 03 + * Last updated 2015 / 05 / 03 - v2.1.15 - main assets + * Last updated 2018 / 12 / 23 - v2.1.22 - patch.dta */ #define ASSET_HASH_SRB2_SRB "c1b9577687f8a795104aef4600720ea7" #define ASSET_HASH_ZONES_DTA "303838c6c534d9540288360fa49cca60" #define ASSET_HASH_PLAYER_DTA "cfca0f1c73023cbbd8f844f45480f799" #define ASSET_HASH_RINGS_DTA "85901ad4bf94637e5753d2ac2c03ea26" #ifdef USE_PATCH_DTA -#define ASSET_HASH_PATCH_DTA "dbbf8bc6121618ee3be2d5b14650429b" +#define ASSET_HASH_PATCH_DTA "b04fd9624bfd94dc96dcf4f400f7deb4" #endif #endif From f600c5fee0b46a5112ef977a9c0e94b3eeb6311b Mon Sep 17 00:00:00 2001 From: mazmazz Date: Sun, 23 Dec 2018 14:36:23 -0500 Subject: [PATCH 4/4] Credits update --- src/f_finale.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/f_finale.c b/src/f_finale.c index d8f5ad061..64e371211 100644 --- a/src/f_finale.c +++ b/src/f_finale.c @@ -997,7 +997,9 @@ static const char *credits[] = { "Gregor \"Oogaland\" Dick", "Louis-Antoine \"LJSonic\" de Moulins", // for fixing 2.1's netcode (de Rochefort doesn't quite fit on the screen sorry lol) "Julio \"Chaos Zero 64\" Guir", + "\"Jimita\"", "\"Kalaron\"", // Coded some of Sryder13's collection of OpenGL fixes, especially fog + "\"Lat'\"", // SRB2-CHAT, the chat window from Kart "Matthew \"Shuffle\" Marsalko", "Steven \"StroggOnMeth\" McGranahan", "\"Morph\"", // For SRB2Morphed stuff @@ -1006,8 +1008,9 @@ static const char *credits[] = { "Tasos \"tatokis\" Sahanidis", // Corrected C FixedMul, making 64-bit builds netplay compatible "\"Steel Titanium\"", "Ben \"Cue\" Woodford", - // Git contributors with 5+ approved merges, at least a few of substantive quality, may be named - // Everyone else is acknowledged under "Special Thanks > SRB2 Community Contributors" + // 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". "", "\1Sprite Artists", "Odi \"Iceman404\" Atunzu", @@ -1089,8 +1092,8 @@ static const char *credits[] = { "Randi Heit ()", // For their MSPaint sprite that we nicked "Simon \"sirjuddington\" Judd", // SLADE developer // Acknowledged here are the following: - // Merge Request authors with < 5 approved quality merges - // Golden - Extended thin font + // Minor merge request authors, see guideline above + // Golden - Expanded thin font "SRB2 Community Contributors", "", "\1Produced By",