1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-17 12:03:07 +01:00
Commit Graph

22812 Commits

Author SHA1 Message Date
Michael Steenbeek
34aafa5e14 Merge pull request #16638 from Gymnasiast/fix/16576
Fix #16576: Cannot select vehicle types with entry index >= 256
2022-02-13 21:33:53 +01:00
Gymnasiast
9441d4b24f Bump network version 2022-02-13 21:11:18 +01:00
Karst
9dd54b9ee1 Add Inline Twist to B&M Track (#16389)
This adds the inline twist to the B&M track.

Feature is complete. Note: The inline twist doesn't draw correctly when going out of the tunnel. This is sadly an original bug, as this is also present on the Flying RC's Flying Twist (#7466).
2022-02-12 22:31:08 +01:00
Gymnasiast
49ccc21d84 Fix #16576: Cannot select vehicle types with entry index >= 256 2022-02-12 20:43:45 +01:00
Gymnasiast
3ff8225bb9 Replace some uint8_t in Ride.cpp 2022-02-12 20:43:45 +01:00
ζeh Matt
c0474d2d27 Merge pull request #16466 from ZehMatt/refactor/identifier-rideid
Use TIdentifier for RideId
2022-02-12 11:23:54 -08:00
Michael Steenbeek
ee54603695 Rename value strings for spinners (#16637) 2022-02-12 20:17:37 +01:00
Michael Steenbeek
44a607800e Bring ImageImporter enum names in line with code style 2022-02-12 18:56:17 +01:00
ζeh Matt
004cf02c26 Fix variable name type conflict 2022-02-12 18:15:19 +02:00
ζeh Matt
f22142d2cf Use RideId::GetNull over SELECTED_RIDE_UNDEFINED 2022-02-12 18:13:50 +02:00
ζeh Matt
f4d105f843 Remove NetworkRideId 2022-02-12 18:11:18 +02:00
ζeh Matt
1fe6c0618b Fix clang format 2022-02-12 18:11:18 +02:00
ζeh Matt
06e430157f Use RideId::GetNull and RideId::IsNull over constant 2022-02-12 18:11:18 +02:00
ζeh Matt
4554d6d883 Fix all uses of RideId 2022-02-12 18:11:18 +02:00
ζeh Matt
0656df4a65 Fix passing RideId to Formatter 2022-02-12 18:11:18 +02:00
ζeh Matt
2c72940cfd Use TIdentifier for RideId 2022-02-12 18:11:18 +02:00
ζeh Matt
a2470c0573 Rename ride_id_t to RideId 2022-02-12 18:11:18 +02:00
Michael Steenbeek
8efc941fee Fix #16227: Assertion hit in fix_duplicated_banners()
Refactor error, introduced in 63a2e9d716#
2022-02-12 17:03:56 +01:00
Michael Steenbeek
2e37f12365 Merge pull request #16631 from CookiePLMonster/fix-crashy-paths
Fix more crashes related to paths
2022-02-12 16:07:26 +01:00
Silent
5028ce3bf6 Turn GeneralConfiguration::rct1_path into an u8string
Fixes a crash when opening Advanced Options on the first launch
2022-02-12 16:07:04 +01:00
Silent
4621cc4264 Json: Fix wrong implicit path typecasts in ReadFromFile and WriteToFile
These functions accepted fs::path which meant passing a u8string to them
wrongly assumed an ANSI encoding and not UTF-8. This would be
a non-issue in C++20 where char8_t is separate, but until then it was an issue
causing incorrect character conversions, and thus an exception.
2022-02-12 14:36:37 +01:00
Michael Steenbeek
81e69ef4e9 Merge pull request #16628 from Gymnasiast/fix/16572
Fix #16572: Crash Placing Track Designs Due to OOB Read on Research.cpp:554
2022-02-12 12:29:52 +01:00
Michael Steenbeek
f0ee220ec6 Fix messages [ci skip]
Co-authored-by: pizza2004 <chad@neejean.org>
2022-02-12 12:28:37 +01:00
Michael Steenbeek
29506a3748 Fix #16623: Large Scenery supports don’t render correctly 2022-02-12 12:26:39 +01:00
Silent
46deac8620 Fix a crash in WindowLoadsaveOpen when last_game_directory is empty
The variable path was left unitialized, which worked fine
in Release builds most of the time, but consistently crashed in Debug.
2022-02-12 00:53:26 +01:00
Gymnasiast
635a6507eb Fix #16572: Refactor error made in #15403 2022-02-12 00:43:32 +01:00
Gymnasiast
5a0be004de Guard against invalid entry indices in ride_entry_is_invented() 2022-02-12 00:31:43 +01:00
GalBr
cb83d8ff05 Fix #14674: Recent Messages only shows at most 6 or 7 notifications 2022-02-11 21:47:08 +01:00
skdltmxn
29083f4cb2 Improve network module in more C++ way 2022-02-09 21:57:25 +01:00
Michael Steenbeek
052da74760 Merge pull request #16616 from Gymnasiast/fix/14155-15994
Fix #14155, #15994: Map Generator places non-tree objects as trees
2022-02-09 21:50:50 +01:00
duncanspumpkin
af6f575e78 Remove empty vector entries and refactor 2022-02-09 17:28:15 +00:00
Gymnasiast
0389ac2e3d Fix #14155, #15994: Map Generator places non-tree objects as trees 2022-02-09 15:54:44 +01:00
Michael Steenbeek
9466e27c68 Fix a typo 2022-02-08 18:27:08 +01:00
Michael Steenbeek
1062c3d08d Clean up palette import 2022-02-07 19:34:22 +01:00
Michael Steenbeek
63ed6c99a5 Make StrDecompToPrecomp() take C++ strings 2022-02-07 18:56:04 +01:00
OpenRCT2 git bot
b939bc2ac4 Merge Localisation/master into OpenRCT2/develop 2022-02-07 04:09:06 +00:00
Michael Steenbeek
6d229eb9d9 Add tilde to sprite font 2022-02-06 21:08:40 +01:00
skdltmxn
866ad2c016 Use string_view as value 2022-02-06 16:43:26 +01:00
GalBr
b5f649c972 Fix peeps not showing on one side of pirate ship (#16499)
This commit fixes this bug by adding a missing ^ operator on frameNum.
Before a recent refactor, the framenum was changed to the mirrored one
with "^ 1", but it was omitted. Using "^ col" when col is 0 or 1, adds
this back.
2022-02-04 22:04:50 +01:00
ζeh Matt
0ee836096b Merge pull request #16586 from ZehMatt/update-replay
Fix replays on CI
2022-02-04 05:52:34 -08:00
ζeh Matt
5271027441 Fix replays on CI 2022-02-04 15:30:05 +02:00
Michael Steenbeek
a0e2ab3a89 Add vertical bar and braces 2022-02-03 23:55:23 +01:00
Duncan
cdd3c28b2e Use intents to control scenery window (#16562)
* Use intents to control scenery window
2022-02-03 21:10:21 +00:00
Johan Mattsson
c00cc90b1f Fix bounds checks and a nullptr check 2022-02-03 21:42:12 +01:00
ζeh Matt
66c9c99ed2 Merge pull request #16570 from ZehMatt/refactor/constexpr-trackdata
Initialize track data table at compile time
2022-02-03 11:23:07 -08:00
ζeh Matt
aed98b5d82 Initialize track data table at compile time 2022-02-02 21:10:32 +02:00
Duncan
5157b57a15 OpenRCT2 Limits (#16088)
* Move over max rides to limits file

* Move max stations to limits file

* Move over max inversions, golf holes, helices, custhistsize

* Move over max trains per ride

* Bring over Max cars per train and max circuits per ride

* Port over NumColourSchemes and max vehicle colours

* Fix compilation

* Move over max awards

* Move over max peep spawns and park entrances

* Fix rebase issues

* Remove future work

* Switch style

* Update copyright
2022-02-01 20:59:48 +00:00
Silent
8064ef288b Fix money overflow in scenario_entrance_fee_too_high_check and more 2022-01-31 23:06:54 +01:00
ζeh Matt
19dca61ee8 Fix #16535: Entering construction mode unblocks all paths 2022-01-31 23:05:26 +01:00
GalBr
111f6479df Move currentDirection creation to after element selection
This move is to fix an issue where ride_select_backwards_from_front() or
ride_select_forwards_from_back() can change _currentTrackPieceDirection
and cause currentDirection to be wrong, causing an error when trying to
delete the element.
2022-01-31 23:02:17 +01:00