mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-19 13:52:54 +01:00
Code Issues Releases Wiki Activity
25,308 Commits 8 Branches 58 Tags
90fddb99ed60ea91f77cd16e9eb81e8f173f73ad
Commit Graph

25308 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Bernardi
90fddb99ed Fix #20618: ignore tasks.json in .gitignore 2023-11-19 22:51:43 +01:00
Ted John
18dec7d5c5 Merge pull request #20969 from Gymnasiast/refactor/more-wooden-supports 
Replace usages of old WoodenBSupportsSetup() overload
 2023-11-17 17:59:17 +00:00
HtotheTML
42deffd5bb Fix #17774: gaps and errors in park boundaries and construction rights for RCT1 and RCT2 scenarios (#19657) 
* Update S6Importer.cpp

* clang format error. Added changelog entry.

* Update S6Importer.cpp

* Added fixes for RCT1 scenarios

The issues in Katie's Dreamland, Utopia Park, Urban Park, Pleasure Island, and Fort Anachronism listed in issue #17774 have been now dealt with.

* Added land for Cradle's underwater path.

* Update changelog.txt

* Updated changelog.

* specify text for path fix in Cradle

* Update S6Importer.cpp

* More missing tiles in Coastal Reclaim & Salvage

* Update S6Importer.cpp

* Update S6Importer.cpp

* missed tile in stone age

* Classic compatibility

Added edit compatibility for classic scenarios on rct2 maps.

* Update changelog.txt

* Update S6Importer.cpp

* Update S6Importer.cpp

* Update S6Importer.cpp

* Fun At The Beach

Fixed errant tiles in Fun at the Beach.

* Update S6Importer.cpp

* Update S6Importer.cpp

* Extreme Heights Fix

missing tiles along edge of Extreme Heights park boundary; should run to 1 tile from the edge of the map almost all the way around.

* Final Set of Changes

Did a quick run-through of all the maps looking for any possible missed spots. I did find a series of spots, some clearly meant to be owned, and others that I'm a bit less than sure about. For now, I've commented out the spots that I don't feel are strictly necessary to have included, while the remaining ones I feel are necessary.

* Update S4Importer.cpp

* add optional fixes

un-commented the extra changes; they are now included.

* Update changelog.txt

* fix clang format error

* Update changelog.txt

* Update S6Importer.cpp

OOB underground path

* Update S6Importer.cpp

* Update S6Importer.cpp

* above runaway plumber gaps

* Update changelog.txt
 2023-11-17 08:23:05 -03:00
Kostadin
11c46987ae Add #include <algorithm> to fix building with gcc 14 (#20981) 
With gcc 14 some C++ Standard Library headers have been changed to no
longer include other headers that were used internally by the library.
In OpenRCT2's case it is the <algorithm> header.

Downstream Gentoo bug: https://bugs.gentoo.org/917016

GCC 14 porting guide: https://gcc.gnu.org/gcc-14/porting_to.html#header-dep-changes

Signed-off-by: Kostadin Shishmanov <kocelfc@tutanota.com>
 2023-11-16 21:26:05 +01:00
OpenRCT2 git bot
6aa7e91917 Merge Localisation/master into OpenRCT2/develop 2023-11-16 04:01:38 +00:00
Michael Steenbeek
f8d71fcc2f Fix #20253, #20799, #20841, #20903, #20915: Crash when displaying a Lay-Down RC’s half loop (#20968) 
* Fix #20253: Crash when displaying a Lay-Down RC’s half loop

* Bump network version
 2023-11-15 23:36:14 -03:00
OpenRCT2 git bot
f98674b023 Merge Localisation/master into OpenRCT2/develop 2023-11-15 04:01:43 +00:00
Gymnasiast
d0fe45048b Make old WoodenBSupportsPaintSetup() overload static 2023-11-14 20:30:49 +01:00
Gymnasiast
fd0b90a049 Consolidate WoodenBSupportsPaintSetup() calls in WoodenRollerCoaster.cpp 2023-11-14 20:30:49 +01:00
Gymnasiast
76a8ef55d3 Use new WoodenBSupportsPaintSetup() overloads in WoodenRollerCoaster.cpp 2023-11-14 20:30:49 +01:00
Gymnasiast
9cd04f2016 Use WoodenBSupportsPaintSetupRotated() in HybridCoaster.cpp 2023-11-14 20:30:49 +01:00
Gymnasiast
666b60ccee Consolidate WoodenBSupportsPaintSetup() calls in Side-Friction RC 2023-11-14 20:30:34 +01:00
Gymnasiast
e6c7c4d977 Use new WoodenBSupportsPaintSetup() overloads in Side-Friction RC 2023-11-14 20:30:21 +01:00
Gymnasiast
ff70e0e1e7 Use new WoodenBSupportsPaintSetup() overloads in MiniatureRailway.cpp 2023-11-14 20:30:10 +01:00
Gymnasiast
7f458f5b46 Call WoodenA/B functions directly in MiniatureRailway.cpp 2023-11-14 20:30:10 +01:00
Gymnasiast
f47cfa79c0 Use WoodenBSupportsSetupRotated() for scenery supports drawing 2023-11-14 20:30:09 +01:00
OpenRCT2 git bot
3ab33d3ca9 Merge Localisation/master into OpenRCT2/develop 2023-11-13 04:01:49 +00:00
Fredrik Tegnell
af7086e283 Close #12078: Add shortcut key for sloping walls (#20860) 
* Close OpenRCT2/OpenRCT2#12078: New shortcut key for sloping walls

