mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
22,430 Commits 7 Branches 39 Tags 349 MiB
Commit Graph

22430 Commits

Author SHA1 Message Date
Duncan 8c6f10797b
Prevent wasting paint time on unviewable entities 2021-09-29 19:20:43 +02:00
Gymnasiast 3d7769826f
Remove obsolete string 2021-09-29 19:12:04 +02:00
Gymnasiast 17a6ecb09b
Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-09-29 19:10:01 +02:00
ζeh Matt c1cde60e7f
Bump up network version 2021-09-29 19:49:42 +03:00
ζeh Matt afd5e8668f
Update replays 2021-09-29 19:49:15 +03:00
ζeh Matt 3a5452f0c9
Update entities xyz to int32_t 2021-09-29 19:49:15 +03:00
Duncan cce3bb1845
Fix #15136: Exported SV6 hangs/crashes vanilla RCT2 2021-09-29 18:48:50 +02:00
ζeh Matt 9216786efc
Refactor GetSpatialIndexOffset (#15479) 2021-09-29 17:19:47 +01:00
frutiemax 2906cb8c89
Fix #14474: Map size can be synced in multiplayer (#15312) 
* Fix #14474: Map size can be synced in multiplayer

* Bump up network version

Co-authored-by: ζeh Matt <5415177+ZehMatt@users.noreply.github.com>
 2021-09-29 16:46:03 +01:00
OpenRCT2 git bot c284aa2ce2 Merge Localisation/master into OpenRCT2/develop 2021-09-29 04:08:29 +00:00
ζeh Matt eb2de0222b
Use GetLocation in more places 2021-09-28 03:16:04 +03:00
ζeh Matt 8ae8a26a0f
Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-09-28 01:53:18 +03:00
ζeh Matt fb51f796c2
Merge pull request #15475 from ZehMatt/fix/spatial-overflow 
Fix out of bounds access
 2021-09-27 15:46:47 -07:00
ζeh Matt 274bc039af
Fix out of bounds access 2021-09-28 01:26:22 +03:00
ζeh Matt 04f15b7d45
Merge pull request #15474 from ZehMatt/fix/spatial-overflow 
Fix overflow in GetSpatialIndexOffset
 2021-09-27 14:54:31 -07:00
ζeh Matt 185cfdea0f
Refactor GetSpatialIndexOffset and fix overflow 2021-09-28 00:25:15 +03:00
Duncan 50118ae039
Move function for NSF use 2021-09-27 22:54:41 +02:00
ζ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
Hielke Morsink 219a4efa0f
Add changelog entry 2021-09-27 15:09:08 +02:00
Hielke Morsink c234abfbb8
Fix #15213: Freeze when reading a partially cut unicode character 2021-09-27 15:03:25 +02:00
Hielke Morsink e88f96a15c
Move StaticLayout out of header file 2021-09-27 14:56:37 +02: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