Michael Steenbeek
0a31d9284b
Merge pull request #16202 from Gymnasiast/refactor/ride-functions-b
...
Move 5 ride functions to methods
2021-12-12 13:27:09 +01:00
Gymnasiast
4ebc23ad36
Move ride_get_total_time() to method
2021-12-12 13:00:28 +01:00
Gymnasiast
5e8a204365
Move ride_get_total_length() to method
2021-12-12 13:00:28 +01:00
Gymnasiast
9b81bacecd
Move ride_remove_peeps() to method
2021-12-12 12:31:19 +01:00
Gymnasiast
7559354d25
Move ride_update_popularity() to method
2021-12-12 12:30:22 +01:00
Gymnasiast
6df7c1e3b0
Move ride_update_satisfaction() to method
2021-12-12 12:30:22 +01:00
Ted John
2f20dc029e
Fix drawing of disabled zoom buttons
2021-12-12 11:48:49 +01:00
Michael Steenbeek
b4f256be87
Merge pull request #16151 from IntelOrca/refactor/imageid-painting
...
Refactor most map paint routines to use ImageId
2021-12-12 11:43:31 +01:00
Duncan
3deaa1af2e
Fix #16197 : Park award time and type accidentally swapped
2021-12-12 11:20:17 +01:00
Michael Steenbeek
27cbb6c6ae
Merge pull request #16190 from Gymnasiast/refactor/normalised-tile-element-type-3
...
Part of #15485 : normalise all OpenRCT2 tile element types
2021-12-12 09:53:09 +01:00
Ted John
7ad1e257d3
Update formatting of files
2021-12-11 23:07:56 +00:00
Ted John
4288589f11
Refactor large scenery to use ImageId
2021-12-11 23:07:56 +00:00
Ted John
d62736634f
Refactor paint banner to use ImageId
2021-12-11 23:07:56 +00:00
Ted John
3fa2af3f6b
Refactor paint small scenery to use ImageId
2021-12-11 23:07:56 +00:00
Ted John
4e9ca39c4a
Refactor station covers to use ImageId
2021-12-11 23:07:55 +00:00
Ted John
f8431d2b2e
Refactor Entrance painting to use ImageId
2021-12-11 23:07:55 +00:00
Ted John
b270688635
Refactor paint footpath to use ImageId
2021-12-11 23:07:55 +00:00
Ted John
5f1c85fbfd
Refactor paint large scenery to use ImageId
2021-12-11 23:07:55 +00:00
Ted John
4aabe02eb0
Refactor surface paint to use ImageId
2021-12-11 23:07:55 +00:00
Ted John
a17f1990f2
Refactor some viewport code to use ImageId
2021-12-11 23:06:21 +00:00
Ted John
c55fa94af5
Refactor paint wall to use ImageId
2021-12-11 23:06:21 +00:00
Ted John
6cbf87cab3
Refactor paint vehicle to ImageId
2021-12-11 23:06:21 +00:00
Michael Steenbeek
b83f7c3859
Merge pull request #16150 from IntelOrca/refactor/imageid-ui
...
Refactor footpath, scenery, terrain and mapgen windows to use ImageId
2021-12-11 23:21:19 +01:00
deurklink
ceb49e0984
Fix : #16162 Go Kart speeds not correctly randomised ( #16165 )
...
* Fix Go Kart Speeds not being random
Go kart speeds now only get 2 different values (around 37kmh or around 25kmh), in vanilla Go karts can also have a value in between. This PR fixes that.
* Update changelog.txt
Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com >
* Increment network version
* Update replays
Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com >
Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk >
2021-12-11 17:11:23 +00:00
ζeh Matt
cec30e093d
Merge pull request #15991 from ZehMatt/refactor/bannerid
...
Use TIdentifier for BannerIndex
2021-12-11 08:08:27 -08:00
Duncan
56c4240d77
Make Parkfile Pathfinding Deterministic ( #16147 )
...
* Rename path find functions and use sub function
* Modify leaving park logic to not use park entrance index
* Remove ChosenParkEntrance from peep struct
* Refactor GetNearestParkEntrance
Removed the index as its pointless. Fixed function to use CoordsXY
* Increment network version
* Update replays
2021-12-11 16:03:59 +00:00
Duncan
6dc1efde82
Make awards a vector ( #16134 )
...
* Make awards a vector
* Fix compiler and use one less branch
2021-12-11 14:45:50 +00:00
OpenRCT2 git bot
e4af63d3f6
Merge Localisation/master into OpenRCT2/develop
2021-12-11 04:09:03 +00:00
Gymnasiast
aa34f0f760
Drop the N postfix
2021-12-11 00:39:39 +01:00
Gymnasiast
23c5988fb1
Change last usage of GetType() and remove the method
2021-12-11 00:38:42 +01:00
Gymnasiast
fc3ce3294c
Move over switches to normalised tile element types
2021-12-11 00:30:59 +01:00
Michael Steenbeek
4caeb797f8
Merge pull request #16127 from Gymnasiast/feature/rct1-image-fallback
...
Create fallback system for csg1 images
2021-12-10 23:25:04 +01:00
Gymnasiast
bedcba5ea8
Use SetTypeN() in ScTileElement.cpp
2021-12-10 23:05:56 +01:00
Gymnasiast
50c0080da8
Update calls to ClearAs()
2021-12-10 22:58:27 +01:00
Michael Steenbeek
2d1af0ec42
Replace many GetType() calls with GetTypeN()
2021-12-10 22:43:17 +01:00
OpenRCT2 git bot
0879f96f96
Merge Localisation/master into OpenRCT2/develop
2021-12-10 04:09:11 +00:00
Ted John
54ed1ecd05
Fix #16155 : Paint issue on Swinging Ship
2021-12-09 20:41:16 +01:00
OpenRCT2 git bot
a396289a7a
Merge Localisation/master into OpenRCT2/develop
2021-12-09 04:09:15 +00:00
Gymnasiast
633a977397
Use objects v1.2.4
2021-12-08 16:33:27 +01:00
Gymnasiast
fcd704ed47
Create fallback system for csg1 images
2021-12-08 16:18:33 +01:00
OpenRCT2 git bot
bb35adc5b8
Merge Localisation/master into OpenRCT2/develop
2021-12-08 04:09:19 +00:00
Ted John
a324bfab63
Add image manager plugin API ( #16144 )
2021-12-07 20:55:27 +00:00
Ted John
d427098e39
Refactor terrain and path to use ImageId
2021-12-07 20:46:15 +00:00
Ted John
9fb490aec0
Refactor ride window to use ImageId
2021-12-07 20:17:22 +00:00
Ted John
5fcc0f4499
Refactor scenery window to use ImageId
2021-12-07 20:17:22 +00:00
Ted John
2108322806
Use ImageId for picked up peep
2021-12-07 20:17:22 +00:00
Ted John
8c65e39ce9
Merge pull request #16137 from OpenRCT2/refactor/imageid-rides
...
Refactor ride painting to use ImageId
2021-12-07 20:11:13 +00:00
Michael Steenbeek
ea099c0d2d
Merge pull request #16129 from Gymnasiast/refactor/normalised-tile-element-type
...
Part of #15485 : Use normalised tile element type enum for setting type
2021-12-07 11:50:54 +01:00
Tulio Leao
2556efd7c7
Merge pull request #16118 from GalBr/refactor-customcurrency-window-to-class
2021-12-06 23:37:15 -03:00
Duncan
fdfd9b4760
Make track designs NSF map size safe ( #16116 )
...
* Make track designs NSF map size safe
* Increment network version
2021-12-06 16:58:50 +00:00
