mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-30 10:15:36 +01:00
Code Issues Releases Wiki Activity
22,511 Commits 8 Branches 59 Tags
6d7e2446db66787096fc33edfa03d8021aa01d4b
Commit Graph

409 Commits

Author SHA1 Message Date
Ted John
6d7e2446db Fix #16204: Invisible entrance/exits render as tiny land sprites 2021-12-13 22:11:55 +00: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
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
Gymnasiast
aa34f0f760 Drop the N postfix 2021-12-11 00:39:39 +01:00
Gymnasiast
fc3ce3294c Move over switches to normalised tile element types 2021-12-11 00:30:59 +01:00
Michael Steenbeek
2d1af0ec42 Replace many GetType() calls with GetTypeN() 2021-12-10 22:43:17 +01:00
Ted John
9fb490aec0 Refactor ride window to use ImageId 2021-12-07 20:17:22 +00:00
ζeh Matt
7cfb5832c4 Fix #16075: Track designs save scenery in wrong location 2021-12-04 12:07:10 +01:00
Hielke Morsink
325b986c56 Merge pull request #15489 2021-12-03 00:16:06 +01:00
Duncan
79b12d2953 Introduce DATLimits.h for RCT2 Dat file object limits (#16034) 2021-12-01 21:55:52 +00:00
Hielke Morsink
53d9bfa8b4 Update implicit zoom conversions 2021-12-01 00:08:35 +01:00
Hielke Morsink
b6562082e9 Replace hardcoded max zoomlevel 2021-11-30 19:11:08 +01:00
Hielke Morsink
f3735dc076 Use ZoomLevel for viewport and ride window 2021-11-30 19:11:08 +01:00
GalBr
c2fa54057a Remove vehicle_colour and replace references to VehicleColour (#16055) 
This is done because we had two identical structs: vehicle_colour and
VehicleColour. We now only use VehicleColour.

See: #16028
 2021-11-29 22:04:31 +00:00
ζeh Matt
9f23449ffb Move Staff/Guest/Peep to entity 2021-11-26 18:26:19 +02:00
ζeh Matt
56e78d5733 Merge pull request #15985 from ZehMatt/refactor/entities2 
Refactor Sprite to Entity
 2021-11-25 12:53:50 -08: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
ζeh Matt
0024252328 Fix includes 2021-11-24 17:19:52 +02: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
Duncan
5d2a56525f Refactor min max cars per train from nsf (#15911) 2021-11-14 20:58:44 +00:00
Michael Steenbeek
9134bd4788 Update RCT1 path names + British spelling for ‘grey’ 2021-11-13 23:38:04 +01:00
Michael Steenbeek
e1a1560fd2 Fix #15878: Crash when opening ride window for corrupted vehicle 2021-11-09 18:41:33 +00:00
ζeh Matt
cd7e35044a Move statics into TrackDesignState and pass that to each function 2021-10-29 02:06:59 +03:00
Michael Steenbeek
ad2a77bfa5 Fix #12981: New vehicles do not appear in vehicle type dropdown 2021-10-27 11:30:55 +02:00
Hielke Morsink
9dd20ec619 Improve array formatting 
For most of these cases, adding a trailing comma to the array block makes clang-format put each item on a new line, and clang-format exception blocks could be reduced where clang-format does not handle them properly.
 2021-10-17 18:21:45 +02:00
Hielke Morsink
6de1868ad8 Use (const) references to widgets where possible 
Note: The change from `w->widgets[WIDX_ENTRY_PRICE]` to `entryPriceWidget` is intended.
 2021-10-01 15:21:00 +02:00
Hielke Morsink
9dd9b27db4 Make WIDGETS_END constexpr 2021-09-26 11:11:42 +02:00
Hielke Morsink
a8b84989eb Check for nullptr explicitly in operct2-ui (#15460) 2021-09-25 08:45:06 +02:00
Duncan
a268350615 Fix #15439: Ride viewport is partially grey 
The ride viewport does not work the same as other viewports due to the selection of views that it has. After refactoring the focus system to use a more streamlined approach the ride viewport lost its invalidation on resizing. If the ride window was to use the same viewport update code as say the guest window then the viewport focus still ends up incorrect due to it no longer centring the focus. Therefore the best approach was to lose the focus on resize and force a recalculation of it.

Also renamed Focus2 to Focus as Focus2 was meant to just be fill in whilst removing the original focus structs.
 2021-09-21 11:06:04 +02:00
Duncan
938792e6be Use CoordsXYZ for ride view (#15434) 
* Use CoordsXYZ for ride view

Part of the NSF but also took the time to refactor slightly to use the more appropriate types. Annoyingly there isn't a operator/ for CoordsXYZ otherwise this could have been further simplified.

* Fix missed minx/maxx occurrence

Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>
 2021-09-19 07:19:32 +01:00
Duncan
fa57b6aea0 Remove focus union and replace with typed focus (#15426) 
* Remove focus union and replace with typed focus

This if for the NSF to allow for CoordsXYZ

* Remove legacy structures

* Rework viewport_create to deduplicate logic

* Simplify yet further

* Apply review comments

* Remove intermediate
 2021-09-18 20:34:38 +01:00
Hielke Morsink
4b4b3333d6 Remove unnecessary else blocks 2021-09-16 18:31:12 +02:00
Hielke Morsink
28681eebc0 Merge pull request #15407 from ZehMatt/refactor/optional-use 
Make use of std::optional strict
 2021-09-14 17:45:18 +02:00
Hielke Morsink
cf78d6841d return nullopt instead of {} 2021-09-13 23:24:57 +02:00
Kane
b35fd28c55 Feature #7682: Lock camera to vehicle in main window 
Pressing the "Locate" button in the Ride window when selected on a "Vehicle/Train" will now have the main viewport track the vehicle.
 2021-09-13 20:44:52 +02:00
ζeh Matt
59a6c34db4 Make use of std::optional strict 2021-09-13 20:02:32 +03:00
ζeh Matt
d7e0e473c1 Apply review suggestion, cleanup 2021-09-10 19:10:14 +03:00
ζeh Matt
f8e26a3752 Fix signed/unsigned mismatch 2021-09-10 19:10:14 +03:00
ζeh Matt
18af5d4950 Use union for window association to prevent casts 2021-09-10 19:10:13 +03:00
ζeh Matt
ec65a04883 Cast fixes 2021-09-10 19:10:13 +03:00
ZehMatt
3ad72baaae Cast fixes 2021-09-10 19:10:12 +03:00
Michael Steenbeek
624a32e93b Make Coords isNull/setNull functions TitleCase (#15382) 2021-09-08 20:48:53 -03:00
Michael Steenbeek
4bbee1c6ae Merge pull request #15261 from frutiemax/13874_refactor 
Track Element Descriptor refactor (issue #13874)
 2021-08-29 22:38:46 +02:00
frutiemax
450bf61ee4 Part of #13874: TrackSequenceProperties, Pricing and MirrorMap renamed 2021-08-29 10:45:17 -04:00
frutiemax
5f438535ad Part of #13874: Gymnasiast review 2021-08-27 17:57:10 -04:00
Duncan
d2aca03ff6 Fix #15271. Use formatter to pass description args to text input (#15272) 
* Fix #15271. Use formatter to pass description args to text input

Originally passed the variables via global vars which were not updated to 32bit during recent refactors. This removes the global and makes the interface cleaner and corrects the type

* Fix size of arguments
 2021-08-24 19:12:05 +01:00
frutiemax
046c060e74 Part of #13874: Replace Track Sequence properties 2021-08-22 18:01:03 -04:00
Michael Steenbeek
f5935931e3 Port remaining DrawTextWrapped calls with void args to Formatter 2021-08-21 09:42:05 +02:00
Michael Steenbeek
c6a7829554 Fix #15245: Excitement factors are all listed as 0% 2021-08-20 13:05:54 +02:00
Saad Rehman
d6ad9b67e7 Fix #15161 #15159 one-off error when getting stationIndex (#15163) 
* Fix #14918 refactor stationIndex and loop to avoid in/decrement to null

Fix #15161 #15159 one-off error when getting stationIndex

* Add const and remove unused variable

Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
 2021-08-12 17:20:15 +01:00