1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-29 09:44:52 +01:00
Commit Graph

19243 Commits

Author SHA1 Message Date
Tulio Leao
8c77d31c54 Merge pull request #11998 from hdpoliveira/move_info
Part of #9473: Create GetMoveInfo and GetTrackProgress
2020-06-20 00:09:28 -03:00
Michael Steenbeek
934673115f Merge pull request #11993 from hdpoliveira/animate_door
Part of #9473: Scenery door functions
2020-06-19 23:43:31 +02:00
frutiemax
57b50e46df Part of #11964: Move RideTypeEnumNames to RideTypeDescriptors 2020-06-19 23:03:24 +02:00
hdpoliveira
f5ac20176b Use template parameter 2020-06-19 17:42:09 -03:00
hdpoliveira
92584d57f0 Use CamelCase on function name 2020-06-19 17:38:57 -03:00
frutiemax
51f32130b3 Part of #11964: Merge RideColourKey in RideTypeDescriptor (#11996) 2020-06-19 20:21:16 +02:00
Ted John
5a7fbc8054 Fix #11961: Plugins: ViewportWidget unable to be moved or resized (#11997)
- Ensure child controls for dropdown and spinners are moved.
- Ensure viewport bounds are re-calculated if widget is moved / resized.
2020-06-19 20:20:58 +02:00
hdpoliveira
0bdbcbcd88 Part of #9473: Create Vehicle::GetTrackProgress 2020-06-19 15:02:35 -03:00
hdpoliveira
f33f3c07bd Part of #9473: Create Vehicle::GetMoveInfo 2020-06-19 15:02:35 -03:00
hdpoliveira
23afe3c453 Extract function animate_scenery_door 2020-06-19 14:41:07 -03:00
hdpoliveira
066ae4d58d Add const to methods 2020-06-19 14:41:05 -03:00
hdpoliveira
06a3f01730 Create Vehicle::UpdateSceneryDoorBackwards 2020-06-19 14:40:36 -03:00
hdpoliveira
64b6e2a2ee Create Vehicle::UpdateSceneryDoor 2020-06-19 14:40:32 -03:00
Hudson Oliveira
ea9dd60b91 Part of #9473: Create Vehicle::UpdateGoKartAttemptSwitchLanes (#11995) 2020-06-19 14:06:21 -03:00
frutiemax
57b121d448 Part of 11964: move RideColourPresets to RideTypeDescriptors 2020-06-19 18:04:43 +02:00
Tulio Leao
6a8d9007e2 Close #11614: Require plugins to specify their license 2020-06-19 16:14:33 +02:00
Aaron van Geffen
d66c61ca08 Change map generation button heights (#11986) 2020-06-18 23:33:08 +02:00
Olivier Wervers
e280b413c0 Fix plugin get car entities returning null elements (#11988) 2020-06-18 21:50:06 +01:00
Michael Steenbeek
ab9b8cd57e Merge pull request #11983 from frutiemax/11964_RatingsCalculate 2020-06-18 18:22:11 +02:00
Gymnasiast
22166db30d Fix compilation on TestPaint 2020-06-18 18:10:18 +02:00
frutiemax
642f4f83a8 Merge RideRatingsCalculateFuncTable in RideTypeDescriptor 2020-06-18 09:29:27 -04:00
Michael Steenbeek
5e8a3a709d Merge pull request #11976 from Gymnasiast/refactor/vehicle-preference
Move build menu preference to objects themselves
2020-06-17 23:41:10 +02:00
Duncan
bb34213b93 MapCanConstructAt refactor (#11977)
* Start using MapCanConstructAt

* Fix #11675. Pass the full error message arguments on peep pickup

This was causing a crash as the error message arguments were being cleared which would mean eventually a nullptr dereference would happen.
2020-06-17 22:35:13 +01:00
Michael Steenbeek
2013e1a36f Merge pull request #11974 from Gymnasiast/refactor/ride-type-misc
Refactor/ride type misc
2020-06-17 23:15:30 +02:00
Michael Steenbeek
8a4724a691 Move covered track piece availability to RTD 2020-06-17 23:15:05 +02:00
frutiemax
f6eb9f1cc5 Merge RideRatings in RideTypeDescriptor structure (#11975) 2020-06-17 22:22:52 +02:00
Duncan
33298d2bde Fix peep pickup. Mistake made during refactor. (#11978)
PeepPickupAction assumed that all locations that are passed into the function would be valid locations or null locations. This is not the case when picking up as a dummy value is passed into the function. The caller was fixed by passing a null location as expected by PeepPickupAction.
2020-06-17 21:11:50 +01:00
Gymnasiast
2ee21e360c Bump network version 2020-06-17 21:46:54 +02:00
Gymnasiast
d28d4f4ffd Update objects release to v1.0.15 2020-06-17 21:46:37 +02:00
Gymnasiast
c77d500394 Move build menu preference to objects themselves 2020-06-17 21:46:37 +02:00
Michael Steenbeek
e2b187c24a Merge pull request #11921 from duncanspumpkin/CreateSprite6
Entity List Iterator
2020-06-17 21:28:36 +02:00
Gymnasiast
2a9c2be7d0 Remove unused function 2020-06-17 19:11:02 +02:00
Gymnasiast
682b15343b Create RCT2_RIDE_TYPE_COUNT 2020-06-17 19:10:39 +02:00
frutiemax
de1c172c74 Move RideProperties and rideBonusValue to RideTypeDescriptors
Part of #11964.
2020-06-17 18:59:04 +02:00
Michael Steenbeek
723e8347ec Merge pull request #11973 from Gymnasiast/refactor/toilet
Replace some Americanisms
2020-06-17 18:53:57 +02:00
Gymnasiast
f0872ab7b8 Replace 'bumper cars' with 'dodgems' 2020-06-17 18:13:00 +02:00
Gymnasiast
9e702d9e01 Replace 'Bathroom' with 'Toilet' 2020-06-17 18:12:13 +02:00
Olivier Wervers
66c3d8d828 Expose park name to plugins (#11970) 2020-06-17 17:33:38 +02:00
Michael Steenbeek
5e3a99a9ac Move RideTypeTrackPaintFunctionsOld declaration to TestPaint (#11969) 2020-06-17 13:52:10 +02:00
Michael Steenbeek
97b99122de Merge pull request #11962 from Gymnasiast/refactor/rtd-rtd-rtd
Move RideNaming, RideHeights and max mass to RTDs
2020-06-17 13:06:26 +02:00
Michael Steenbeek
ba5e730c06 Rename UpdateFlag to HasUpdateFlag; refactor to bool (#11966) 2020-06-17 00:05:37 -03:00
Gymnasiast
f16a80a481 Fix typo in VEHICLE_UPDATE_FLAG_ON_BREAK_FOR_DROP 2020-06-16 23:31:34 +02:00
Gymnasiast
96678a14eb Move ride naming to RTD
This also means that all unused ride types will now have the same name. I have made an exception for the 'arbitrary ride type change' dropdown only.
2020-06-16 22:52:48 +02:00
Duncan
50d22ededd Create a hookable location checking function for actions (#11860)
* Create a hookable location checking function for actions

* Add location valid to a number of game actions

Actually pass the coordinates to the script

Use LocationValid on further game actions

Add further actions to the LocationValid. Update api

Update remaining actions to use LocationValid

* Fix bug with peep pickup

Adjust api
2020-06-16 20:57:11 +01:00
duncanspumpkin
8eb7356320 Simplify iterator class 2020-06-16 20:27:44 +01:00
duncanspumpkin
9c2f545225 Fix building of testpaint 2020-06-16 20:27:44 +01:00
duncanspumpkin
6ed17b4ff9 Remove FOR_ALL_PEEPS/GUESTS/STAFF macros
Replaced with an EntityList iterator

Fix formatting

Fix nullptr issues
2020-06-16 20:27:44 +01:00
duncanspumpkin
c45a0536eb Use new class 2020-06-16 20:27:40 +01:00
duncanspumpkin
225ae3a0a9 Add EntityList iterator 2020-06-16 20:26:56 +01:00
duncanspumpkin
a30374d200 Use new iterator
Fix mac builds

Fix minor mistake

Fix vehicle loops
2020-06-16 20:25:47 +01:00