From b32a31f51729a4033b5ad507aac4fc2eb6a1943d Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Fri, 22 Nov 2024 20:57:56 +0100 Subject: [PATCH] Update objects+changelog and bump network+park version --- CMakeLists.txt | 4 ++-- distribution/changelog.txt | 3 +++ openrct2.proj | 4 ++-- src/openrct2/network/NetworkBase.cpp | 2 +- src/openrct2/park/ParkFile.h | 4 ++-- src/openrct2/rct1/Tables.cpp | 4 ++-- 6 files changed, 12 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0e76f1d9c7..1c27e4179c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -69,9 +69,9 @@ set(TITLE_SEQUENCE_VERSION "0.4.14") set(TITLE_SEQUENCE_URL "https://github.com/OpenRCT2/title-sequences/releases/download/v${TITLE_SEQUENCE_VERSION}/title-sequences.zip") set(TITLE_SEQUENCE_SHA1 "6c04781b959b468e1f65ec2d2f21f5aaa5e5724d") -set(OBJECTS_VERSION "1.4.10") +set(OBJECTS_VERSION "1.4.11") set(OBJECTS_URL "https://github.com/OpenRCT2/objects/releases/download/v${OBJECTS_VERSION}/objects.zip") -set(OBJECTS_SHA1 "e4953075d8dbe13ef48e8c4e87621cf3503a9d23") +set(OBJECTS_SHA1 "da04330679de2eff53a94a6505802512bfec6403") set(OPENSFX_VERSION "1.0.5") set(OPENSFX_URL "https://github.com/OpenRCT2/OpenSoundEffects/releases/download/v${OPENSFX_VERSION}/opensound.zip") diff --git a/distribution/changelog.txt b/distribution/changelog.txt index b0ab155f4c..74feb991f6 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -1,12 +1,15 @@ 0.4.17 (in development) ------------------------------------------------------------------------ - Feature: [#23166] Add Galician translation. +- Feature: [#23227] Add Classic Wooden Twister roller coaster, for better compatibility with RCT1. - Improved: [#23051] Add large sloped turns and new inversions to the Twister, Vertical Drop, Hyper and Flying Roller Coasters. - Improved: [#23123] Improve sorting of roller coasters in build new ride menu. - Improved: [#23211] Add boosters to classic wooden roller coaster (cheats only). - Fix: [#22726] ‘Force park rating’ cheat is not saved with the park. - Fix: [#23206] Multiplayer desyncs when FPS is uncapped. - Fix: [#23238] Updating a guest’s favourite ride works differently from vanilla RCT2. +- Fix: [objects#355] Fix colour preset settings of the Stand-Up Roller Coaster trains. +- Fix: [objects#355] Fix colour preset settings of many vehicles from Wacky Worlds and Time Twister. 0.4.16 (2024-11-03) ------------------------------------------------------------------------ diff --git a/openrct2.proj b/openrct2.proj index f48b09c334..a25d37c4f0 100644 --- a/openrct2.proj +++ b/openrct2.proj @@ -45,8 +45,8 @@ 9984c1e317dcfb3aaf8e17f1db2ebb0f771e2373 https://github.com/OpenRCT2/title-sequences/releases/download/v0.4.14/title-sequences.zip 6c04781b959b468e1f65ec2d2f21f5aaa5e5724d - https://github.com/OpenRCT2/objects/releases/download/v1.4.10/objects.zip - e4953075d8dbe13ef48e8c4e87621cf3503a9d23 + https://github.com/OpenRCT2/objects/releases/download/v1.4.11/objects.zip + da04330679de2eff53a94a6505802512bfec6403 https://github.com/OpenRCT2/OpenSoundEffects/releases/download/v1.0.5/opensound.zip b1b1f1b241d2cbff63a1889c4dc5a09bdf769bfb https://github.com/OpenRCT2/OpenMusic/releases/download/v1.6/openmusic.zip diff --git a/src/openrct2/network/NetworkBase.cpp b/src/openrct2/network/NetworkBase.cpp index 0ffe91152a..73226b6e07 100644 --- a/src/openrct2/network/NetworkBase.cpp +++ b/src/openrct2/network/NetworkBase.cpp @@ -49,7 +49,7 @@ using namespace OpenRCT2; // It is used for making sure only compatible builds get connected, even within // single OpenRCT2 version. -constexpr uint8_t kNetworkStreamVersion = 3; +constexpr uint8_t kNetworkStreamVersion = 4; const std::string kNetworkStreamID = std::string(OPENRCT2_VERSION) + "-" + std::to_string(kNetworkStreamVersion); diff --git a/src/openrct2/park/ParkFile.h b/src/openrct2/park/ParkFile.h index 69cb1289a6..92d883c79c 100644 --- a/src/openrct2/park/ParkFile.h +++ b/src/openrct2/park/ParkFile.h @@ -11,10 +11,10 @@ namespace OpenRCT2 struct GameState_t; // Current version that is saved. - constexpr uint32_t PARK_FILE_CURRENT_VERSION = 43; + constexpr uint32_t PARK_FILE_CURRENT_VERSION = 44; // The minimum version that is forwards compatible with the current version. - constexpr uint32_t PARK_FILE_MIN_VERSION = 42; + constexpr uint32_t PARK_FILE_MIN_VERSION = 44; // The minimum version that is backwards compatible with the current version. // If this is increased beyond 0, uncomment the checks in ParkFile.cpp and Context.cpp! diff --git a/src/openrct2/rct1/Tables.cpp b/src/openrct2/rct1/Tables.cpp index 1323448093..234f136035 100644 --- a/src/openrct2/rct1/Tables.cpp +++ b/src/openrct2/rct1/Tables.cpp @@ -755,7 +755,7 @@ namespace OpenRCT2::RCT1 "rct2.ride.circus1", // RCT1_RIDE_TYPE_CIRCUS "rct1aa.ride.ghost_train_cars", // RCT1_RIDE_TYPE_GHOST_TRAIN "rct1aa.ride.twister_trains", // RCT1_RIDE_TYPE_STEEL_TWISTER_ROLLER_COASTER - "rct1aa.ride.woodtrc", // RCT1_RIDE_TYPE_WOODEN_TWISTER_ROLLER_COASTER + "rct1aa.ride.wooden_articulated_trains", // RCT1_RIDE_TYPE_WOODEN_TWISTER_ROLLER_COASTER "rct1aa.ride.side_friction_cars", // RCT1_RIDE_TYPE_WOODEN_SIDE_FRICTION_ROLLER_COASTER "rct1aa.ride.steel_wild_mouse_cars", // RCT1_RIDE_TYPE_STEEL_WILD_MOUSE_ROLLER_COASTER "rct2.ride.hotds", // RCT1_RIDE_TYPE_HOT_DOG_STALL @@ -856,7 +856,7 @@ namespace OpenRCT2::RCT1 "rct2.ride.circus1", // VehicleType::CircusTent "rct1aa.ride.ghost_train_cars", // VehicleType::GhostTrainCars "rct1aa.ride.twister_trains", // VehicleType::SteelTwisterRollerCoasterTrain - "rct1aa.ride.woodtrc", // VehicleType::WoodenTwisterRollerCoasterTrain + "rct1aa.ride.wooden_articulated_trains", // VehicleType::WoodenTwisterRollerCoasterTrain "rct1aa.ride.side_friction_cars", // VehicleType::WoodenSideFrictionCars "rct1aa.ride.vintage_cars", // VehicleType::VintageCars "rct1aa.ride.steam_trains_covered", // VehicleType::SteamTrainCoveredCars