diff --git a/CMakeLists.txt b/CMakeLists.txt index 964d72a99b..0f62a0bb62 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -76,9 +76,9 @@ set(OPENMSX_VERSION "1.5") set(OPENMSX_URL "https://github.com/OpenRCT2/OpenMusic/releases/download/v${OPENMSX_VERSION}/openmusic.zip") set(OPENMSX_SHA1 "f3c707e576281758637598ce68880416891fe5f9") -set(REPLAYS_VERSION "0.0.78") +set(REPLAYS_VERSION "0.0.79") set(REPLAYS_URL "https://github.com/OpenRCT2/replays/releases/download/v${REPLAYS_VERSION}/replays.zip") -set(REPLAYS_SHA1 "31C5D07EED8481D5C6D57F9E4FE9443AAEDE7739") +set(REPLAYS_SHA1 "34457077DBA9448A08FF6AC95E5CB92D65252E0C") option(FORCE32 "Force 32-bit build. It will add `-m32` to compiler flags.") option(WITH_TESTS "Build tests") diff --git a/distribution/changelog.txt b/distribution/changelog.txt index 21e637b798..5f6ff236ef 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -6,6 +6,7 @@ - Feature: [#21413, OpenSFX#19] Add log flume lift sound effect (when “chainlift” is enabled). - Feature: [#21455] Add option to control hidden scenery. - Feature: [objects#282] Added RCT1 beta terrains. +- Improved: [#20093] Use new colours for guests’ clothing when they spawn. - Improved: [#21356] Resize the title bar when moving between displays with different scaling factors on Windows systems. - Improved: [#21388] Tooltips will now show even when an error message is present. - Improved: [#21423] Add mechanism to allow building partly underground. diff --git a/openrct2.proj b/openrct2.proj index 738000ae48..05ee7c1376 100644 --- a/openrct2.proj +++ b/openrct2.proj @@ -51,8 +51,8 @@ b1b1f1b241d2cbff63a1889c4dc5a09bdf769bfb https://github.com/OpenRCT2/OpenMusic/releases/download/v1.5/openmusic.zip f3c707e576281758637598ce68880416891fe5f9 - https://github.com/OpenRCT2/replays/releases/download/v0.0.78/replays.zip - 31C5D07EED8481D5C6D57F9E4FE9443AAEDE7739 + https://github.com/OpenRCT2/replays/releases/download/v0.0.79/replays.zip + 34457077DBA9448A08FF6AC95E5CB92D65252E0C diff --git a/src/openrct2/entity/Guest.cpp b/src/openrct2/entity/Guest.cpp index 3d59c93ea8..f73432fdd6 100644 --- a/src/openrct2/entity/Guest.cpp +++ b/src/openrct2/entity/Guest.cpp @@ -7027,6 +7027,10 @@ static constexpr uint8_t trouser_colours[] = { COLOUR_SATURATED_RED, COLOUR_DARK_ORANGE, COLOUR_BORDEAUX_RED, + COLOUR_DARK_OLIVE_DARK, + COLOUR_OLIVE_DARK, + COLOUR_AQUA_DARK, + COLOUR_DULL_BROWN_DARK, }; /** rct2: 0x009823D5 */ @@ -7064,6 +7068,28 @@ static constexpr uint8_t tshirt_colours[] = { COLOUR_BRIGHT_RED, COLOUR_DARK_PINK, COLOUR_BRIGHT_PINK, + COLOUR_DARK_OLIVE_DARK, + COLOUR_DARK_OLIVE_LIGHT, + COLOUR_SATURATED_BROWN_LIGHT, + COLOUR_BORDEAUX_RED_DARK, + COLOUR_BORDEAUX_RED_LIGHT, + COLOUR_GRASS_GREEN_DARK, + COLOUR_GRASS_GREEN_LIGHT, + COLOUR_OLIVE_DARK, + COLOUR_OLIVE_LIGHT, + COLOUR_SATURATED_GREEN_LIGHT, + COLOUR_TAN_DARK, + COLOUR_TAN_LIGHT, + COLOUR_DULL_PURPLE_LIGHT, + COLOUR_DULL_GREEN_DARK, + COLOUR_DULL_GREEN_LIGHT, + COLOUR_SATURATED_PURPLE_DARK, + COLOUR_SATURATED_PURPLE_LIGHT, + COLOUR_ORANGE_LIGHT, + COLOUR_AQUA_DARK, + COLOUR_MAGENTA_LIGHT, + COLOUR_DULL_BROWN_DARK, + COLOUR_DULL_BROWN_LIGHT, }; // clang-format on diff --git a/src/openrct2/network/NetworkBase.cpp b/src/openrct2/network/NetworkBase.cpp index c05c080c91..13b6833a7e 100644 --- a/src/openrct2/network/NetworkBase.cpp +++ b/src/openrct2/network/NetworkBase.cpp @@ -46,7 +46,7 @@ using namespace OpenRCT2; // It is used for making sure only compatible builds get connected, even within // single OpenRCT2 version. -#define NETWORK_STREAM_VERSION "3" +#define NETWORK_STREAM_VERSION "4" #define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION