mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-06 06:32:56 +01:00
Code Issues Releases Wiki Activity

Merge pull request #18657 from Gymnasiast/objects-release

Browse Source 
Update objects to v1.3.7
This commit is contained in:
Michael Steenbeek
2022-11-24 12:56:52 +01:00
committed by GitHub
parent f429717217 8a77d7e45f
commit c338e2c292
9 changed files with 17 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@@ -64,9 +64,9 @@ set(TITLE_SEQUENCE_VERSION "0.4.0")
set(TITLE_SEQUENCE_URL "https://github.com/OpenRCT2/title-sequences/releases/download/v${TITLE_SEQUENCE_VERSION}/title-sequences.zip")
set(TITLE_SEQUENCE_SHA1 "4ab0065e5a4d9f9c77d94718bbdfcfcd5a389da0")
set(OBJECTS_VERSION "1.3.6")
set(OBJECTS_VERSION "1.3.7")
set(OBJECTS_URL "https://github.com/OpenRCT2/objects/releases/download/v${OBJECTS_VERSION}/objects.zip")
set(OBJECTS_SHA1 "20e0eb1389918ea1a90ec891f46ef03100b3e935")
set(OBJECTS_SHA1 "82930d549e0b3c3bce29718d5390c5cd474d0f28")
set(OPENSFX_VERSION "1.0.1")
set(OPENSFX_URL "https://github.com/OpenRCT2/OpenSoundEffects/releases/download/v${OPENSFX_VERSION}/opensound.zip")

24
data/language/en-GB.txt
View File

@@ -4087,30 +4087,6 @@ STR_DTLS :
[TTPIRF05]
STR_NAME :Roof
[TTRFWD01]
STR_NAME :Roof
[TTRFWD02]
STR_NAME :Roof
[TTRFWD03]
STR_NAME :Roof
[TTRFWD04]
STR_NAME :Roof
[TTRFWD05]
STR_NAME :Roof
[TTRFWD06]
STR_NAME :Roof
[TTRFWD07]
STR_NAME :Roof
[TTRFWD08]
STR_NAME :Roof
## End OpenRCT2 Official
###############################################################################

4
distribution/changelog.txt
View File

