1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-22 15:23:01 +01:00
Commit Graph

20697 Commits

Author SHA1 Message Date
Romain
1da99dc59c Fix URL in Appstream XML 2021-02-02 17:22:47 +01:00
OpenRCT2 git bot
6eb0d3cc28 Merge Localisation/master into OpenRCT2/develop 2021-02-02 04:11:12 +00:00
Umdlye
2c408342d9 Create toggle for zoom toolbar button 2021-02-01 17:27:40 +01:00
Jaime Centeno
83fcfa6e68 Refactored water window code into WaterWindow class
Created a new WaterWindow class that inherits from Window class and overrides On methods. Added a new generic method for WindowFocusOnCreate that takes position as an argument.
2021-02-01 14:33:22 +01:00
OpenRCT2 git bot
4218766729 Merge Localisation/master into OpenRCT2/develop 2021-02-01 04:10:33 +00:00
Duncan
2d6da7551b Fix #13958: Queue corruption due to intersecting entrances
There was a whole host of bugs that this issue has exposed which were caused by intersecting the queue of a ride with an entrance/exit or shop. When this was done the peep would be removed from the queue incorrectly and could end up at the wrong station or a variety of other unexpected behaviour
2021-01-30 17:20:01 +01:00
ζeh Matt
9ff2138f3f Remove unused variable gCurrentFontFlags 2021-01-30 16:46:22 +01:00
Michael Steenbeek
e3a1af3d05 Use getters/setters for track type and direction 2021-01-30 15:16:17 +01:00
ζeh Matt
15ef22c2f6 Merge pull request #13970 from ZehMatt/refactor/fixed-vector
Use FixedVector for paint_structs
2021-01-30 12:57:12 +02:00
Duncan
dc113ff6e4 Remove dead code from #6819 (#13971)
This was missed back in 2017 there is now no longer a reason to make a backup tunnel array as we never modify it. I've also added a const to make it clear we never write to the array
2021-01-30 08:33:36 +00:00
Matt
64cbccdda6 Re-order members of paint_struct for better code generation 2021-01-30 09:16:42 +02:00
Matt
3fecb36a19 Use fixed vector for paint_entry 2021-01-30 09:16:42 +02:00
OpenRCT2 git bot
418b6f9a54 Merge Localisation/master into OpenRCT2/develop 2021-01-30 04:09:25 +00:00
Ted John
4a37f1479c Merge pull request #13927 from IntelOrca/plugin/extra-ui
* Add isVisible property to widgets so that you can easily show / hide widgets.
* Add new text box widget for text input
* Allow plugin windows to be transparent
* Add `textAlign` property to label widget
2021-01-29 20:55:25 +00:00
Ted John
2fdf91874c Implement centred labels 2021-01-29 17:50:32 +00:00
Ted John
180a41686c Implement transparent windows for plugins 2021-01-29 17:50:27 +00:00
Michael Steenbeek
d3a4c16270 Reserve room for tile owner 2021-01-29 16:56:33 +01:00
spacek531
1e3fe9b550 Separate booster track elem type (#13857)
* add data to Track.cpp

add data to TrackData.cpp

add import helper functions

fix Booster value

import booster as 256

export booster as 100

add vehicle subposition data

add SV4 import

add TD4 import

add TD6 import

use track_type_t when importing TD6

add TD6 export

change peep tracktype type to auto

fix SV4 track element import

fix import of booster speed

add None enum to TrackElemType

move _legacy RideConstruction functions to Ride.cpp

change _currentPossibleRideConfigurations to use track_type_t

fix booster track category

add booster string tto

expand _currentTrackCurve to 32 bits

expand track_curve_chain to 32 bits

update get_track_element et al. to handle 16 bit track types

run clang-format

remove unused #includes from _legacy.cpp

Revert "remove unused #includes from _legacy.cpp"

This reverts commit 4c4d4b06edb0c130314789d8fe371246be246c9f.

Revert "update get_track_element et al. to handle 16 bit track types"

This reverts commit 73920dafd4a6c9e7c9f0c7ee1098d493f8f5d262.

Revert "move _legacy RideConstruction functions to Ride.cpp"

This reverts commit 2d83a75c1477d387ad77a7a5085f37a28f72a589.

update _legacy functions for 16-bit track types

update ride_construction_reset_current_piece behavior with new enum

fix declaration of _currentTrackCurve to match other track tcurve vars

remove unused include from T4Importer.cpp

move SCT to 256 part 1: RideConstruction.cpp

move SCT to 256 part 2: TrackData.cpp

move SCT to 256 part 3: Ride.h/Ride.cpp

move SCT to 256 Part 4: revert changes to S4Importer.cpp, T4Importer.cpp

fix stations appearing as curves

fix too many initializers in TrackData.cpp

move SCT to 256 part 5: S6/T6 importing and exporting

move SCT to 256 part 6: simplify RCT12.cpp functions

fix comments in S6Exporter.cpp, S6Importer.cpp

fix clang-format on S6Importer.cpp

add missing data to TrackData.cpp

revert new functions for checking if track type is a booster

revert unused include

change trackType to auto and add comment to S6Exporter.cpp

move track type aliasing from TrackDesign.cpp to T6Import.cpp, T6Export.cpp

add comment about sv6 vehicle.track_type

static cast to uint8_t in T6Exporter.cpp`

set type to auto when setting value to _currentTrackCurve

revert moving function in S6Importer.cpp

fix value names in RideData.cpp

revert cahnge to uint16_t return for GetTrackType() in RCT12.cpp

fix GetTrackType return type for real

add changelog entry

bump network version

cast alternate track type to track_type_t

static_cast tuple input value in _legacy.cpp

change _currentTrackCurve to uint32

use TrackElemType::Count to determine length of subposition array

perform some changes

remove padding from rct_trackdefinition

fix alternative type check

remove _boosterTrackSelected

add missing condition for booster speed

add comments for TrackElemType::MultiDimInvertedUp90ToFlatQuarterLoop

add missing comments to RideData.cpp

remove extra entry

simplify some things

fix formatting

remove redundant checks todo: fix building the track piece

use TrackElemType::None more

remove git.txt

* bump network version

* make conditional more explicit w/ parentheses

* move booster check to RCT12.cpp

* implement getters and setters for vehicle track type and direction

* fix formatting

* rename RCT12TrackTypeIsBooster to RCT2TrackTypeIsBooster

* add whitespace in RCT2.h

* change the thing I thought I changed

* move booster check function to RCT2.cpp

* move function into if condition

* fix scope issues with setters
2021-01-29 15:24:53 +00:00
ζeh Matt
109a06663d Fix entrance or exit stacked on top considered a duplicate 2021-01-29 16:19:07 +01:00
Ted John
c2eb6d4153 Improve plugin API and type definitions 2021-01-28 20:52:17 +00:00
Ted John
900a30507c Merge pull request #13738 from IntelOrca/ride-music-objects-3
Read and use the JSON music objects for ride music implementation. Supports both vanilla and custom music objects. More music objects can be added via object manager if you compile-in the hidden tabs.

Refactors a lot of the ride music logic into a new source file: RideAudio.
2021-01-28 17:26:40 +00:00
Ted John
383cbe5368 Load music into the correct slots 2021-01-27 19:26:28 +00:00
Ted John
a9755609c2 Move ride audio into own namespace 2021-01-27 18:45:28 +00:00
Ted John
28f4ec2b43 Implement code review suggestions 2021-01-27 18:45:28 +00:00
Ted John
d9b8413ec4 Use IStream for zip streaming 2021-01-27 18:45:27 +00:00
Michael Steenbeek
2aa2a94a7e Update Xcode project 2021-01-27 18:45:27 +00:00
Ted John
2f39442d25 Implement ride music objects and refactor 2021-01-27 18:45:27 +00:00
ζeh Matt
db4841ca45 Avoid copy and allocation for rendering the viewport (#13911) 2021-01-27 07:28:07 +00:00
ζeh Matt
ea9d4f35c9 Merge pull request #13938 from janisozaur/nullptr_check
Add nullptr check in get_loaded_object_entry
2021-01-27 08:14:04 +02:00
ζeh Matt
8eab5d167e Merge pull request #13869 from ZehMatt/feature/timescale
Allow the main game loop to scale the delta time
2021-01-27 06:09:51 +02:00
OpenRCT2 git bot
a49a2fdd85 Merge Localisation/master into OpenRCT2/develop 2021-01-27 04:08:46 +00:00
Ted John
4d8faee062 Increment plugin API version 2021-01-27 00:28:59 +00:00
Ted John
2fcaed8165 Allow more fields to be optional 2021-01-27 00:28:59 +00:00
Ted John
136783270f Fix initial value for showTextInput 2021-01-27 00:28:59 +00:00
Ted John
c0d8786af8 Add text box widget 2021-01-27 00:28:59 +00:00
Duncan
8c5cd61b69 Split free id's into seperate vector (#13924) 2021-01-26 07:42:56 +00:00
Ted John
be350f7e2e Add widget visible flag 2021-01-26 00:25:59 +00:00
Ted John
c1a1f8f639 Fix #13953: invalid-read in StaffListWindow::RefreshList 2021-01-26 00:17:34 +00:00
Ted John
c9a07eaa84 Refactor staff window to class (#13819) 2021-01-25 21:57:06 +00:00
Michael Steenbeek
45fd8e8d05 Changelog: correct issue number, add forgotten one 2021-01-24 14:00:08 +01:00
OpenRCT2 git bot
7d90df1baa Merge Localisation/master into OpenRCT2/develop 2021-01-24 04:35:00 +00:00
ζeh Matt
329b228cac Fix #13916: use correct constant for maximum station locations 2021-01-23 23:06:05 +01:00
Michał Janiszewski
b1e43f828b Add nullptr check in get_loaded_object_entry 2021-01-23 22:26:02 +01:00
Duncan
eb52391b9a Remove next_in_quadrant (#13754)
* Use std::vector of quadrants

* Prevent ptr invalidation issues

* Remove next_in_quadrant

* Make review changes

* Rebuild next_in_quadrant for S6Export

* Fix formatting

* Constexpr where possible

* Increment network version and update replays
2021-01-23 07:36:46 +00:00
Duncan
3cc283adb2 Name MapFlashingFlags and split up guest/staff loop (#13865)
* Name MapFlashingFlags and split up guest/staff loop

* Use constexpr instead of macros
2021-01-23 06:45:14 +00:00
Duncan
fb274f55d5 Fix #13905: Fix walking off end of array when saving (#13913)
Mistake made in refactor
2021-01-22 22:45:00 +00:00
ζeh Matt
73275b311b Fix #13903: ride exits not being recognized (#13906) 2021-01-22 22:08:54 +00:00
ζeh Matt
54578a0870 Merge pull request #13901 from ZehMatt/fix-replaysnapshot
Fix replay snapshots comparing states with different ticks
2021-01-22 20:15:33 +02:00
Duncan
85df2c6854 Refactor guestlist (#13899)
* Refactor GuestList groups to use more standard functions

* Remove index

* Apply review comments
2021-01-22 18:02:22 +00:00
Duncan
1a11456f36 Rework remove floating to use EntityList (#13895) 2021-01-22 14:36:55 +00:00