* Close OpenRCT2/OpenRCT2#12078: New shortcut key for sloping walls

* Close OpenRCT2/OpenRCT2#12078: New shortcut key for sloping walls

* Close OpenRCT2/OpenRCT2#12078: New shortcut key for sloping walls

* Apply code formatting fixes

* Apply code formatting fixes

* Apply modulus operator to make code more concise

* Change string ID

* Apply code formatting fix

* Apply code formatting fix
 2023-11-12 08:10:56 -03:00
KawkMob
135c8b9f9b Fix #20747: handle staff speed permanency/serialization/apply for new staff (#20756) 2023-11-12 08:06:51 -03:00
Maciek
d6a481b066 Close #20881: Replace monorail_diag_blocked_segments with DiagBlockedSegments (#20961) 
Removed monorail_diag_blocked_segments. Replaced the references with DiagBlockedSegments.
 2023-11-12 08:04:25 -03:00
Matt
da1fa18523 Merge pull request #20966 from ZehMatt/fix-20964 
Fix #20964: Crash when invalid network group id is used
 2023-11-11 23:48:48 +02:00
ζeh Matt
d4419ea89a Update changelog.txt 2023-11-11 19:03:54 +02:00
ζeh Matt
37cdc40799 Fix #20964: Crash when invalid network group id is used 2023-11-11 18:59:46 +02:00
Sjoerd de Bruin
b12d659db3 Clarify launcher wording (#20957) 
Although the launcher is available for more than one platform the word "cross platform" might confuse users of macOS and other platforms
 2023-11-09 21:31:57 -03:00
OpenRCT2 git bot
f1fdeb1f2b Merge Localisation/master into OpenRCT2/develop 2023-11-08 04:01:45 +00:00
Matt
3b6b6e080f Merge pull request #20946 from davesmits/feature/update-launcher-in-readme 
Update readme.md to link to IntelOrca's launcher
 2023-11-05 19:10:21 +02:00
Dave Smits
5afe3a85f5 Update readme.md 2023-11-04 22:20:06 +01:00
Dave Smits
97cb3125c9 Use IntelOrca's launcher 2023-11-04 22:17:25 +01:00
mrmbernardi
e914ffedaf Fix #20944: Add cstdint to EnumMap and EntryList (#20945) 2023-11-04 19:55:35 +00:00
Matt
9300e33ac9 Merge pull request #20922 from Gymnasiast/feature/remove-park-fences-multiplayer 
Make remove_park_fences multiplayer-safe
 2023-11-03 17:08:05 +02:00
Gymnasiast
56933d3cdc Bump network version 2023-11-02 22:40:35 +01:00
Gymnasiast
6d87e3e56d Make remove_park_fences multiplayer-safe 2023-11-02 22:40:11 +01:00
spacek531
e24b59e939 Upload macos-x64 artifacts before tests (#20936) 
This allows for artifact upload even when tests fail.

Other targets already upload artifacts before tests.
 2023-11-02 18:43:00 +01:00
OpenRCT2 git bot
162b17ddc8 Merge Localisation/master into OpenRCT2/develop 2023-11-01 04:01:53 +00:00
Michał Janiszewski
68575ba165 Merge pull request #20930 from janisozaur/v12-docker-build 
Update Android project to more recent tools
 2023-10-31 06:34:52 +01:00
OpenRCT2 git bot
f5649870ee Merge Localisation/master into OpenRCT2/develop 2023-10-31 04:01:51 +00:00
Michał Janiszewski
78f4860bfe Update Android project to use more recent tools 
Tested manually on my Android 13 device
 2023-10-30 23:20:49 +01:00
Michał Janiszewski
f7b2fddbe3 Use v12 docker build images 2023-10-30 23:20:49 +01:00
AuraSpecs
f1bcbd97c2 Allow vertical pieces on the giga when vehicle allows (#20802) 
* Allow vertical pieces on the giga when drawable

* Update NetworkBase.cpp

* Re-Add Diag Brakes

seem to have gotten lost with rebasing.
 2023-10-30 20:44:06 +00:00
Ted John
daf03e4511 Merge pull request #20897 from Gymnasiast/refactor/station-supports 
Use common methods for station and on-ride photo support drawing
 2023-10-27 21:47:53 +01:00
Gymnasiast
d88abab74b Move MetalSupportTypeCount to Supports.cpp 2023-10-25 19:43:35 +02:00
Gymnasiast
3b074be920 Confine RotatedMetalSupports to Supports.cpp 2023-10-25 19:43:34 +02:00
Gymnasiast
2d16df1072 Create TrackPaintUtilOnridePhotoPlatformPaint() 2023-10-25 19:43:34 +02:00
Gymnasiast
0e5c413385 Merge TrackPaintUtilDrawStationMetalSupports() and ...2() 2023-10-25 19:43:28 +02:00
Gymnasiast
4ee088e27d Also include the thick supports in RotatedMetalSupports 2023-10-25 19:37:49 +02:00
Gymnasiast
7cf75ab11d Use common method for station/on-ride supports 2023-10-25 19:37:49 +02:00
Matt
a19879ac1f Merge pull request #20900 from ZehMatt/fix-20748 
Calculate guests heading towards park after importing the save file
 2023-10-24 14:57:44 +03:00
ζeh Matt
897579b5de Print a warning if there is a disagreement with the imported data 2023-10-20 15:02:28 +03:00
ζeh Matt
b43af1cf14 Remove obsolete code in s4 importer 2023-10-20 14:28:10 +03:00
ζeh Matt
37bc7238e6 Remove unnecessary scope 2023-10-20 14:27:02 +03:00