1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-06 06:32:56 +01:00
Commit Graph

22313 Commits

Author SHA1 Message Date
OpenRCT2 git bot
4ddd606d63 Merge Localisation/master into OpenRCT2/develop 2021-11-25 04:08:51 +00:00
Basssiiie
b44b5eca0c Fix nullability of TileSelection.range (#15992) 2021-11-24 23:00:32 +00:00
Ted John
c2d892bdce Increment plugin API version
This should have been done for NSF, allows plugins to easily determine NSF feature availability.
2021-11-24 22:55:19 +00:00
Duncan
fccd298d2f Clang tidy Part 2: Ui Project Class Names (#15976)
* Apply clang-tidy on class names in the ui project

* Rename classes to more appropriate names

* Adjust name again
2021-11-24 16:16:52 +00:00
Duncan
6e839bdf49 Fix #15981. Staff Id causing beta park file failures (#15982)
I made a mistake when rebasing thinking the staff id had been removed much earlier (version 2). When it had really been there up until version 5. Unfortunately version 5 was when I removed the field. There is possibly version 5 saves that contain the staff id with no way to accurately know which ones they are.
2021-11-24 09:46:42 +00:00
ζeh Matt
83b911b193 #15634: Refactor passing GameActions::Result by copy (#15951)
* Refactor to result GameActions::Result as copy instead of unique_ptr

* Remove alias GameActions::Result::Ptr

* Remove MakeResult wrapper

* Remove type forwarder in TileInspector
2021-11-24 07:35:08 +00:00
Duncan
23491c8125 Close #13800: Refactor Scenery Scatter Window to class (#15559)
* Start scenery scatter window refactor

Implemented OnOpen

* Implement OnClose

* Implement OnMouseUp

* Implement OnMouseDown

* Implement OnTextInput

* Implement OnPrepareDraw

* Implement OnDraw

* Remove legacy C declarations

* Fix mistake with pointer

* Apply const where possible

* Apply review comments

* Use std::clamp

* Use from_chars

Unsure if all platforms support this

* Use String::Parse
2021-11-23 22:17:41 +00:00
Michał Janiszewski
9a32dd90eb Initialize variable (#15979)
Found it could be uninitialized in launchpad builds
2021-11-23 16:31:09 +00:00
Hielke Morsink
b86dfeca4e Fix clang-tidy renaming mistake from #15956 2021-11-23 16:12:07 +00:00
Duncan
bb2c7dbaca Clang tidy Part 1: Ui Project Function Names (#15956)
* Add NOLINT around STL using classes and vendor functions

* Apply clang-tidy to ui project function names

* Undo scripting clang-format

* Upper case OpenRCT2 and RCT2
2021-11-23 13:18:07 +00:00
YJSoft
fcf587dfa4 Fix #15974 Cannot download object from server (#15975)
Due to some leftover code from NSF rebase, server will parse MAPREQUEST incorrectly. so client will fail to download objects.
2021-11-23 08:36:37 +00:00
ζeh Matt
75073634f5 Merge pull request #15965 from ZehMatt/fix/bannerid-range
Fix BannerSetStyleAction having wrong type in constructor
2021-11-22 10:13:43 -08:00
ζeh Matt
422c4629e4 Fix BannerSetStyleAction having wrong type in constructor 2021-11-22 19:29:17 +02:00
ζeh Matt
b05e02b291 Merge pull request #15869 from ZehMatt/refactor/identifier
Introduce templated identifier type
2021-11-22 09:10:24 -08:00
ζeh Matt
f9c673679e Add missing default constructor and mark constructors constexpr 2021-11-22 18:17:18 +02:00
ζeh Matt
5d2fd57d1e Create Identifiers.h for common identifier types 2021-11-22 18:17:17 +02:00
ζeh Matt
4147a57c5b Remove Null constant and use strictly GetNull/IsNull 2021-11-22 18:17:17 +02:00
ζeh Matt
15396fee5d Add static GetNull member 2021-11-22 18:17:17 +02:00
ζeh Matt
4ba2c101c9 Use TIdentifier for ParkEntranceIndex 2021-11-22 18:17:17 +02:00
ζeh Matt
f703c3e805 Introduce TIdentifier 2021-11-22 18:17:12 +02:00
ζeh Matt
41e17a0c5b Merge pull request #15948 from ZehMatt/refactor/misc-entity
Remove MiscEntity
2021-11-22 04:01:58 -08:00
Cory Sanin
68ee0a7804 Use .park file extension for save_park or autosave (#15957)
Use correct file extension when saving from the console or when performing an autosave. Otherwise .park files are generated with the old .sv6 extension.
2021-11-22 09:41:44 +00:00
Michał Janiszewski
2cc8208a9d Initialize variable (#15954)
Found it could be uninitialized in launchpad builds
2021-11-22 06:36:48 +00:00
Ted John
065cf80ae6 Fix multiple surface tiles created when importing SV4 2021-11-21 23:51:42 +00:00
Michał Janiszewski
3ff2466251 Update network version for NSF (#15950) 2021-11-21 23:39:41 +00:00
ζeh Matt
f2564503c9 Remove MiscEntity 2021-11-22 00:46:21 +02:00
Michael Steenbeek
cbf922f33c Merge pull request #10664 from OpenRCT2/new-save-format
.park implementation
2021-11-21 23:04:14 +01:00
Gymnasiast
59728db675 Update changelog for the most important things 2021-11-21 22:44:19 +01:00
Gymnasiast
bbfa1b67e4 Fix determining map size for S4 2021-11-21 22:43:23 +01:00
duncanspumpkin
566a05044b Add location.hpp 2021-11-21 22:43:23 +01:00
duncanspumpkin
d31f658368 Prevent import of tiles outsized of map boundaries 2021-11-21 22:43:23 +01:00
Ted John
0e57643a68 Refactor TilePointerIndex 2021-11-21 22:43:23 +01:00
Ted John
c4b4595708 Fix importing maps containing 255 height elements 2021-11-21 22:43:23 +01:00
Ted John
915e6447f9 Fix misc scenery not marked as invented 2021-11-21 22:43:23 +01:00
Gymnasiast
d63b57c359 Fix crash when loading save with impossible zoom level 2021-11-21 22:43:23 +01:00
duncanspumpkin
ba8a0d4dd4 Update replays for ride import/export bug 2021-11-21 22:43:23 +01:00
duncanspumpkin
91b606beae Fix missing ride data from nsf
This was causing a desync whenever it rained
2021-11-21 22:43:22 +01:00
duncanspumpkin
1fc7e8d710 Update replays 2021-11-21 22:43:22 +01:00
duncanspumpkin
f8091a462e Fix scenery group set research status import
There were a lot of small issues that compounded into making this bug occur
2021-11-21 22:43:22 +01:00
duncanspumpkin
22b9671435 Fix alignment 2021-11-21 22:43:22 +01:00
duncanspumpkin
fdf0f69159 Fix loading version 2 Park files 2021-11-21 22:43:22 +01:00
duncanspumpkin
ed54a28e38 Modify ride update to match vanilla balance 2021-11-21 22:43:22 +01:00
duncanspumpkin
ba6345e410 Use title case 2021-11-21 22:43:22 +01:00
duncanspumpkin
fe2d7998b5 Use std::remove_if 2021-11-21 22:43:22 +01:00
duncanspumpkin
6d28b94c05 Revert style change 2021-11-21 22:43:22 +01:00
Gymnasiast
921ae21ad5 Remove obsolete TODOs 2021-11-21 22:43:22 +01:00
Gymnasiast
1e8eb7087e Make sure restricted scenery is available in Editor 2021-11-21 22:43:22 +01:00
Gymnasiast
efd9cc420b Remove loading of JSON legacy footpaths 2021-11-21 22:43:22 +01:00
IntelOrca
34128dc262 Add new .park save format
Co-authored-by: Gymnasiast <Gymnasiast@users.noreply.github.com>
Co-authored-by: duncanspumpkin <duncanspumpkin@users.noreply.github.com>
Co-authored-by: ZehMatt <Zehmatt@users.noreply.github.com>
Co-authored-by: Broxzier <Broxzier@users.noreply.github.com>
2021-11-21 22:43:22 +01:00
Gymnasiast
e9e8dceca7 Update Backtrace token 2021-11-21 22:40:19 +01:00