@@ -2,9 +2,11 @@
------------------------------------------------------------------------
- Feature: [#17782] The Flying Coaster now has access to boosters and can draw outside loops.
- Feature: [#18312, objects#220, OpenSFX#13] New sound effects for the Hybrid and Single Rail roller coasters.
- Feature: [objects#173] Add alpine coaster vehicle.
- Feature: [objects#221] Add two extra jungle walls.
- Feature: [objects#225] Add log cabin roofs.
- Feature: [OpenMusic#14, OpenMusic#15, OpenMusic#18] Added Galaxy, Acid and Dodgems ride music styles.
- Improved: [#18013, #18016, #18018, #18019, #18514] Added colour presets to Spiral Slide, Dodgems, Boat Hire, Flying Saucers, and Car Ride.
- Improved: [#18013, #18016, #18018, #18019, #18514, objects#224] Added colour presets to Spiral Slide, Dodgems, Boat Hire, Flying Saucers, and Car Ride.
- Improved: [#18192] Tycoon Park has been added to the Extras tab.
- Improved: [#18214] Competition scenarios have received their own section.
- Improved: [#18250] Added modern style file and folder pickers on Windows.

4
openrct2.proj
View File

@@ -45,8 +45,8 @@
<LibsSha1 Condition="'$(Platform)'=='ARM64'">f3a03c2e7b610fefa28d6962da10144f6324078d</LibsSha1>
<TitleSequencesUrl>https://github.com/OpenRCT2/title-sequences/releases/download/v0.4.0/title-sequences.zip</TitleSequencesUrl>
<TitleSequencesSha1>4ab0065e5a4d9f9c77d94718bbdfcfcd5a389da0</TitleSequencesSha1>
<ObjectsUrl>https://github.com/OpenRCT2/objects/releases/download/v1.3.6/objects.zip</ObjectsUrl>
<ObjectsSha1>20e0eb1389918ea1a90ec891f46ef03100b3e935</ObjectsSha1>
<ObjectsUrl>https://github.com/OpenRCT2/objects/releases/download/v1.3.7/objects.zip</ObjectsUrl>
<ObjectsSha1>82930d549e0b3c3bce29718d5390c5cd474d0f28</ObjectsSha1>
<OpenSFXUrl>https://github.com/OpenRCT2/OpenSoundEffects/releases/download/v1.0.1/opensound.zip</OpenSFXUrl>
<OpenSFXSha1>8f04aea33f8034131c3069f6accacce0d94f80c1</OpenSFXSha1>
<OpenMSXUrl>https://github.com/OpenRCT2/OpenMusic/releases/download/v1.0.1/openmusic.zip</OpenMSXUrl>

4
shell.nix
View File

@@ -15,8 +15,8 @@ let
objects-src = pkgs.fetchFromGitHub {
owner = "OpenRCT2";
repo = "objects";
rev = "v1.3.6";
sha256 = "db9c3806a09cf2031f62f8e75cdc014376ec91d3c97e5764f747a88c8d8faf40";
rev = "v1.3.7";
sha256 = "d6be9743c68f233674f5549204637b1f0304d7567a816d18e3f1576500a51d38";
};
title-sequences-src = pkgs.fetchFromGitHub {

33
src/openrct2/object/SmallSceneryObject.cpp
View File

@@ -175,29 +175,6 @@ void SmallSceneryObject::PerformFixes()
static const auto& scgPirat = GetScgPiratHeader();
SetPrimarySceneryGroup(scgPirat);
}
// ToonTowner's wooden roofs. Make them show up in the Mine Theming.
if (identifier == "TTRFWD01" ||
identifier == "TTRFWD02" ||
identifier == "TTRFWD03" ||
identifier == "TTRFWD04" ||
identifier == "TTRFWD05" ||
identifier == "TTRFWD06" ||
identifier == "TTRFWD07" ||
identifier == "TTRFWD08")
{
static const auto& scgMine = GetScgMineHeader();
SetPrimarySceneryGroup(scgMine);
}
// ToonTowner's glass roofs. Make them show up in the Abstract Theming.
if (identifier == "TTRFGL01" ||
identifier == "TTRFGL02" ||
identifier == "TTRFGL03")
{
static const auto& scgAbstr = GetScgAbstrHeader();
SetPrimarySceneryGroup(scgAbstr);
}
}
// clang-format on
@@ -206,16 +183,6 @@ ObjectEntryDescriptor SmallSceneryObject::GetScgPiratHeader() const
return ObjectEntryDescriptor("rct2.scenery_group.scgpirat");
}
ObjectEntryDescriptor SmallSceneryObject::GetScgMineHeader() const
{
return ObjectEntryDescriptor("rct2.scgmine");
}
ObjectEntryDescriptor SmallSceneryObject::GetScgAbstrHeader() const
{
return ObjectEntryDescriptor("rct2.scenery_group.scgabstr");
}
void SmallSceneryObject::ReadJson(IReadObjectContext* context, json_t& root)
{
Guard::Assert(root.is_object(), "SmallSceneryObject::ReadJson expects parameter root to be object");

2
src/openrct2/object/SmallSceneryObject.h
View File

@@ -38,6 +38,4 @@ private:
static std::vector<uint8_t> ReadJsonFrameOffsets(json_t& jFrameOffsets);
void PerformFixes();
ObjectEntryDescriptor GetScgPiratHeader() const;
ObjectEntryDescriptor GetScgMineHeader() const;
ObjectEntryDescriptor GetScgAbstrHeader() const;
};

7
src/openrct2/park/ParkFile.cpp
View File

@@ -338,6 +338,13 @@ namespace OpenRCT2
identifier = "openrct2.ride.single_rail_coaster";
}
}
else if (version <= 14)
{
if (identifier == "openrct2.ride.alp1")
{
identifier = "openrct2.ride.alpine_coaster";
}
}
desc.Identifier = identifier;
desc.Version = cs.Read<std::string>();

2
src/openrct2/park/ParkFile.h
View File

@@ -8,7 +8,7 @@ struct ObjectRepositoryItem;
namespace OpenRCT2
{
// Current version that is saved.
constexpr uint32_t PARK_FILE_CURRENT_VERSION = 14;
constexpr uint32_t PARK_FILE_CURRENT_VERSION = 15;
// The minimum version that is forwards compatible with the current version.
constexpr uint32_t PARK_FILE_MIN_VERSION = 14;