ζeh Matt
d8ce486fa4
Merge remote-tracking branch 'upstream/develop' into new-save-format
2021-09-27 23:13:49 +03:00
ζeh Matt
6fcd224efd
Merge pull request #15473 from ZehMatt/backport/nsf-paintsetup
...
Use CoordsXY for sprite_paint_setup
2021-09-27 13:10:19 -07:00
ζeh Matt
4ea8902587
Refactor arg passing to sprite_paint_setup
2021-09-27 22:48:06 +03:00
ζeh Matt
cecf4ac202
Use CoordsXY for sprite_paint_setup
...
Co-authored-by: Ted John <ted@brambles.org >
2021-09-27 22:47:36 +03:00
duncanspumpkin
1d788030ca
Revert mistaken rename
2021-09-27 12:35:03 +01:00
Gymnasiast
ea4c9681b5
Revert stray changes
2021-09-26 20:00:42 +02:00
Gymnasiast
8f97730a5e
Merge remote-tracking branch 'upstream/develop' into new-save-format
2021-09-26 19:56:04 +02:00
Michael Steenbeek
f7d61c67e6
Fix arbitrary ride type cheat not working
2021-09-26 16:21:34 +02:00
Gymnasiast
0825865d13
Merge remote-tracking branch 'upstream/develop' into new-save-format
2021-09-26 11:57:32 +02:00
Gymnasiast
e4d6cd3c34
Revert stray changes to openrct2.d.ts
2021-09-26 11:54:06 +02:00
Hielke Morsink
9dd9b27db4
Make WIDGETS_END constexpr
2021-09-26 11:11:42 +02:00
Gymnasiast
a9ba0fce9d
Fix track element ride type on import
...
Not yet tested because of other import errors.
2021-09-25 22:54:06 +02:00
seanmajorpayne
2ba515fb37
Improve #15322 : Circus Music Not Playing
...
Alleviates the issue, though the circus in European Extravaganza still does not work correctly.
2021-09-25 19:21:38 +00:00
Hielke Morsink
5d2a367249
Merge branch 'develop' into new-save-format
2021-09-25 12:28:42 +02:00
Michael Steenbeek
1feac16bed
Merge pull request #15414 from frutiemax/develop
...
#15367 : Encode RideType in TrackElement
2021-09-25 12:02:08 +02:00
Hielke Morsink
a8b84989eb
Check for nullptr explicitly in operct2-ui ( #15460 )
2021-09-25 08:45:06 +02:00
Hielke Morsink
53c22c9b4b
Check for nullptr explicitly ( #15458 )
2021-09-24 20:05:50 +02:00
Gymnasiast
d9ca8a130f
Remove accidentally committed statement
2021-09-23 22:24:44 +02:00
ζeh Matt
f689b4e4c8
Merge remote-tracking branch 'upstream/develop' into new-save-format
2021-09-23 22:28:17 +03:00
ζeh Matt
e5de2adc4f
Merge pull request #15429 from ZehMatt/backport/ticks
...
Remove scenario ticks and adjust export/import
2021-09-23 12:08:16 -07:00
ζeh Matt
7302cb806a
Update replays
2021-09-23 21:49:09 +03:00
ζeh Matt
c61f141cdc
Bump up network version
2021-09-23 21:49:09 +03:00
ζeh Matt
74e8988dd8
Remove scenario ticks and adjust export/import
...
Co-authored-by: Ted John <ted@brambles.org >
2021-09-23 21:49:09 +03:00
ζeh Matt
719a5a9d8e
Merge pull request #15369 from ZehMatt/refactor/tile-coords
...
Refactor overload map_get_first_element_at
2021-09-21 14:36:03 -07:00
Hielke Morsink
9060a0d228
Add missing headers to VS project file ( #15457 )
2021-09-21 23:34:33 +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
Gymnasiast
8fb8b2a4c1
Do not overwrite ride type when extending station
2021-09-21 10:50:38 +02:00
Gymnasiast
11607f525d
const auto&
2021-09-21 10:49:29 +02:00
Gymnasiast
1e17304e76
Show the appropriate ride type in the TI
2021-09-21 10:49:29 +02:00
Gymnasiast
f21b941b46
Introduce ride_type_t
2021-09-21 10:49:29 +02:00
frutiemax
355019f97f
#15367 : Encode RideType in TrackElement
2021-09-21 10:49:28 +02:00
Gymnasiast
6280152c9c
Merge remote-tracking branch 'upstream/develop' into new-save-format
2021-09-21 10:36:26 +02:00
ζeh Matt
c56810e6a5
Fix #15442 : Use after free in object manager
2021-09-21 10:34:58 +02:00
OpenRCT2 git bot
fddf009afc
Merge Localisation/master into OpenRCT2/develop
2021-09-21 04:08:19 +00:00
Hielke Morsink
30b8f2e5a9
Merge pull request #15441 from OpenRCT2/janisozaur-patch-1
2021-09-19 23:03:40 +02:00
Michał Janiszewski
a37c8539e7
Fix bounds check in Litter::GetName
2021-09-19 22:38:25 +02:00
ζeh Matt
6a1dbb9268
Merge pull request #15438 from Broxzier/feature/nsf-issue
...
Add 'new save format' as option for issue area
2021-09-19 12:01:35 -07:00
Hielke Morsink
3eaf1d4300
Add 'new save format' as option for issue area
2021-09-19 20:41:10 +02:00
Hielke Morsink
d3f7660a46
Use min/max water height defines in mapgen
2021-09-19 17:18:23 +02:00
duncanspumpkin
75d1b9402c
Revert mistaken rename
...
The park file has a function of the same name and during a rename exercise this unrelated function was accidentally renamed
2021-09-19 07:33:09 +01:00
duncanspumpkin
028fb83d17
Remove duplicated check
...
This is performed in the query and does not need to be in the execute. This was already removed in develop
2021-09-19 07:28:13 +01:00
duncanspumpkin
63b075695e
Merge branch 'develop' into HEAD
2021-09-19 07:20:35 +01: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
OpenRCT2 git bot
99e3883b6e
Merge Localisation/master into OpenRCT2/develop
2021-09-19 04:07:58 +00:00
Gymnasiast
f605a55b49
Fix footpaths in RCT1 parks (merge error)
2021-09-18 22:56:18 +02:00
duncanspumpkin
d9a188bcba
Merge branch 'develop' into HEAD
2021-09-18 21:31:46 +01:00
Duncan
81051f2d21
Add crypt files from NSF
2021-09-18 20:31:23 +00:00
duncanspumpkin
ddbc674fe9
Merge branch 'develop' into HEAD
2021-09-18 20:57:59 +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
duncanspumpkin
664dd4386c
Merge branch 'develop' into HEAD
2021-09-18 19:09:46 +01:00
